From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a2e:9c9:: with SMTP id 192mr146942ljj.77.1583877409851; Tue, 10 Mar 2020 14:56:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:211:: with SMTP id y17ls2732363ljn.10.gmail; Tue, 10 Mar 2020 14:56:49 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuzQYN7wnz2Qp4QT2m2T1aJh9vSzpkO7P0qM293tT+3SP3Wf2/KtZ8rL+ws9PoH7VKW0tkL X-Received: by 2002:a2e:a40e:: with SMTP id p14mr160873ljn.25.1583877409235; Tue, 10 Mar 2020 14:56:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583877409; cv=none; d=google.com; s=arc-20160816; b=rjjp0fNq2TFkKImXG2bXNt7OeXX9n1PrTuGdFHpBGoGl4Pf6A8uCJFgfsV1cXwS86G uC7ZvByMa4ptAomXiHLEMgB35136FQvD8hS0oeQP1A11mQn0tw96WyWQ++6cF4TutbSG wZ1hdN2fNOfbthGwc5HzTbIxg/jzwnHMb0b0ebd7Pi3I5VNI67VWqGWvUs1ZoCBS08G9 7vbg0IBIlr+KkF36sU/xBHOyd4KbGk6LuTPJOe76rBBvYM9D1TnEFGIY+dXZOZui2rN+ XPcZT6FkJYkJ8/xt2DyUU7kzxq9VG6IfDEMHv9mU7TYIKwBN7F7RZOTgVin4+m+zWnvD 2F0A== 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=Wsowgun1jIOeYLvqanSe9M1387xnjN7MEU9TVgniUKI=; b=OILvuuC3TxnGrl9pJMFwglGAEPR8YqMxUDxSZAwsyMMzIqflrQxJFEjCUrEO/PQtHf 7hDL5Pp/74NCixbcsUBWAScKlgTBFIc8Znt/iOHTK220v2eLAluELooNyPrD914MWqdR xGD18vKFrZEMvRsjbgwMMvhu8bh2gqy7hjUae0fJLgrTYynNvp1JnVV+Jr/BiZXBmNSQ Z1Dp2gHAQAhw+dkaeEcy/usTZe9Ix2CT/Qe467g5EYymZ+GiN5aDp9tbzhwBhqQVq9sS dBzPIHOR/BDyXN99E7iDr3AdeCwZ0KrZEw3siNcQtsmHeRu60jVsxG0k7Ro2waze1zIH MVjg== 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 d12si6934lfi.2.2020.03.10.14.56.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2020 14:56:49 -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 02ALumKN027944 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 10 Mar 2020 22:56:48 +0100 Received: from localhost.localdomain ([139.22.36.172]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02ALub66026985; Tue, 10 Mar 2020 22:56:48 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv5 22/29] meta: deb-dl-dir: do not cache debs from isar-apt Date: Tue, 10 Mar 2020 22:56:24 +0100 Message-Id: <20200310215631.24859-23-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200310215631.24859-1-henning.schild@siemens.com> References: <20200310215631.24859-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: qgpp3s6Dilx8 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 2858fea2..011dd717 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 flock -s "${pc}".lock -c ' \ @@ -14,12 +16,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