From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:a62:503:0:b029:13e:d13d:a0f9 with SMTP id 3-20020a6205030000b029013ed13da0f9mr989933pff.21.1601445842458; Tue, 29 Sep 2020 23:04:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a62:7591:: with SMTP id q139ls409949pfc.3.gmail; Tue, 29 Sep 2020 23:04:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJym30qG4qF6YsEK3IrAKcwpwG+t4tcvD8P53Y1V/sTa8aqek0n4P83EbvaQZ8L1ZTF7zV7Y X-Received: by 2002:aa7:97a8:0:b029:13e:d13d:a105 with SMTP id d8-20020aa797a80000b029013ed13da105mr986862pfq.33.1601445841819; Tue, 29 Sep 2020 23:04:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601445841; cv=none; d=google.com; s=arc-20160816; b=C8NVy83zfwWeLdtcML7+I+vumCMhMo8gwUKLRiAnEGHMznfWqg3B1NnSbHHPhtLAI9 cNcTRajUCJnkXrPXPDyWsRgTRoW/XhX5EE2+RJjeLItTTlYFMc4d3AVduBqns17rVlFP SoaZAqPGq7/NZx5fUKvYp7pfxq4AgRmevqF4nvwdKdOw2fZVPk2dpdtQeLgWeQxfRy/m LCo++3D/iQ21RlaH6RdZ7AHi8R/1wpPp9E9lpfInK3WxIQnJ3hHo0zk4fWjrxi2FUuzI 8Y9463auhedufMTC/OIZDCYXdisulLrSaGu8cjJY99o4KoqdOxLsQv35DWrI09I1gDqQ dW1g== 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=y2InMz1Rh8jk3Gd5anmbmiLOJ/s9goxmMfxFuLZV/fyGFVEeyKHyr0TTuxljdWVEMm soz+2JqYtNxPrGBAMgccyv+69AXJf3PTk7sFP5+izC3Pic3TkHSz7sUON7ILrGrsmCKS KuwNd3u5XgzSnHjKB8UySKfqD8eZzpJwmDAJ6RGomZk/7jD0hkNLzjRZcsg0RNuCT8Rh bosWjfX9s80uguAqjtVWX3OpBhsW2XkqGMfeiipR8Oh2ADXbGk+U+j9sZcYk0obYi3ao WO+QcRbnnQA/rKG1DPbHMxVaIml3VCa/4oSg/bEkmN/NCsQITgb3KHioZEsks9zvyY0T BYpQ== 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 mm16si51246pjb.2.2020.09.29.23.04.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:04:01 -0700 (PDT) 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: WQjwQO6OLn8g0wGJ4vjWaMrmAt1wLvH1Mnseddy/SF+a1EAuJotNu5C9BkrtF48hGoig2lJWYu LfAYPMoaPtD0LiG3vss9qDPQiAUqiZqBQaJok2S17/a4BrH7RtD5AlBkrA/1Q/TPwiBtKKDI69 7n7PqjiN9+pHKkOgcM49c2mG6h6w9bsqf+FPOTwhHyS8W3IItEy12/K1l96pa6U5/x+wGVzozZ MuKZ9zD19JxhtIE34dd76Dv2Lvq0OALJWE28Icaz6sX/157XGql859k/nMP9M17sOJ3gBen8IO i0E= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="53461963" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:04:01 -0800 IronPort-SDR: x4bxb8oo1Tp6bHFhg0EeGb9yk0J8k355nG8HghD4c1FsNC9qP2JrOv0llmLA4GzzZ+XxOFRRZq FAmzjswbq5o2r0/kS2WC/Iji7oI8WgOJafnfT8YeC8Er88yUwzY/bahx0jz/4qdzqxKFmWxD6C VmxMQM7nwH1rLpH3HX0hVqZ+JyFn6kijGQFcucOfBCWDqUipdHUzv8Y+5eZO3IdzMpkSHw2uiO D/OoXvPF0FjFF5rCs09h5bwL9koBSOoCBbzVPX3Yb9dEgz/YKccs3aPcxzKeaODvmDgqj8GS4U lsk= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 03/13] meta: cache deb srcs as part of postprocessing Date: Wed, 30 Sep 2020 11:32:49 +0530 Message-ID: <20200930060259.12422-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930060259.12422-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200930060259.12422-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: zwBDqyjSa9yi 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