From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6899390751905415168 X-Received: by 2002:a50:ee97:: with SMTP id f23mr1967020edr.333.1606389598268; Thu, 26 Nov 2020 03:19:58 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:4396:: with SMTP id ne6ls786387ejb.2.gmail; Thu, 26 Nov 2020 03:19:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmBkUw7UvIck7rrRHF27yZraKX+pPMQk5gmVl9KyVQGC97hVQDlaPKGjwDXdkksnqlidIr X-Received: by 2002:a17:906:5243:: with SMTP id y3mr2204686ejm.273.1606389597318; Thu, 26 Nov 2020 03:19:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606389597; cv=none; d=google.com; s=arc-20160816; b=a5AkC5DTPk4EC6DFnNEpNc1HRI0qhxstkspkpv6acKzzWBcrl4lZA09Ppl8+8MVtPU lREpkY7HkLI2r8ZKm03HcLUW1O7r2OzkaKt5PwAz3OZCF2+PJNh4COsnGg2iJ7mCO8qD 1IGHXqmz9Qqc5OzpcUqpAFQcaowfLf36HFxgzf0CbjKLCGMe+e4C3bO1MXf2HuLEOgf1 pec2JYxN7ZeLp4INuMK3Sd7FtkAYWQOUt9Ju8/y/zX4fle+az+xQZY/ux7zdXrrzdAgO OBkzVTyHVtIC3fXEbn1OJojs4VT/fILg4s2FwP6Z7vpXmRVSHnMWYHj9C2/By8BxlqYJ JMkA== 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=g6o3FEMkxlNAhWF1OY7uNQec3PXFHgPBHp5sy2uT8dk=; b=g7Wy0st3R3KsR1nFger+y5Z0Z9Ap7KNPGlq+Kf5yb9/8z0fynVTFL95YDBJ9sUaTP1 d+tdyXfxgplhiZkGRB/AWGMsHjgzpq7HDzsdfCs+CgHAGgDhmBkPEQSoSIcKHvp30szz +KuYVmlGdGOUfYjShEeheDfr9ULa0KtH5QViz/qeW2DNmyxhd1KKf0xiaeHLiB0H+8ft PIr+NloK4WDJmLvzlQ4wmiw1ml6O6UpppL8auB2mMn1waLVukgqSgMCngf1Layg98X1t 91nVyWFq27nUxlmT4SCjywFrL4IT6jpzdaE5qN1qqb64dnnFsybINgefLDo7vHNqwNbO lqTw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com. [68.232.137.180]) by gmr-mx.google.com with ESMTPS id v7si292239edj.5.2020.11.26.03.19.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2020 03:19:57 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) client-ip=68.232.137.180; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: BoDelUQ/7I4WNs4ABha10ygu2wLFamgyxpQvsLx13aPOFo3CtkMh98kAVEh/wVRJmRGwVlyY2L xXNKIdU6Fvj7FUwNAruyPZHGTRo5nNFnnF6PSX4SiuBMXKOGRIzDuM3uK720gF2ROKhURAd2Nt y43/kYlBqnk7EfJAUdA+Qx6XRzQUAohl1cou9IJNBUDnuh9DkXh9Bz30+MMo4D7WsZQnCi/462 MU6ntIFPBRoUTsjuMvuRv6nwDefmpT3kZFeLHQpBwu80c4z+CJKMp1PGfNbIKf1dMLTZOVqRKa tNM= X-IronPort-AV: E=Sophos;i="5.78,371,1599552000"; d="scan'208";a="55500408" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 26 Nov 2020 03:19:56 -0800 IronPort-SDR: b4jZY48sgYBG7JGwFxrqA4OkT3uK2RgOCFkVodsEsiHMA/JtvCER8J7pVhk/132+EVNpWRvSsY 7ja8v4BheQs+DoFRMSTT7DFkTpto2fSEkBvAAB4y/rs76Eyl3Q+1eaqQJNsFe3TvPA6SW7VDr0 4bg50vBFBh8UV5a4yzqM6ZygQEow3gauMQb8Dg7cApUdslVIbsPxuS+oBlatrhdLN6r95ZxuXI cZM7tJDVthjl7YLyj0qBkrJVP3RVWt7a7hpG5rlv0aUKpT6LiGcV1AMfB76gcGOBWZRc8bZkQh 664= From: Vijai Kumar K To: , CC: Vijai Kumar K Subject: [PATCH v9 03/14] meta: cache deb srcs as part of postprocessing Date: Thu, 26 Nov 2020 16:49:01 +0530 Message-ID: <20201126111912.3037-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201126111912.3037-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201126111912.3037-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: SVR-ORW-MBX-09.mgc.mentorg.com (147.34.90.209) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: VUsdmwFMxSID 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 2391529..51cb2e1 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 cache-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 fb4a3b6..f972a89 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -184,6 +184,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