From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6899501277566205952 X-Received: by 2002:a1c:230e:: with SMTP id j14mr4814855wmj.187.1606415337856; Thu, 26 Nov 2020 10:28:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:cbd5:: with SMTP id n21ls1357852wmi.3.gmail; Thu, 26 Nov 2020 10:28:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJwBuNU3wcnnKo8Xsc+pE8Ys1j8+Zqv7hHcMIxumC5OpCWM67ePnF0FcWhKnOf3U6QLx5kU+ X-Received: by 2002:a1c:f715:: with SMTP id v21mr4852239wmh.2.1606415336960; Thu, 26 Nov 2020 10:28:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606415336; cv=none; d=google.com; s=arc-20160816; b=We+vQq1rBOTG55kqIA5+IawEvp87Z7RifuWWi0dzE3X5n24CR5oj0UrJ/0clMdOrmI JOdl6CRx4Et9kB8JGLJ4Nd5PXi7EfUvaWY1mYLuYfiRz/aUSpixyT/UTuVBL6xfrCNnW F0PBK7a95Yme+guOJG7EsEMUT7WNoKQddnThns5srfFV1/32kvnMl4iT8hRnpL2IBapa E1wKHBoEzAStt+VwLam1ITxM5VuoIHFBeTSf6Dafiy50CJL1W16K553H+E18D+0UBhbU qW2VZ3WkfIniDeeTgOg8q7CZ5FSJvfgJUNmN3qgxRGqfpS0LLbbQHHsyOlt0I7S5ebAd UTgg== 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=NqdlHWbslZz6Koeg529KaDOuH+cifcn0yWfiuZubAEo=; b=ayBFs6Y/fpnXas1NShHSWPWL08qY9MfeTuDcGAD8984asAAFmqDFxicDeJl/y5LzY7 +Z/sTiuAEcZDTI+ACAB9kSy+A+DuBbdtWeHG0aQkKVHZnD2nXGi3r+aBT5dxyQx16lbx SsytdfFwdgyjOQlR+p/EwdTEErwM9AxXAMrniYNTLhgWY83tUlzs/A3DRow2HUBBubDl PBX3uO8fOM4wLnMPZvHiCIK6XAGXLRQmwQqU+w7cOT++cZFHDxXrWlmpHhUjjHCjNa7U MnSDkF5PaKplGBDjNaoioXTWru5K/5uIB4BHCeTuEVk+wtHVgvGRwyJO45+XkMy/QvKZ 3ogw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id y187si226499wmd.1.2020.11.26.10.28.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2020 10:28:56 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: MC34ZR4WDpuJZbzDkrRoIECofxJQUJkAcsji/v+PRGaWWx/jKuJ8XtVZzxfJgzAqbxXtH3pu5M ibBOOuBU306fHRXCmT5+ykl1yq2ja0h8sIvLn2iEpSEV2ifUhfb7js9KsGzHEMrhI83aFC7rJj vvD9dBO/+ags2RiwvALtHGu4fbWWFnSGMQqWkuExguEoMLbKLLjdnbsJtGknLmL9NiyNBxTmbC 8UwTk2IGW3Xz3ssrEyqF7YLjmgzo1w4Q07D2oL2kdj0PS9EiFflUKKyO6I3lICU5dx3aYqhNjh ARU= X-IronPort-AV: E=Sophos;i="5.78,372,1599552000"; d="scan'208";a="55644673" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 26 Nov 2020 10:28:56 -0800 IronPort-SDR: Ur4TML6icwjoIeEiPgZVfw6uSyKnOaufd2kdN14FboFs4r2msWpcEI5azQO99PZb5BVoRVqXb5 +/TfPRmkThqjB8L1tSb1e33F8/XcmzgBZoqaj1UzZl5+f54kpDWowoHezsRfm/FWXkd8SnKLmC VsxXw/zUw28lnfMjL7fX9/jqkzbY3PPe4wiF2TDmyOMmDHhSzkzGEwAv7BSH5No2FEzvAlWjwk uZMIpRHpW61row3Z+Uso4vX2B8f5gdxuq09+WqkEIi7r+7egeZk8iaj45lPUpuU5JzaJiiudrN N4s= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v10 05/14] deb-dl-dir: Download files only belonging to the current image Date: Thu, 26 Nov 2020 23:58:09 +0530 Message-ID: <20201126182818.7261-6-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201126182818.7261-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201126182818.7261-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: 9DVE23yrgvlp 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 0e2cef2..410befd 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