From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:a2e:b531:: with SMTP id z17mr421126ljm.30.1601446741713; Tue, 29 Sep 2020 23:19:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:c7c8:: with SMTP id x191ls493671lff.0.gmail; Tue, 29 Sep 2020 23:19:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyym5lN3zEcaVABKsIDOQ1QvAKOmWTBhzHzj59GpTekUqqxSmkkVEJ20vm06Je5p8+0Jkbz X-Received: by 2002:ac2:5de3:: with SMTP id z3mr345492lfq.327.1601446740369; Tue, 29 Sep 2020 23:19:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601446740; cv=none; d=google.com; s=arc-20160816; b=qsrCc2VTQYyrp/Q9M4byixt56foE8X96GXM2rd2exsJimmUAcJOapc5FG0ay2SyFiN mQ1T2TJSy3SkeXV0uLxnTCy1QbbZrNXD1gz1JnuU+wnzsu4h4XWcPAO5xiHemAlkei7n DiPt+l8mcE/7VTIk21yIUMObbuRiYRM5+U8QLwkjMlSfI6J1MUWbIZXr2A0sJdgz18rd YNSHAEZz8esh9ZB0xa2pZH1TA7IUEq5sZekncYAcKSkKmMlNZk8PGVSp63KIjbPpX+Z2 uMz0nu0/vWolBtZAywphbJ3wPBqn6VMH0YQ2iI1OC7bhTXpvvdt8M9/2qNa5lS1q1WVQ 1GPw== 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=S1/gHi/1dkbwdSievaAwQQX4OGJ4Y6OX85RQvhTbtMUI94O7R4M+/pA9l9/Xeyinbs hWM2jmuaQCVk783s46RRpVgz0bIiutA/U/KBhcfze+r3wWRJFmtGSFRlCNBB5qA7GCSe AKGNCAPaPc6LsOGtXVMlOynjihkjecsnPYGboFYsIPIMrqqsVyQ6WKAVOd6bs4e09Mph 2HfjWGO0jgwrt2s5PsUH/WdiZ5eQMJD+5DAkUQcyNNtTa35fXlMh7Bbxrh3Zzs4B/ha5 M3b1Jz2JzrYOSOUsW7rDOu8CweXS1vZIDJaOPk+lkSzpm2sLSRPhnSqvWGion+0wUylA 6TVg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com. [68.232.137.180]) by gmr-mx.google.com with ESMTPS id r13si14487ljm.3.2020.09.29.23.18.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:19:00 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) client-ip=68.232.137.180; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: 5BJWP0A34vNcX+NE/3UI4XO5IOaGuqM6FNuRHLMcI8pM8+jNy5DvO/a7upL4us0QqJ/dtLGi9A jkuqji3IvdTPxUxD97TPaWD5zpKurMbk2WueKiKTw2jBBehWX/bmWuh9IA0JIpIqQbaSJy/gmX 2jEZDPMbUboi/r+0Fs2aiQQTP5wNmrLWHhj2oubBs6RYWAndoyaTfFWPnX3wnB2vhh3i4ikqnJ 2OJnzf4aK5rMT2XGC7Zon9hWNkhNeqoBXWXX2d4KlG/7iXMq3zyobQZnZHA7CYBlowY1SerYAd vWc= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="53398670" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:18:58 -0800 IronPort-SDR: O0afbweHa42n6ThD1yMxsDtBVraeWKRVC8ghA4w1qYn8VIkTogYF5LgnmljhvgeeXB+WLhEQ/O E67w2sQ/H0RbjTM8f5bjocJzZxjSCNuiVZrQ5xEjp/cYtexZc61zF9Hjjz4Z7gOLsa0nHSVqX2 QkjbMNUvKy9B44tpem+qF+licoMgCVLV2ff2sqqxdkm84iEkWcxXL7vtoSsXhYVFjVfFOUU/+s SrwDQHH0MFUtBQBaRV45M5+xMFtQFBlhThajWAZFxjJ3Kcqhcxr48o5pcR4zSl3iVy6Whf4PiR Exg= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 09/13] base-apt: Introduce BASE_REPO_FEATURES Date: Wed, 30 Sep 2020 11:48:29 +0530 Message-ID: <20200930061833.13347-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930060707.12785-5-Vijaikumar_Kanagarajan@mentor.com> References: <20200930060707.12785-5-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: SVR-ORW-MBX-05.mgc.mentorg.com (147.34.90.205) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: na7EwD9MAUI5 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