From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6899390751905415168 X-Received: by 2002:ad4:5691:: with SMTP id bc17mr2652012qvb.30.1606389691593; Thu, 26 Nov 2020 03:21:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a37:2795:: with SMTP id n143ls902314qkn.9.gmail; Thu, 26 Nov 2020 03:21:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJz7jz41HGjvZtGq0DoxTkQWuu1YxKfXw0qQ177+NdUSUAuixqkZnAZG1AbEp81VDR0ZLLIn X-Received: by 2002:a37:9fd5:: with SMTP id i204mr2668760qke.470.1606389691030; Thu, 26 Nov 2020 03:21:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606389691; cv=none; d=google.com; s=arc-20160816; b=T2Z9WPqFOIY0tCEwiq072FKaZ0VIcLkatWc/nTjTZVab+8buiJG2tRxhtG8AfuEERh cMdEDkAMBkqg815kzIWfpk1Mt5wuZUSq+nhPFK3gmM6wpsY6qgGW8JaFJRwv0gUcciKO 1Lk0SYHi/H07tQGP3FDqnKdWqYJY8+YJOKSH+0Kl6v7J0SKvVqK3SM7jwgsht5FnsoqS P2VA4XTdMF5DIJi3bfUwNKpjQT8CkUUjzmRXbozKgVyhEW+G9lJE8w/aNyqVsXn/BGjy Jt0F0BaFRCznYdfmRnCYC6qo/VX337pd+XmpWMX/n0l8EQMBEDQRdlFC7O1uy8JQloSe lSaw== 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=z73qOCTAPJqU9AmRbG9ZTjax80TGEwCyximVCN7ugFg=; b=x+mAiVXWV+3ZU9vn4jDRPq4ADjau6khOuzi6b91A6Pn9FfwjOng1Ix+aDp5shIg0Jn qemMl0E32baL+1S8S4PYpPu7ZxgeW8xuV2tqc4niHJi4A33OJlG0upurXPIQxpd0ZDfg hZZcwfMIhcHmwfc0koN0tsBmA3ZX9yURLwwwdiiNdPvYtOCsUka+TwYtdT0r73vpw76h n4E+K/thwGQfLzGrmLQBgWynRYAbbvAALOcN9TnW5yG5kTqfPVFwNvsalotjAoehmOw+ UfaRgNEH4COsAa/dt0DReXOEeokM//VisSgrN7TjjTlSz5s7U197DjK1TmRi+zuf0tQF qt9A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com. [68.232.141.98]) by gmr-mx.google.com with ESMTPS id f21si113872qtx.5.2020.11.26.03.21.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2020 03:21:30 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) client-ip=68.232.141.98; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: EiBfQJRtGOe+3jm07Rz5ZGl48LTGJLjGv8dXh7rdDBm0fZTIjCgjp6QY/YrEqFhyQCzhs4J0RV QlCHj2TvunRvBWs/cjLSxD0Y6Myyf67KCWTNZ2dDIKHWAVEH8E0AwBLyMlxeEynODAPgb9Mj0i sVVGfr6jGxdxgjHCG6o6C8NWwYNs8QAr7YG94x346L8n8otP5K2nCXaeGxUDy7ms+KyFpEWzfA tUq5s2soJeuslW/fTE35ot334xeGtJnUZlcMT0YzyxqFO4NdFDP8jy1wx5h70g5Tx2ZAdpOCSW LRs= X-IronPort-AV: E=Sophos;i="5.78,371,1599552000"; d="scan'208";a="55523583" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 26 Nov 2020 03:21:29 -0800 IronPort-SDR: 6IO97ParmIvuz8SzzPupCtB9co+dAIIJYdQIVoK9HGrnP+kxExTVFef/2zmv21dVju2gQ/4PAk w/f/M14lyGNZAwoc0XYZe6/ADYT228xwCLCo0xUavAOfl1tYzUcCQNxQpN2PLKYUxGdXANHiRb Cy5ZxE8ZUyYPOu7iG42LRe8E4f6Z9nN8r9+alOAJc2FRzfdlYaOdFx3rh2H8LEwYQ9fX7MUd0b jx4ck67w2Xgx29V5cBdrTKQ0QWIfFdXiCUyyS3xAIdNWS/NEtAjcM4CGYGztSC3oADUT/j5TEt 28w= From: Vijai Kumar K To: , CC: Vijai Kumar K Subject: [PATCH v9 09/14] base-apt: Introduce BASE_REPO_FEATURES Date: Thu, 26 Nov 2020 16:51:03 +0530 Message-ID: <20201126112108.3320-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201126111912.3037-9-Vijaikumar_Kanagarajan@mentor.com> References: <20201126111912.3037-9-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: gu7sKHzFyaVK 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 ddd8cda..a191a8b 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -180,6 +180,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 51cb2e1..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 cache-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 f972a89..9142f12 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -184,7 +184,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