From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6816610675337461760 X-Received: by 2002:adf:fe0e:: with SMTP id n14mr3096931wrr.247.1587115859456; Fri, 17 Apr 2020 02:30:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:a551:: with SMTP id o78ls2136732wme.2.gmail; Fri, 17 Apr 2020 02:30:58 -0700 (PDT) X-Google-Smtp-Source: APiQypKi+L6IZ5hFRM3gXSQn723sBSQOqJYKkAaaVWcDeP61GziMAG1d01bzz7WzfPULQf+ta0oc X-Received: by 2002:a1c:1bcb:: with SMTP id b194mr2582330wmb.4.1587115858776; Fri, 17 Apr 2020 02:30:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587115858; cv=none; d=google.com; s=arc-20160816; b=ydY+iiWb6URj3yHwJGy5QhGsbHE62iHiqFGca/4ZGWKNYl25HqTWReW6inMSdoNFme 7NmIdC+wA9RFGyJovp4H7syeaV2axbymr3eOIbgyICEdBjj8OG5hSybiLSLCM1NdfxFl dp0PfhEW5Zp/K1Y8oA3W5gPbKBCxzxz+3YVtDxxAV0O/ffSG1rULrwIcLCDWG9F/Q5QS hfeYl9PjM0EqY2I5+a7dAzq+d7+f/QG3d89LpOxvOhoI8R1TgAfLK0sUoW6xcff/GJsQ +mzjSlLZBe0QABmaQ9QrmM6UFT0gzBw/haXiRomP/WrXuTx9SWw/dzXPEzu3udNmeDfU uS3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3A9oXWCztfuMsjENkf/g64VEZzp7eGtQYInRf7u1mzA=; b=mZefez1pLdCRt4up3UnEIIQErOgjjHVeJf81lTrB6nuRAowD+80AT+v/B1QaocOakb RgeKjcAwXbKy2B3qSqyM/HGiiX7UoHeFFHriVS4JcMLAPlzvLvQIRo1+JFsEOHUVvdlR N0YRA1EPeH8zool9obAeAbxU9i3E7lHTHTBvm2eU8YbX4NSS3c32DxPnzy38vMVuQhne K2FWJ5wz/Kx8jtu/LP/XNXSr16wwdqsYgWb+6CxopEL90hRSvhWtamSS+wY/lzC8MmW1 +xt6SGk5YuH3rul+VkshmFkp4uIhkcWGoyZfSLPP1och97i4Y6H/m5Lwkc5klZsZX2jo gcyg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=NJ27hFqR; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::341 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com. [2a00:1450:4864:20::341]) by gmr-mx.google.com with ESMTPS id x11si326556wmi.1.2020.04.17.02.30.58 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 17 Apr 2020 02:30:58 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::341 as permitted sender) client-ip=2a00:1450:4864:20::341; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=NJ27hFqR; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::341 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wm1-x341.google.com with SMTP id v8so4478101wma.0 for ; Fri, 17 Apr 2020 02:30:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3A9oXWCztfuMsjENkf/g64VEZzp7eGtQYInRf7u1mzA=; b=NJ27hFqR9X+EVbvPfjthrMkdLvCX5SIHkYLBjxGXYYB6Go9wdyi7Ao9cCltuH7PwhE l0DBCTDha4NVhdqo5IZFWORG/VrNWbQ6Wd+2MPRfKnP4wKMREhrySRZAqw8Fv7Vz6+0r y/xS4buEA6PPCMz8T2AXHtwnkdOuYR73swYNLFK/ymmhNAsenREyH4PS2o4jbsnN1dnb bgan+4qaR3GwzUpPhnZncJegNhY1417gcFx0VA54Z5AyMy2h94KU1Ajs3/qxIU2l6iN6 cPvGzqf0Y0bPgjSzMtZLenSUINj3R6C7Sg/nsPHYH9A+sK6mgfnYKPnIDUkNYcI2HiJM yl6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3A9oXWCztfuMsjENkf/g64VEZzp7eGtQYInRf7u1mzA=; b=UPMomyif57IhKb0vybrGvYrc5v4mAEyI07DsTTmQY4LboEw3XYLUQbsv56Ddoe24Sw NSF9DxO+gZAAHUpQ5SrGaysSJ7Rs9VZenf9TLU1/P7OEI9A8jDSMDiCpfcJ0NAxVmbGl gNOS7o+r/mdSo7uYsokMgE6C4SlUjRs1MVFtZYfhfJDHVXrOkvH7jhsSdjkwDS8udBdD W29HU2bK/+HgIWgsIZ2qAnToldrI83/SZOwJhfIzXPbU2ikPV4FxRr8TNa1DL3j6PSJ0 klTlcx4TipvYZoDDtKzR/2heN8PCYhiDANyw4zh+nZ6o/wVJs6q3t6OjSzBW2vTsXN9K NKFw== X-Gm-Message-State: AGi0PubCAjc0JL0+MJSFqQU6yL/07/ublvXFrth/H+HQkEvbI7HfyvSH 4l16/11qCYF16Q7yiTG9jzciInU4zKA= X-Received: by 2002:a05:600c:2046:: with SMTP id p6mr2394506wmg.177.1587115858089; Fri, 17 Apr 2020 02:30:58 -0700 (PDT) Return-Path: Received: from oxygen.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id l15sm6836256wmi.48.2020.04.17.02.30.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2020 02:30:57 -0700 (PDT) From: Vijai Kumar K X-Google-Original-From: Vijai Kumar K To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, ibr@radix50.net, jan.kiszka@siemens.com, Vijai Kumar K Subject: [PATCH v5 03/13] meta: cache deb srcs as part of postprocessing Date: Fri, 17 Apr 2020 15:00:30 +0530 Message-Id: <20200417093040.15130-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417093040.15130-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200417093040.15130-1-Vijaikumar_Kanagarajan@mentor.com> X-TUID: JXsycWUI82FI 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 | 39 +++++++++++++++++++++++++++++++++ meta/classes/image.bbclass | 2 +- meta/classes/rootfs.bbclass | 8 +++++++ 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 29a3d67..472b9fe 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -5,6 +5,45 @@ inherit repository +debsrc_download() { + export rootfs="$1" + export rootfs_distro="$2" + mkdir -p "${DEBSRCDIR}"/"${rootfs_distro}" + ( flock 9 + set -e + printenv | grep -q BB_VERBOSE_LOGS && set -x + sudo -E -s <<'EOSUDO' + mkdir -p "${rootfs}/deb-src" + mountpoint -q "${rootfs}/deb-src" || \ + mount --bind "${DEBSRCDIR}" "${rootfs}/deb-src" +EOSUDO + find "${rootfs}/var/cache/apt/archives/" -maxdepth 1 -type f -iname '*\.deb' | while read package; do + local src="$( dpkg-deb --show --showformat '${Source}' "${package}" )" + # If the binary package version and source package version are different, then the + # source package version will be present inside "()" of the Source field. + local version="$( echo "$src" | cut -sd "(" -f2 | cut -sd ")" -f1 )" + if [ -z ${version} ]; then + version="$( dpkg-deb --show --showformat '${Version}' "${package}" )" + fi + # Now strip any version information that might be available. + src="$( echo "$src" | cut -d' ' -f1 )" + # If there is no source field, then the source package has the same name as the + # binary package. + if [ -z "${src}" ];then + src="$( dpkg-deb --show --showformat '${Package}' "${package}" )" + fi + + 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 + sudo -E -s <<'EOSUDO' + mountpoint -q "${rootfs}/deb-src" && \ + umount -l "${rootfs}/deb-src" + rm -rf "${rootfs}/deb-src" +EOSUDO + ) 9>"${DEBSRCDIR}/${rootfs_distro}.lock" +} + deb_dl_dir_import() { export pc="${DEBDIR}/${2}" export rootfs="${1}" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 6b04c0a..fcaebd6 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 cee358c..ee57989 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