From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003121820762112 X-Received: by 2002:a1c:5f06:: with SMTP id t6mr30305476wmb.32.1576497016736; Mon, 16 Dec 2019 03:50:16 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:c3d1:: with SMTP id d17ls6232299wrg.10.gmail; Mon, 16 Dec 2019 03:50:16 -0800 (PST) X-Google-Smtp-Source: APXvYqwA/B37P6CT5GlmSrvo4QKVdQts1b8BER5A/MjyH3xcMX5I801LZmDOUmmAUoRwfIrBkXxh X-Received: by 2002:a5d:6350:: with SMTP id b16mr30284603wrw.132.1576497016409; Mon, 16 Dec 2019 03:50:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576497016; cv=none; d=google.com; s=arc-20160816; b=x21uGzsUXgFJmj0XmwyE+kDUE/iF3cuZSVTZ46LdqWEVPCcodIeNZO9oaa8to2imAh hEnFw/q3Bm8sUpSubIy2D63olWe1pOTljZp7/G89p1wcJJ/iOOOD3EVXBsTs++3ZZipX AjiVU9w31BJWRyCxqH8Qk/ry5pnjXH/Pb6+mFvsYqvWrwCHuikTsM/hJgIR4Q1Wd1Yg/ xE0lq+cy7jr6qR6DmqFXitxRvZwX2CCaa5FTVNjxRlvy47T7K9WCbx4lvCjVgXRiF/nl U77lljW83NtgAUbueyjBStLPe/KMiP8TLaI6/lsCbJwVv0l9Rc3W9ULZ8PO8XRRa5Nsb fcJQ== 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=R23N69zhIAtkSEu+iZU6mkk1kINuIlKIuLHYV8wKPI4=; b=pUeKwmQCWOralBGbMeVdrxFgosyoVB1hfUTbWRXCycb6MLjDLJAFe+YUHEkmZTFeT+ IV3RMbIK4nBT7OHv4ScVLFaBfdnARipP8BNx7jfbe+dqG0mt1rO22S4KWiK94LXg17ao JPsKzaTNhdRC52WXrKctStxPGz1i1LnuAbo869HOLOGbFBIBxzY4NywvrPYI3IgrKUhV y4YOAhnlHAk9vW2vZHw2Fts31irs5J6/UCKCVQgn5q9hbgmKRFFbQsCTQSP3Gp3bBiYt 9p943fg+432voIi91Xq5NcxXFooqTYZON/D9DvZJBMzy2yCJ6mlXFazuI8xst09oBLAa Z8hw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id s139si539409wme.2.2019.12.16.03.50.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 03:50:16 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id xBGBoFJr024937 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Dec 2019 12:50:15 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.101]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xBGBoDWh009084; Mon, 16 Dec 2019 12:50:15 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Baurzhan Ismagulov , chombourger@gmail.com, Henning Schild Subject: [PATCHv2 22/25] meta: deb-dl-dir: do not cache debs from isar-apt Date: Mon, 16 Dec 2019 12:50:08 +0100 Message-Id: <20191216115011.17664-23-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216115011.17664-1-henning.schild@siemens.com> References: <20191216115011.17664-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: NGWQVKdClHwZ 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 ab4b1f0..f969960 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