From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:a17:906:1542:: with SMTP id c2mr3029736ejd.382.1606311880489; Wed, 25 Nov 2020 05:44:40 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:28c2:: with SMTP id p2ls1087855ejd.10.gmail; Wed, 25 Nov 2020 05:44:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJzcYuD2DUCguZlrZug1lf0+8P7jgf90eTe8iradXtL1IxxZj9Iou/EYbn/eA6rnAzGBx+o/ X-Received: by 2002:a17:907:9d0:: with SMTP id bx16mr3319747ejc.426.1606311879496; Wed, 25 Nov 2020 05:44:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311879; cv=none; d=google.com; s=arc-20160816; b=iA5M87sa7bbAA9k86rBaJb0Uvu0rS9NHqMqThe0hEIcND0hien3GJHccshelhXv2Ph BDNZuvfof3Ti+6cWoabwgu/XInyNmoIoUJii9me53efJJM8mGpBJhUmEJcGSgCvLo4bb lex94ozD0M18Rtr3kCatbxVdiz6C4hN3NoFKwoZ3mK+s4lBx4IlXTEu/gogbuWAhCY7T l0IeCZj/baXDhWtIyrRNyScBtz/m8Xi7TEbBgO0qlggFjw7l9med5p6eadm2mZRLG0li VZjDZOYKD0N/Zi4p120GMQTPPfZo6P6WoOuPaNv9l7op78OcKmpRPKtPDMq9SW/uwB9s NcAQ== 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=jq4M2dcw8Mq2craKAwvyW9+gDA7ODVRI1idk9Lg5ZTeNv39eyBcQLe4OhZa0qRtVPw SucArsaFJwSxz8IEVNGpj1wuj3UGwbY8wkG5J5tDktndk3PVRanmda+pTsyxJ3BcuSEU psahxBfd9YxcgySsYfiEpYREMAl7ZsflSPTIEl3+cifjhhKI2RRiIc4IVbQ1BOD6HY66 /JHBGiao6B9/m3xs79AfK3KAnNhSprPUwK+lGhXIgMOd9DDn6B5/gTjhwYPypRdTews3 SwZeaCEdGNmn6SCIcwEmaTWbe5/VKMsiOjba1FKO8BsTfKCtAdBfYzqLYEpHbKuF9eWK RycA== 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 v7si130589edj.5.2020.11.25.05.44.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:44:39 -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: rpR7q2VoG0s8W4xhPbtlSVhiybz6PeEvmkpbuuIHfHSzpMCtMx737PL57SLnnahLYr4ORoYIWU MMsTeaOQen1YlCu5JuOHdTOwFyZdiAqfRql5Mm6kpqXWx6YvXOx+r26wHiogTeIx+5XXJCkLS3 5WiaCkFvjvzkf3f98ppAOCGqAlYRKzkIeoTwPRxn3jNE5MenkuwCw5+YbTrwo1pax3PVxopIWy AuFzOqQmFgQUhBos+zBfkLt7GGADCIrlWDGKfRNAXjm6IQkzlESsbYiVs+qhVcT6qtSsM9Qx94 R2A= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597776" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:44:37 -0800 IronPort-SDR: yM+rS5+dK/IHHfsvY1bOWNj5Q/TUm4wCCSebrEONc/F01EgprQ00LEV4R1Jvl0Wx/RMg+L4ivR 0LfTY9ZA5A3zwTv0ziKIQwQqfrigrh/FSFW7z2qhCMbWj1o+RqfWKtusO1MCegueebJIqFWFdO 5U9b2PUkHv0hCeX8NfOxxjSr5XJGlTYkLSaN4lUI0spGQK7DJtVvUaZBNks8haxYXnti9KLOPr j0qi0+e0lacXR04MidNGg8gqa6tPdS2IAbWgSHVXe5QGFbzxVkrbLWZ9ARDgjoaTyWE4BkiNTF Qhs= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 05/14] deb-dl-dir: Download files only belonging to the current image Date: Wed, 25 Nov 2020 19:14:05 +0530 Message-ID: <20201125134414.26061-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134236.25878-5-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134236.25878-5-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: SVR-ORW-MBX-05.mgc.mentorg.com (147.34.90.205) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: 65XBczQWqmtU 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