From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:aa7:cac2:: with SMTP id l2mr3523327edt.141.1606311891502; Wed, 25 Nov 2020 05:44:51 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d151:: with SMTP id r17ls458697edo.1.gmail; Wed, 25 Nov 2020 05:44:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJyMMVrOW76gC8A/JoOLSKSX1qdigihEOdxgXR++RNJ0/ZQKn8u9LP25sgUqjsh/4IQ6tNBz X-Received: by 2002:a05:6402:19b4:: with SMTP id o20mr3538650edz.103.1606311890600; Wed, 25 Nov 2020 05:44:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311890; cv=none; d=google.com; s=arc-20160816; b=ienTgazD/K9p8IFLmTTMgKBM2X6a8o/Er4bIS5Ea614Dp6BCn6StCcdysghbzmiRJl puzh10rkxkfaJYppSNVXRUhkk+BrlsmITiPFCxNQ4IF6gplNqnV9jBJNwDIkslqFjOZF n6i170OQRZ76oiATofkQXJSs+DjQKHXtIhU86O+4NgKqcJ27F6Q+5TzIdyfX9lMsVVxv eJEY4kGJwQVq5tgrHxVIejwZe17FLGu4606RroEnRs87PxkRhtAMPhWPn0/ffMCI3VHj EyM6pk0j8k1+LKJNnduscKWQrwPUWzJwA3SuvCWDwfllPvdaAhENz8GItzML2ayH4EzX RzXA== 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=eD5nNJdjiXtfTBDCd6FrgK16Ls8aWkQrvlXUBABmzhYy7hcW6mWXhzv0fV4nV5q0as J8019n/kNb7sPFF8RTuCj7Aofmr0c4m4Rxb20A5dOP0Yg9zzgqfl2nmeJ8dRHVewThhJ KN+u/dxrCHTzyXLO7nPFpOyJCwYFrPZyHxAFjYJOVYElqjdh4EX/mX0uVEclR6AaAvmk RPWLvrSXgt7M+gYO5szGHfX3FUjllIkUN8Z6yUAbwpYyRoGqaYxAjFrNNXFsd0b6UI2E 5KRUrGkaSB335WElvDXpD+ckql8ZhaNo3vKZs/o8M5hh6eCJb91T90JnelvAAdgkBDFU tDkQ== 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 v7si130589edj.5.2020.11.25.05.44.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:44:50 -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: w/70mdxXftQOsQXs4HBQY5p49SaGs10XrWEEd0D8jJYAqeashzQ7NKOR53/vOrn3KIXajHPl/w aeF6fpPTwEPz4AOE1bNFtFQw7pwvHC7fzEo5lJIuWbzf9tm0ZidqCHcNxiOWaaXgwWZPN/KLhH ewStThb3Ky1Lujvb1NWDL3MQMXEEPJ/1Fi8q4oOaH/ZmdeJlVnWygW2tdVYzzfIAXgKZgF6P6Q EZUfxZ38LDJwjBXm/6Kae15uvEAw4Iz637SmmxeEBq7Yd0E9LxVlYkVLsE89w+nO/A1lOcaoFk 8jo= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597783" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:44:49 -0800 IronPort-SDR: dTE+3DbF89EIwtTwwGIGrQ7HC0JwsXDV8dEhhmEdoQ9e61J/TWn8o8pc3u8HVk67gdncp9N2to 4JpcFRLwTzSmAVTXJoeZ0bonF7gp68g95sPMrOaSixl60BLCzXHc+6CNbfuuRKm8JCp8Po+yF1 n+RVe8nASo+3PJdqqXPHPjiNUBMiszBt5PtXLV0cyibebkd7WidM/ErSM8UapLl1w45/azsLlf 21uK+P/hnGa8SvuL89r+N8LgXk3ToLYa679oDHteCCTDn3pzK45+UwrT0Uum6VJubF3GXTKvGj IKo= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 09/14] base-apt: Introduce BASE_REPO_FEATURES Date: Wed, 25 Nov 2020 19:14:09 +0530 Message-ID: <20201125134414.26061-5-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134414.26061-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134236.25878-5-Vijaikumar_Kanagarajan@mentor.com> <20201125134414.26061-1-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: WnCR5QcizVwJ 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