From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:a25:b804:: with SMTP id v4mr3130241ybj.371.1606291422311; Wed, 25 Nov 2020 00:03:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:c553:: with SMTP id v80ls815790ybe.2.gmail; Wed, 25 Nov 2020 00:03:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJxRfklObL6FPD6BzoWKqkL/iuu0e76jPtlUAGz6tqgFAOD6KwVMsJQoE4PUBaYpVyxuCtrT X-Received: by 2002:a25:5702:: with SMTP id l2mr2419735ybb.184.1606291421866; Wed, 25 Nov 2020 00:03:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606291421; cv=none; d=google.com; s=arc-20160816; b=mhcHlQsWInfuaNvE9iTj867BpVP1GBJEifoIDyeJKVsQ4XG/G3DzyBQSTD27276Cm3 bz6JUG5+5OlQhw602HWv6via48R+uHSclmcEnrs7Mejp0Ks5TMYYfMFTaTeMSRhi+LAS GcUmNsIBV/4pSPYWRZKusdJcNExIkEncSyceXmBA7NiUFIhmkwbHZGFdIYDRPlDevuaw 9jawY1zBN3iP08yX1uy67fshNKDM7jApjnCNJ96kyPOxB3J7BNwVNPCEoYBhqznAuQFj HOwFlqY3w9HObx5jiIhZrWkOvx6eerJg5HP283M7c2EDQhzdJlRDekJt0iOb4vApkEtn /Vqg== 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=no9hSo7RZllFmyagmgiwNi3BFDjxbPTReSBDBoqfkwo=; b=IqCEZUYKZP/u6p2SnEVYDICqAPk/Fp9bNv8hfI51kpgRtmUVwBbMfH2v8Mthc32KAz 0jX7ZwIv2bVLDNKUila+sUU3IAwuQL19FGKQ6+NYSEDL1s0Mvi5xnkr4zgfQ+pEhGWX1 poapXJ7plvU/dlP/+ZTIaZ0yilmVvneJ+nYWd/RyfQO9IapEpNmm0o4xt0oMgJ8O10qY necLIVS6474xyR699M37PBlJAsldWKF+cCBFANeUoZDP1yeDaW3UPAasKuIftWCeDx+T hu0RpFINqzubquP5+yjic5lXd3e6YZwDQgo3TpJEotJ1LPOGz6ieBlmNmSvmftT12i5k HV3g== 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.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 00:03:41 -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: DdRvxUMruSzrfqMbHGd00rnEoqIk5+TvyOQGWWa0vGf2AruRzRSKLiFBKb949Od3I6WUhQhWwC ixUmxjkJKU5C4DyUbDEy90fxaBzw+63CvQ3XqrF0l5FH+x8EeGKv9iXVxNUTULR1TQQrZU2vuz u31D9tR2IF1sRsIzvtwDKmLOdaVJtk8rS3jdFPxtXMGTlj1w43LI+GVxj87/1+78/An2N0Sf7K 0a3y/DTOwGWcQI6xhkxV1WScCUMJBklFINat5Bl/tqo8NNXUMnHz5/+SAoIeVDDmWfVK15mPYJ +ck= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="57762482" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 25 Nov 2020 00:03:41 -0800 IronPort-SDR: 2F7YPlky7OpZl8tQTQngXnv5eePY0y/24DgKb7zyMfcpczaamjET6zNbHcazQDDLIguhtSkvcs X2qyKG6y5hOWByFqAQYZCpf9CWo02aPNjG980nQ9EG9xgmic/zftU6vChWP7CAO4W/pYZsegl6 Jd4rCA7QMm+ltAIQJeQtBkvI8Yk8thEcxQ9recYsQZrWTVCqXk7KWSpktfWP1yPfMl3pSAFHie SR8TLjPtcpO8JYAGagzgovW2xKRZkQy4ZcCb7Pt+ihOuUIo+S+0lLTkR2vDC+T/++78eoY/f12 x8I= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v7 05/14] deb-dl-dir: Download files only belonging to the current image Date: Wed, 25 Nov 2020 13:32:52 +0530 Message-ID: <20201125080301.15818-6-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: hbbZ6RHn87xV Avoid downloading deb-srcs for debs cached from other image builds. One way to ensure that is to see if the package is present in the dpkg status file. Signed-off-by: Vijai Kumar K --- meta/classes/deb-dl-dir.bbclass | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 79a9a88..ce691cf 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -5,6 +5,15 @@ inherit repository +is_not_part_of_current_build() { + local package="$( dpkg-deb --show --showformat '${Package}' "${1}" )" + local output="$( grep -hs "^Package: ${package}" \ + "${IMAGE_ROOTFS}"/var/lib/dpkg/status \ + "${BUILDCHROOT_HOST_DIR}"/var/lib/dpkg/status \ + "${BUILDCHROOT_TARGET_DIR}"/var/lib/dpkg/status )" + [ -z "${output}" ] +} + debsrc_download() { export rootfs="$1" export rootfs_distro="$2" @@ -18,6 +27,7 @@ EOSUDO 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 + is_not_part_of_current_build "${package}" && continue local src="$( dpkg-deb --show --showformat '${source:Package}' "${package}" )" local version="$( dpkg-deb --show --showformat '${source:Version}' "${package}" )" local dscfile=$(find "${DEBSRCDIR}"/"${rootfs_distro}" -name "${src}_${version}.dsc") -- 2.17.1