From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a2e:8e8e:: with SMTP id z14mr4407606ljk.129.1584779528336; Sat, 21 Mar 2020 01:32:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1103:: with SMTP id l3ls1362307lfg.6.gmail; Sat, 21 Mar 2020 01:32:07 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtqpvYbHx1f+yhftoo5QOb9F/gmbd2OdxTmu6ls8DWVCG+U1GGKTN/TNzFKQv1elYHwYASQ X-Received: by 2002:a19:6101:: with SMTP id v1mr7628726lfb.56.1584779527849; Sat, 21 Mar 2020 01:32:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584779527; cv=none; d=google.com; s=arc-20160816; b=ZTQtcTFfsKvJkeNH7voyNeEsfbpejdIOOREH8wh+jgRTfUOej0uQxGdQ1LVnIs2MNO E1e0DEUhwWy9fwSGOofCBMho/Au9RRlF1eA8eOSgpTXKOt5BwdRvR6Xy0O1NpuOeop/t BKnsDROc21aCJZidAoj9Jfj30gp9E0OuUYHkMsINbA2UVnf7WG8kO4ZEflsWAW9cGFa5 RSelRe/IF9fgGwDo6O/ylXlinKHPS4QIF5QgEw34KPDJlqmXjEY6fieIMMFcsIkvk8Bh JfzUMTPT9QCX5BLOqZnkp3ylrIhZkTr5Uc58dcc7nzBcs84WZHvzC6WzQA5+JVV4PsBu m4YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=lLg/IaoAyG/1BUpVTWkiQNG2ef4W6G7DOdkBSv2itcQ=; b=lCG7baFHqohmo2U+LNhW9TtRP0H0ZeyI/At+lUHwdN0AK+mcSRVProTJaWQWHQYlAP 2xtCGRtp80uJM6HV7LV5BdcrqWNXm5Cyf3P6xgvPhbffrpxiKxUcaWDJDardMShiRL8B aczQhLESaS2KS++N5Qrn5JYhOp46GWFkfhTy7eEV4hDHyjwSjFBmCv0qHMRd41GFNJcH MGW33YYI5oFcwC/56hawYTdgtzTrGeNv8Wfhs5rLCDm3XIlRwkc3GkfFV0mvnYvtkmwN Oz7KXHKFStv+F/03wNlsplFllLioV0lRnFRNBOWtYkdkyEKEzkDSKm5ePvxeM+Ypd3uQ b/DA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id w6si394395lfa.1.2020.03.21.01.32.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 01:32:07 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 02L8W6of002970 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 21 Mar 2020 09:32:06 +0100 Received: from localhost.localdomain ([139.22.32.253]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02L8VuGa021533; Sat, 21 Mar 2020 09:32:06 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv7 22/29] meta: deb-dl-dir: do not cache debs from isar-apt Date: Sat, 21 Mar 2020 09:31:41 +0100 Message-Id: <20200321083148.26160-23-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200321083148.26160-1-henning.schild@siemens.com> References: <20200321083148.26160-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: H//1kxp6NlAw From: Henning Schild Packages from isar-apt are not downloaded from the outside and should not be cached. Signed-off-by: Henning Schild --- meta/classes/deb-dl-dir.bbclass | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 4eef0134..7ef60a43 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -3,8 +3,10 @@ # # SPDX-License-Identifier: MIT +inherit repository + deb_dl_dir_import() { - export pc="${DEBDIR}/${DISTRO}" + export pc="${DEBDIR}/${DISTRO}/" export rootfs="${1}" [ ! -d "${pc}" ] && return 0 mkdir -p "${rootfs}"/var/cache/apt/archives/ @@ -15,12 +17,16 @@ deb_dl_dir_import() { } deb_dl_dir_export() { - export pc="${DEBDIR}/${DISTRO}" + export pc="${DEBDIR}/${DISTRO}/" export rootfs="${1}" mkdir -p "${pc}" flock "${pc}".lock -c ' \ - sudo find "${rootfs}"/var/cache/apt/archives/ -type f -iname '*\.deb' \ - -exec cp -f '{}' "${pc}" \; + find "${rootfs}"/var/cache/apt/archives/ -type f -iname '*\.deb' |\ + while read p; do + repo_contains_package "${REPO_ISAR_DIR}"/"${DISTRO}" "${p}" && \ + continue + sudo cp -f "${p}" "${pc}" + done sudo chown -R $(id -u):$(id -g) "${pc}" ' } -- 2.24.1