From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:a25:2f4e:: with SMTP id v75mr2889518ybv.18.1606291416119; Wed, 25 Nov 2020 00:03:36 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:c553:: with SMTP id v80ls815727ybe.2.gmail; Wed, 25 Nov 2020 00:03:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJzjlNYwbVBL87lZVYkgBrN1l64wuyxSAI65fd5YQT7kqDkjFDQ6q8ZNCpk+3Xp3LJbq3pfd X-Received: by 2002:a25:cd48:: with SMTP id d69mr2415402ybf.465.1606291415697; Wed, 25 Nov 2020 00:03:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606291415; cv=none; d=google.com; s=arc-20160816; b=KJOBGTHAzTfZU7zMXIUqBgnguq5PrBPvsK54HA0Fb0RmyBaKI3mFSIHSvdnxF9X54C zm566ft3vb0XJRWkX2i7C9qulWLpmgE7SsUNfKUuXBWwrQNTwP4peHT7GNwiyyoosVrl 1s3eDx7FASH5j0WxIparzajdkhlZAiRSkJ6OPm/6sUrGFdVN19FL/hhI8/WH6W9msEm5 BtowgpTfLa7T3TQ3remLhQEBTKoYXFsm9t3RSQiRW5STbVeOu61cjzThJl7hEx/wjyOe 9g3HuXz1bpYm+Zhp/sspyJHmQmIAv0mP+Vv7/cL9bNNQ4HuceL8EjZDZ6OkWdhGgRGOH ifiQ== 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=gKix/jY2KxRhYm9gd296ZxIE+1tVlM3zHV6w6cPaDYPgvVSqATwzoNSlHXPAqNct5e jm6KXY27APFH4SLJriX6jL41BbFYn7KFh9zMa9RTNMgcgOsarxTeP/m4b/TW5ZMvLm+s fZBplhPkhNfaAvT8R6K1gEwYWPkV6iGWmjt0aWUaxcjnO4U4EViwfh7UD9P17QdOeZO3 ET8juCKrpIUcJtNSA9KmUfxAQomc0OtUXp5ViKetS19lIcPCpw84b8d0WjdTPB/f+kgL T7+hRAx7wnEYXW3nzUOUMdvRvcWlOmw7Dkba8mSkT7o8Rh5y555WMkJ+2ax+PJ/NjCdw CQuA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id 199si77218ybd.5.2020.11.25.00.03.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 00:03:35 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: pofX55Kz6rfWTtFP9WAEh4694++H3weMFhfEsUF/ilEQG9jrUFbnNmSYUtYKj4C/OBarO8QUuR SZgxJptqy/sm5ua5cTjLJfaqh2pHbtJ6TAaibmIm6eu6ZpHWPj5PSC+8mpnGwE1tRVh1/Mo6lw wx8mwDBzJm4pLu8yrqdFL19bTXGQTh/kKzCTlZ25iM7XYJrIFUM2/+FzL8tKGlkmkpDgjXJvJT j+fe6VHRKEZKzndIYQ1AtUZ2T6gGMhcV555rz7cEYUYmp98Ob49hwJCbMHOXnJHzGnOwJnySYY xPI= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="57762477" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 25 Nov 2020 00:03:35 -0800 IronPort-SDR: ZRXO/9D4L3JnCoK5N2Yb23UeeUuLS+f8c/KNweEaLizPDpXHlq2w1nBRidRUsZKHjaLUB0gwDE 3C2cQPiraHRxZNcLKy8MEx1l6r1NVp39sioKezLJH2QX9IcE1knrUBuTTCRo9V1D5NAC1KjFuN oxoKigwssBH9j97vLyi3bh/sk9vzpTU8GfdInKAYzAHp0QpgQYidM84B5zXYYB+tQzYJI85g4h r1DzLBPqt8iMEi5pTuUFAxmoF2RR1I+pIGnrkpnonPHRiGqRzWZOQD0IL1Us7/wMXu1JfOxwqx eeI= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v7 03/14] meta: cache deb srcs as part of postprocessing Date: Wed, 25 Nov 2020 13:32:50 +0530 Message-ID: <20201125080301.15818-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125080301.15818-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125080301.15818-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: I66pBEoHOkoU 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