From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6899501277566205952 X-Received: by 2002:a1c:1f16:: with SMTP id f22mr4611000wmf.108.1606415331815; Thu, 26 Nov 2020 10:28:51 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:2348:: with SMTP id j69ls1362263wmj.0.gmail; Thu, 26 Nov 2020 10:28:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJz+Hz0p/eLX3sw9gBRKFXNSy14u/exm0f9axI1TJT/y55sTfm2r2ms1agBqkjGWgF4jVUdO X-Received: by 2002:a1c:3b07:: with SMTP id i7mr4777839wma.118.1606415330780; Thu, 26 Nov 2020 10:28:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606415330; cv=none; d=google.com; s=arc-20160816; b=YMYETxsnjN+yh0O7ZafXiLSp5ucZtijy5qVIK+1F/VUiBPE262xwlEn0olXRPmX/QL 9JvssP+l1vPwGaSg2bxQtlRuPXmyRf9A9G0Op8sPB69Ql3wPkbIYmHVKyoxeJryFTcKT /Yjz3H7aGf0v5jNeePnb4VXcmGvdljYVqjDo3qyPeFY0Fd9Yieb7MtsInyTaQm28ZEuQ gLoW1oahTTFEsj7uAnw64wyvxm0bzLqeLTtBMFNJfS/biIWj/SIHUv/ftRYYEHNFZ4QR /VYT3kz8X+0wvRtrYQwbjzJN7UZgk9O4r10pZf5theXmKWzQWNJLKxaokuZigdJUGueT P7dA== 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=cQO/sSUYo78qSrw8hvS3rKWB5LwmfjzxgH49turPTjc=; b=emhp3qH/iJ3IHpHGz4WC48SGuFDM8PXLlQyRauXesIq+X9S15Ulg2jznx1O/Kjv1dV nkft0ZjwZZ2LrSqlit+VxcEhM5sgwHShHAfH6aeS8oCrxVG2+OqBTBvvgs3l9K59cMkT D8/LNg5GXSRIJr5de4wb9uzY+mEBPifZGUdmWs3D8BX1Nj26d9w5BF5qIIuBBlFUlygf 7MY1dEvtoQr25bCw9Ej1fkSeSCGeYeFQYw3k02UqbmqLc8+btMz3PlCfCHvcsZl3tPPF 4fihs30YrtDVgVLeDLOgu6p2UwUMbZ1kxJOEpTgw5rMbhFG+wl6doAaQen+YFZ999ZYF 8hiw== 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 y187si226499wmd.1.2020.11.26.10.28.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2020 10:28: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: iBlcooBKk5JqqCPi+5cfjvjbnvYPBsDJHSi6hKoDm8zvhVSxF1QrdlVlJ8PKEDq/+jI0QM/0nW ip+q97dQLGg81RCsB4G22OIZiCKS/CZy6yW3yR9t/UN4jJAhsP7OHUpLj6l5Dl+ItDLnb69DL8 dSmZUVCwP6yXesJnISWmmEqX1C0+q0L56tEFkMWt24n+lj3NWNWKTaD/EQGT3pAAhI4rTDejfg EeiH1PckN/xMZvbSxCB3PJ9TvFgIDu4nhaM0CXZFZuf5M4APUIM9aXp4mB8GdZko6XUq2iFpsb kfU= X-IronPort-AV: E=Sophos;i="5.78,372,1599552000"; d="scan'208";a="55644668" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 26 Nov 2020 10:28:49 -0800 IronPort-SDR: eOJsz/pzlVnlIzUv6Alpgy1faue1dgTKiDQNMLmb0QCpKvurdx0dAl9dBfh9/Iy6tQZgONR7Ae t9385srxn4B3QdQvU2hfe+3cHj+OXxR1eokUZNjEIIo/b4bd15A9HDkU22RmfO448yLAfgyO9/ StYsYXHgwWhRsGD0VnIRTZyA6SRMFcvrTcaPaN7lQcOiAekQh9oMS0buO6DaY4zxAzhqJeUg/Y LsVnxDYDtr1H3PzNJ2WxJ2shZT3q63Ih/R0gI0dKIL7KElE9k6CERI5ekFV4dfGb0YWppLPnL9 OIc= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v10 03/14] meta: cache deb srcs as part of postprocessing Date: Thu, 26 Nov 2020 23:58:07 +0530 Message-ID: <20201126182818.7261-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201126182818.7261-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201126182818.7261-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: svr-orw-mbx-04.mgc.mentorg.com (147.34.90.204) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: TFG6O1jIoTUt Collect the deb sources of the corresponding deb binaries cached in DEBDIR as part of image postprocess. Signed-off-by: Vijai Kumar K --- meta/classes/deb-dl-dir.bbclass | 27 +++++++++++++++++++++++++++ meta/classes/image.bbclass | 2 +- meta/classes/rootfs.bbclass | 8 ++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 92f0259..bbc6f0a 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -5,6 +5,33 @@ inherit repository +debsrc_download() { + export rootfs="$1" + export rootfs_distro="$2" + mkdir -p "${DEBSRCDIR}"/"${rootfs_distro}" + sudo -E -s <<'EOSUDO' + mkdir -p "${rootfs}/deb-src" + mountpoint -q "${rootfs}/deb-src" || \ + mount --bind "${DEBSRCDIR}" "${rootfs}/deb-src" +EOSUDO + ( flock 9 + set -e + printenv | grep -q BB_VERBOSE_LOGS && set -x + find "${rootfs}/var/cache/apt/archives/" -maxdepth 1 -type f -iname '*\.deb' | while read package; do + local src="$( dpkg-deb --show --showformat '${source:Package}' "${package}" )" + local version="$( dpkg-deb --show --showformat '${source:Version}' "${package}" )" + + sudo -E chroot --userspec=$( id -u ):$( id -g ) ${rootfs} \ + sh -c ' mkdir -p "/deb-src/${1}/${2}" && cd "/deb-src/${1}/${2}" && apt-get -y --download-only --only-source source "$2"="$3" ' download-src "${rootfs_distro}" "${src}" "${version}" + done + ) 9>"${DEBSRCDIR}/${rootfs_distro}.lock" + sudo -E -s <<'EOSUDO' + mountpoint -q "${rootfs}/deb-src" && \ + umount -l "${rootfs}/deb-src" + rm -rf "${rootfs}/deb-src" +EOSUDO +} + deb_dl_dir_import() { export pc="${DEBDIR}/${2}" export rootfs="${1}" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index cdde195..0cc31dd 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -63,7 +63,7 @@ image_do_mounts() { } ROOTFSDIR = "${IMAGE_ROOTFS}" -ROOTFS_FEATURES += "clean-package-cache generate-manifest export-dpkg-status" +ROOTFS_FEATURES += "clean-package-cache generate-manifest export-dpkg-status cache-deb-src" ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${IMAGE_INSTALL}" ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index fda374a..23643ce 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -185,6 +185,14 @@ 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} + debsrc_download ${ROOTFSDIR} ${ROOTFS_DISTRO} + rootfs_install_clean_files +} + ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'clean-package-cache', 'rootfs_postprocess_clean_package_cache', '', d)}" rootfs_postprocess_clean_package_cache() { sudo -E chroot '${ROOTFSDIR}' \ -- 2.17.1