From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:a2e:b5d9:: with SMTP id g25mr894108ljn.234.1606291560301; Wed, 25 Nov 2020 00:06:00 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5a02:: with SMTP id q2ls152554lfn.1.gmail; Wed, 25 Nov 2020 00:05:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJwKb4XR7r6P81S1PFJbJ9UgwhkKyUmRCILmcnGfs68OKF7jXPIqR2p6IZegGrqchK+jQZSE X-Received: by 2002:a19:4f59:: with SMTP id a25mr833470lfk.282.1606291559066; Wed, 25 Nov 2020 00:05:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606291559; cv=none; d=google.com; s=arc-20160816; b=asAvb5qNRs8U9ZKQtGjEdJ/tlFrVOxy6ZB70IKcL/VsSoUGeeZRqEsvOSj/7LYwEXe rcG64ZzPE0AT6p2xk6ZYisJxRoRrLJqUxcpu2oNWTh48TrJU/+4vF/ryBoUEg8QNJpqA l5A8Bul7PPhNgaVrBHm+o1K/x0EdmaRESqrhckyZ7JckeqMmbwVFIn1IJRhHwgLaQrZ8 OnarfBLQUIoqxDnwzgvRxN9JSFoaIM2VjEumcA+yqiXaln3IbFTfiwQsak8TChVN+PXm F5ZpedqhJiNdUEwE5RZnACCG2th0HiI4Y237zrAGeNQfPIjd7mv2Q0PzLFBzdxY0KzCa WzlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:ironport-sdr:ironport-sdr; bh=WplXIXQFwUYXdKlr0gKnhR+7rW2TCZ95LWfeYAz8gHc=; b=G94I2O5KBokvrXHZSKn2eoUCwQOZP+Qc/PNTzIH5M4Yp8u5kphcNf817YQQXmi5kOp SBI3duphCLxfuWCK5btIeXtqT3y9eF/YekO01CWX4NVPHkbzI/Bl+iFiwQ7FJ8Hc35EX ozaEMwl8JvXVnGGqOcP2pXfeNTaoA3RXLATVM4TO/cQIAc26rsG3+FZqCWfgKywqgfrj oCZUH3eZxCKC1Js1b6rj68W9rLWEoihO/3ruTQXHTyDQfukGJlrAtjUrhmVUC9+/qFJp 5RrAu5hZw6dUYdAzFYnF7I4UbNXflWneR7hQQZdSK6wUEnnXaeDElDDQUhfbTAvd/ply Tm+Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id f5si63813ljc.0.2020.11.25.00.05.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 00:05:59 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: 3/8bjW33ozb8dlhABOubBZPIEAJyoUnAu6m4kYFB7a4sDXnH43V7TE7UwDE8CaeKoXW1LPMlO8 4LAW7Sg1/b+nQTtbKQwL2iN2GbWbSp7pwkX/Nbflc7vsr9GmBEABjL9egXbsr5qVbqVfRklF8t 7UBnhqlP32zZ1/tHBkMqwFGXR8vooG9X6tfjM8Kv7/ZhLaZ/hYxu2YfCA81r3xxklG92e3M8+z lMmUuf9f2OjkVhNaXEC2NBx/LfiYdN2AIX9vcEavgcdWuOuhEutJGgHIwM7vbaDkMsD1xwZEfZ vP8= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55587681" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 00:05:56 -0800 IronPort-SDR: vkFxxBU3hMFjfshNlXfq2VRNw6UAtlcop7nlHl9gOhkqKDBYhKHLiknP9VOxU2Mv+roHqnAI1/ 2z+sU/E9nbIE8r5kRKTfXQUh6KyYxHM43wL3uzYLXqXZBg6uQMGMLIhnJjOKkhtJutxKh81e8U bIqnw87qRxJSGp0QYJbK33WTefTNbSd5FBYlj+saiHCky9iCb5D2CDvvCFdyyYx/PMjt0/nzE8 akZDNDv9OAURiB9Z1EhXTXL/fVvqZS6Mwc0OjfdMAOGl8kyqomourgusxgBRUbzqs0X0a8E2Mc WM4= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v7 09/14] base-apt: Introduce BASE_REPO_FEATURES Date: Wed, 25 Nov 2020 13:35:30 +0530 Message-ID: <20201125080535.16223-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125080301.15818-9-Vijaikumar_Kanagarajan@mentor.com> References: <20201125080301.15818-9-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: kjsxbvwXpPmd 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 07a7781..ec0a384 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -181,6 +181,10 @@ ISAR_CROSS_COMPILE ?= "0" # NOTE: this works for amd64 and arm64 targets so far #ISAR_ENABLE_COMPAT_ARCH ?= "1" +# 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 6ca5759..5c2c88c 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 cfabeae..0aa5502 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