From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:adf:b193:: with SMTP id q19mr4198368wra.426.1606311795303; Wed, 25 Nov 2020 05:43:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:aa87:: with SMTP id h7ls2828035wrc.2.gmail; Wed, 25 Nov 2020 05:43:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJwHEzKRUr1s+JsNd94kFPS0lVypxnjpKlOdTszN2BtXnb3FjvFKmb/6fcoqePMYVqRB0cfW X-Received: by 2002:adf:dd81:: with SMTP id x1mr3626008wrl.163.1606311794378; Wed, 25 Nov 2020 05:43:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311794; cv=none; d=google.com; s=arc-20160816; b=Psy1Y/un2y17fXZ3WLDez2rVc+XMZq+YcZPXh3LugE7Jedex9OOat3d/Nl8T24c4tk +eosHPtx7sDvUQKEIXR0BUjyVNJ/FOrXQmuyR2WXSF3bYrORq5Tm7hIE1GJ5EUTqTcYs emmWZxmIvkeYt3IpJ9K/FM00vLh6vUNtVIuMltBo/jGv5DJcVL7SHBVDDDxk71rsHuX6 NOqr8vB3M7ycwxA03IJU1Nr6bI3e56MTRnITlA6TxYTebhSh9qUi7YXuFJVHrfLgWDem Z6NzKxNPrJjEYz0nIKxMIW1GZrK18God6D2OGT6GDzh6wG9wYfMj/4QavjcwWZxN2M/k //5w== 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=eX/neAnE6fdFqMzp9SceOCGspwS3v2A7f6NXRsIxkeM=; b=vxoru4K4eeMAMdltd21OANzvRso1fk99oeIzK/OMGPXmQ1EtrKRLCY/G+OyPw3GgYM UrKTbFi3HrrB6OXtbFoxLhT7mb9BX6ITsIlJn8dqP1yJw0htJblgze3SoLyq2sWlLSsf p37JbEjOuBqhCTFoJkJiGOnKM1cQY6DhwV8KNw70eLaQfqyktT0Nq933vpKs2VxTSjem YDytIVwOXrt3+h3Bnac+hV0Nm997n+IzVfdAAxw6oAY6879oGIGf4V/zPnxZehyz2aM8 VyvZSIPhRXPO3I2MLpwe3QD2+00pNRL/+khd95juDsp94lgVNK8N/ygEQPw7PnNAHk3Z ys3A== 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 c20si60917wmd.2.2020.11.25.05.43.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:43:14 -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: s18NIweDeXKw0MBNobfXRsPZz52hGjtIb7nhrUV64V9ktnvJRY/FCHQvKdGn8+rZibc0jxPOED RYoImuYnN0CrnzedzzVfTLYpP2Rn/8sESmY36rFfu6Qdac1SecJgB7WUdSEcrImyodnnwDjh8z qWuGbQLtJuwZz0hZauRnHOq+hauk8YMYnvCxpGpbveTv8xFY1ZjdEvL3N2fXV0MFTfkUqsHAH6 a61jOQW/iYQNCb1eNiPloIHHZEtsTNzXyzS+Af441TkRbwXf6Pzzkt+SCJVnfFV2K/uGQAi1e6 xng= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597748" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:43:13 -0800 IronPort-SDR: I7qM8rkFgImp8AidS2f3m0QafH64sXnlmDAPwt0t9RBfZueFYWiv2mP8m6vEhKJiKYww80yp1R GyxdPeVTZsyfmyqM6B5/0CRue7woQVJsNgzUOJKd+Yh5va109ckOtDJHdmHrvSHE9ZBJ6d1hqW qQHACu6FHAao0+i9WgyHqqCpqUz64+8vqAORn2qLqR2IBisDiQqQCErxTyO5wzJb9M+8bWzESU 9wbhsFnlr00eECtojml7T9qNCya6PZdtoeKB8Z8biIJaQIhkxdZghBHsMHP1whNjrAiyR0p4YT 964= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 03/14] meta: cache deb srcs as part of postprocessing Date: Wed, 25 Nov 2020 19:12:25 +0530 Message-ID: <20201125134236.25878-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134236.25878-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134236.25878-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: SVR-ORW-MBX-06.mgc.mentorg.com (147.34.90.206) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: /QY21k5R6loX 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 29a3d67..659fe4b 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 2391529..6ca5759 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" +ROOTFS_FEATURES += "clean-package-cache generate-manifest cach-deb-src" ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${IMAGE_INSTALL}" ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 6316321..cfabeae 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