From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a17:907:6f1:: with SMTP id yh17mr8027140ejb.20.1585230220131; Thu, 26 Mar 2020 06:43:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:f290:: with SMTP id f16ls4310918edm.6.gmail; Thu, 26 Mar 2020 06:43:39 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvYNVzMEiksrTkmzUHAfeHCWNtqFgJ8gxM8C+2D4cc7xH7Wh+4EXm8rdiuDsmhXNB26Qyai X-Received: by 2002:a05:6402:1437:: with SMTP id c23mr8035550edx.327.1585230219530; Thu, 26 Mar 2020 06:43:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585230219; cv=none; d=google.com; s=arc-20160816; b=npKQgEcho8/9a3Ch5JUX9qaMkNSBCxA9200iYDzjKhBkGnpmRaaUGQiaXFsJpvdJcd WurDcM4DMrJsH5K00hmf+TS3fCd4zgrr/kXEHozdsdYFsYeVxUai+kiKa+QOvg6GOfpr bBaaAPkaab7KXI1tHcTOuNwWBhKgoXBChSDEwdKWVdQOpdf6IRLW5ja6cGA6B4eh4TAi jf0PcE2UrvUwTnZlfMmKRX8ZuMEZBNtMJfCJ7Dqg2KyaeqyWOwjpiLGooadLvzyq4iLi bGRMznww1dZPyXlGlQk73dwQSxVIAYe6yjnESNBrfSctT9q6vy+jFf5nwae8GHsi3JDH aUsw== 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=xsKsGWNqpw43iTky9LN8EJICL1QqEvebpr+C8IWwbPU=; b=h89RH1HmEmN+XQoYpmVgFnSqgGKo7FwtB3KlOs7lDXRwRFnSRBKHHg7qbAJyaluF5x j0lIWjSBjxFd0shOKBOmxPr255h/H4cHzv/geqxGIxlkUhCJDxHSEGwCAmlhSd2OxH7C nG4/khDW2ezKaBK8/62/mnez4vRuYx/TDheCxoVLpHoRK9h97dlH3lvKTDoX+LobyDRa DyR2DnPjIsI3joXS/lurpDISjKR2XmUg/fOrqHLJxG8eMhH9Awoqa10wzlHgte42wq/K jTO9dXqAVPSJKIvMm1YVzKUV7qnPBcITxCFwOarWgXL7wLXenQoRoe1X2GYASsR/Ym0C EIVQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id w13si108800edv.2.2020.03.26.06.43.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 06:43:39 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 02QDhckX002456 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Mar 2020 14:43:38 +0100 Received: from localhost.localdomain ([167.87.11.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02QDhSBs031897; Thu, 26 Mar 2020 14:43:38 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv8 22/29] meta: deb-dl-dir: do not cache debs from isar-apt Date: Thu, 26 Mar 2020 14:43:18 +0100 Message-Id: <20200326134325.8672-23-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200326134325.8672-1-henning.schild@siemens.com> References: <20200326134325.8672-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 0NVFb0MHVHi0 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 1e9e1bd..75cb2f5 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 sudo 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