From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6816610675337461760 X-Received: by 2002:a17:906:160f:: with SMTP id m15mr2011447ejd.367.1587115876260; Fri, 17 Apr 2020 02:31:16 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:1b4a:: with SMTP id p10ls1085114ejg.9.gmail; Fri, 17 Apr 2020 02:31:15 -0700 (PDT) X-Google-Smtp-Source: APiQypJfM83FzWr3DQbYADQ6+SeHCWYp+5zZDEv6isSLgArJIAcC2DP4W+q0G/Az0/rCdhmQ/tQv X-Received: by 2002:a17:906:4a94:: with SMTP id x20mr2168355eju.306.1587115875532; Fri, 17 Apr 2020 02:31:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587115875; cv=none; d=google.com; s=arc-20160816; b=tf5LoHjomFG6DtPQ65RMS82S6GpBC+uFm8pU8SR48ZzeRfFJmRaGYo9CTpDOK/KudH JwrMNr0QAZfy9fadhpoUSUGRuvzxP9eRp96Eg7DDZn8L3F/Ct6FMqPw07kYKayULiiHx VoEH+MLl50ZNJ1R+m6uSY64K8b2fbCa9zVnK/DWiGHkzRQTwcQP6vwoAkUpLAcEGqDQl bUJe28tnoYy2yKSOwZyDZ9PjBA5nhYazDLJOiRsQH03iHfMh6UhZCNf4MlT52l/HG20O 6/feWKmndl6VJdjlX7MRKU23J7/OqvUHC4wEiOldiSmdi0IJ5FZg3rAjDmxTFHEf8hLf 9KOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6V5D+vTuM1/2NR3X2QvBQqzv3UZKgTcKOdRLQQFlNkI=; b=zTlA9PQ+8fFZ6YOfIJnBVtT7d63TjHmU8Rn273744J6hwDM2ygbcU2rmiuv7V2AbJ+ kt81vQDd8/e7vrhB03z7CD6+9nLePxBzDVsD1iY0pPD+U3onatBwRmxPYmAOEq1pH+Ao +oyWVtKmFaHALRI3AblGBD021xR5GRAQgy+A/PY//2na8ulz9Sy6S0JIPmaL0eEfqrrB 76Yjz9zcE1C5sFMByveuwo3XyQ5SDFkkLMjq3WgBD1ttWpGDJdHk4bY7Y6n5UUVTVFa8 TxeM43+A0oFHZyiPXFkl3eurJSLU5d7VSnhhqeJ9ZFpHToBpaWDkuo05VdrjvPifhce2 g2Vw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ZRTRmQeo; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::432 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com. [2a00:1450:4864:20::432]) by gmr-mx.google.com with ESMTPS id hh9si1065103ejb.0.2020.04.17.02.31.15 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 17 Apr 2020 02:31:15 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::432 as permitted sender) client-ip=2a00:1450:4864:20::432; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ZRTRmQeo; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::432 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wr1-x432.google.com with SMTP id g13so222616wrb.8 for ; Fri, 17 Apr 2020 02:31:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6V5D+vTuM1/2NR3X2QvBQqzv3UZKgTcKOdRLQQFlNkI=; b=ZRTRmQeo6ii5WFc1+EpnWsQLtfg2sgmRa+0Cs6Vq3J/V25UZ8AIMB4Oc7LxFbUNm6P qjMK9FDuNdXMDmzHS575QzO6XgYtRQ2j+v0if6LKhZ32Q4FG8k5ge32sEfPeupQzL/Ej GxQOgeBu5Rww0QWte/B9y/M93N/1Z9VxxjlgZsV0TTCJB55Y5qW2JhLV/sJ9mJoXBxMr D+esuKdq22fR1mIiknJyLpVnkdPNxcgZiHDZJVShnl/hVkAbbmsa+zQ/wSsysoLqjvr2 nnBaUMOxbJ+sDGvszlGWYOycNLuikvmr63xg6olf8b3ZOiNp0FM70VwyqP4Li06aEtRM 5ibg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6V5D+vTuM1/2NR3X2QvBQqzv3UZKgTcKOdRLQQFlNkI=; b=DJbyXXDMIAteS2Lr2O4oK7UnAYxLEnJ6hWlo23+sSoz+7EJz1GPMmQXKAoHYHDccoi 5k2BEx8xaxN4/2mCYSmKDsUFtTv1mJ4f7fteIGF6bL4T3vbVR/ANGwH/Qb1T93D/7Jth MJzu6p5tSIm0Mi5sF7QpCt3RoyKGgPxSFTJrmhZyPE64uhLMGy6BZmhuNuZVVcjsF2T3 1MlI86BZ/9tCPhmg4adO2FoePjE4yyCiAUC5ykUxE+o/Ag062hKoeVJwf1KuoxcaeoIF SxtwPFU+JJNaQBkFdiB5nkG1yb22PWYbbkWBVBSi4bwCHxlp6vYMCPMgmjkaJH9gYoLl tMIg== X-Gm-Message-State: AGi0PuYrmRMzmeEez0SeljSTQ71Y8kqGkOEEQc2fMf8hjCAFKsop/RKN Kt7jmy0s0+P7zzY3TAP71eTHfpihW0k= X-Received: by 2002:adf:9cc8:: with SMTP id h8mr2761148wre.167.1587115874883; Fri, 17 Apr 2020 02:31:14 -0700 (PDT) Return-Path: Received: from oxygen.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id l15sm6836256wmi.48.2020.04.17.02.31.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2020 02:31:14 -0700 (PDT) From: Vijai Kumar K X-Google-Original-From: Vijai Kumar K To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, ibr@radix50.net, jan.kiszka@siemens.com, Vijai Kumar K Subject: [PATCH v5 09/13] base-apt: Introduce BASE_REPO_FEATURES Date: Fri, 17 Apr 2020 15:00:36 +0530 Message-Id: <20200417093040.15130-10-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417093040.15130-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200417093040.15130-1-Vijaikumar_Kanagarajan@mentor.com> X-TUID: NkcdwtkL8nKB Eventhough we are collecting the debsrcs as part of postprocess, it could not be considered a ROOTFS_FEATURE, instead a base-apt one. Introduce BASE_REPO_FEATURES, to provide user with control to enable or disable cache-deb-src. Disabled by default, since it is not required for normal offline build to work. Signed-off-by: Vijai Kumar K --- meta-isar/conf/local.conf.sample | 4 ++++ meta/classes/image.bbclass | 4 +++- meta/classes/repository.bbclass | 9 +++++---- meta/classes/rootfs.bbclass | 1 - meta/recipes-devtools/base-apt/base-apt.bb | 1 + 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 274cdae..8389bac 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -176,6 +176,10 @@ IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsc # NOTE: this works on build host >= stretch for armhf, arm64 and amd64 targets for now. ISAR_CROSS_COMPILE ?= "0" +# +# Uncomment this to enable caching of all source packages. +# Without this feature, only sources of packages downloaded with apt:// are downloaded. +#BASE_REPO_FEATURES ?= "cache-deb-src" # # Uncomment this to enable use of cached base repository #ISAR_USE_CACHED_BASE_REPO ?= "1" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index fcaebd6..6131d6d 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -63,10 +63,12 @@ image_do_mounts() { } ROOTFSDIR = "${IMAGE_ROOTFS}" -ROOTFS_FEATURES += "clean-package-cache generate-manifest cach-deb-src" +ROOTFS_FEATURES += "clean-package-cache generate-manifest" ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${IMAGE_INSTALL}" ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" +ROOTFS_POSTPROCESS_COMMAND_prepend = "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', 'cache_deb_src', '', d)} " + inherit rootfs inherit image-sdk-extension inherit image-tools-extension diff --git a/meta/classes/repository.bbclass b/meta/classes/repository.bbclass index 7b6e47b..1f475dc 100644 --- a/meta/classes/repository.bbclass +++ b/meta/classes/repository.bbclass @@ -100,9 +100,10 @@ repo_contains_package() { repo_sanity_test() { local dir="$1" local dbdir="$2" - local output="$( reprepro -s -b "${dir}" --dbdir "${dbdir}" sourcemissing )" - if [ -n "${output}" ]; then - bbwarn "One or more sources are missing in base-apt" - bbwarn "${output}" + if [ "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', 'yes', 'no', d)}" = "yes" ];then + local output="$( reprepro -s -b "${dir}" --dbdir "${dbdir}" sourcemissing )" + if [ -n "${output}" ]; then + bbfatal "One or more sources are missing in repo. ${output}" + fi fi } diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index ee57989..c00a8bf 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -185,7 +185,6 @@ python do_rootfs_install() { } addtask rootfs_install before do_rootfs_postprocess after do_unpack -ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'cache-deb-src', 'cache_deb_src', '', d)}" cache_deb_src() { rootfs_install_resolvconf deb_dl_dir_import ${ROOTFSDIR} ${ROOTFS_DISTRO} diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb index 8940ae8..506a28f 100644 --- a/meta/recipes-devtools/base-apt/base-apt.bb +++ b/meta/recipes-devtools/base-apt/base-apt.bb @@ -10,6 +10,7 @@ SRC_URI = "file://distributions.in" BASE_REPO_KEY ?= "" KEYFILES ?= "" +BASE_REPO_FEATURES ?= "" populate_base_apt() { find "${DEBDIR}"/"${DISTRO}" -name '*\.deb' | while read package; do -- 2.17.1