From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a17:906:31c6:: with SMTP id f6mr9395271ejf.17.1580481005243; Fri, 31 Jan 2020 06:30:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:bfe7:: with SMTP id vr7ls2756693ejb.1.gmail; Fri, 31 Jan 2020 06:30:04 -0800 (PST) X-Google-Smtp-Source: APXvYqwxS6++AxGeL1YjQGvmRGS80s9kt7i3FbBg65d0MOdzsOe7Nlr4DEQ6gKmxDjBbDaDjmjQG X-Received: by 2002:a17:906:c7d5:: with SMTP id dc21mr9393406ejb.316.1580481004601; Fri, 31 Jan 2020 06:30:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580481004; cv=none; d=google.com; s=arc-20160816; b=p9EPaQDYprHxo4r66vFQzmfqtP6dwm0c9HtjDUWHL0PjS5B/4Cjfs/zCHzU40CAUpD zs0rW7LOgofietZcV6TocNIgpfm0G1k6hXFRCDqRyIDAm/b/X8XOzNWpKR+xsgahrCX1 11goZdunODE8j/2TmNWmjMKTInGk0ux0BfURj0c+fbMqQuFkzUhUrbGtUhhzQN+kAjVX C/a97HhAfkOjBCwqbVRcpnez5viwgp3tB8F2CmrvKijsBKCtqTWG7wpwrKkU/F2EwK2y PlNuFqk4axU9vqdGrN8PsOXiz0cuwg7QamNDoaF5hQBxe3e/eo1l6hpTnkJnfiHFhG79 wRIw== 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=qGHmZMj/VB90XFTwmM0+6kkHrXO71Q73lp/uTY3EzPY=; b=sxIP5eAOojUSf5sm3LhR00tF+eKaJ6M+w9JB6KVnj0oqr8oMx1VB9eM0lkk/qVWZy+ 1D0gZ5YsAL1Wl+3P4VcFCOIM2N9c3rNgx/jRzV/LJSQPAMsWxTb65FuLorVHa0p8InRe aszyE1Pyq20bAT2mqBnAIgaRKkN75tdYdUKLFKaBA1fNpnelSe4ommCZteGLzXdiFdNP m08JWDgpYjEZHwTpVzXzY3Btl2AvruLsq8S0srlJ4LBzcpFuXeYTz1z//5NuVjGFhSgf cSmqIpZ15nsRJ3HDN25Sb8vq7x5/MTle0XViGRbcFiMzHMJ4RSJLlsVbosmmkN4HEs5S eMHQ== 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 x18si357289eds.2.2020.01.31.06.30.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jan 2020 06:30:04 -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 mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 00VEU3fY027092 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jan 2020 15:30:03 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.68.229]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 00VEU1Ra030231; Fri, 31 Jan 2020 15:30:03 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Henning Schild Subject: [PATCHv4 22/26] meta: deb-dl-dir: do not cache debs from isar-apt Date: Fri, 31 Jan 2020 15:29:56 +0100 Message-Id: <20200131143000.14873-23-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200131143000.14873-1-henning.schild@siemens.com> References: <20200131143000.14873-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: ITl/D9l1eQQr 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 ab4b1f09..f9699603 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