From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003121820762112 X-Received: by 2002:a19:c7c5:: with SMTP id x188mr16288331lff.22.1576497017850; Mon, 16 Dec 2019 03:50:17 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9e01:: with SMTP id e1ls2210109ljk.15.gmail; Mon, 16 Dec 2019 03:50:17 -0800 (PST) X-Google-Smtp-Source: APXvYqxJrd/CUO+80w/lRv7Cix1UelSwThGMPV552U0wldDlzsT/ab17CrScETlkEGX+ubEH1SSM X-Received: by 2002:a2e:5304:: with SMTP id h4mr19703962ljb.75.1576497017262; Mon, 16 Dec 2019 03:50:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576497017; cv=none; d=google.com; s=arc-20160816; b=bU6JOAO5gZUNN1eMTnOAY2U+MtUujKZTiMtwDZdXh6xkdfraxDbl2hRqzhnUE9RkP3 upg2cjM7OkT0CFZ8Idqbj+D0eSXtxxxTX1gX+8VR8uuiiLNJZiuijSkM9wVIYB37WXU7 EGkoBAHnpxFtZgZoHKTGyiht1rRwmZvk00fRIK7g+E6K5t5yTZFpJ1Hc++/4Yj/jXKaY eQvxo+GtlqD12ckk2Fv18gSbz5p7YpNGsleX2SfxYlGg64HJJVx3sPoTH41PKQP+Orl+ lpvidw+paCTHAsS0E61oc+lySftoBnYNG4XbCKTRp7cSodOZvAw0ykjZdhmzVIYiNaCJ /Kgw== 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=m14qLCRCN4S4eYPneTIB+wx/O2zVEo2nDX6+J6fw150=; b=zZmeRvp6oqFSsTDL8DE7H+VBMV7KmarwXe/heuDPXx/jOlmJ0PhNclMTFWHokPlnQb 8oCGOvpJpajF/CRTxVSxbbRd7xaDrs26ZZVG+fEsy5SrGHh1BJb091goUxZaVzymm8J9 kPC0QxhYJls12DLJ/CRns7EG/54O2nn7U3uwinqF2wVEoKM3gdd0ed18aldTYWLrYut4 kyZUEpgyx9QIN7xFxNjXhhp0ve9/a59PMIgcCz8VoWzKolyQKtmajw2Ba15UthYEc7tS mckdHrYpBkHR2SYMhl2rM1MQb/6d19AEiJ4z2HyfdujmTWs9+oL5lN8lrTcQqd/X5kCt X3dw== 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 u5si672602lfm.0.2019.12.16.03.50.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 03:50:17 -0800 (PST) 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 xBGBoGZk005724 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Dec 2019 12:50:16 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.101]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xBGBoDWk009084; 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 25/25] meta: deb-dl-dir: only export newly downloaded files Date: Mon, 16 Dec 2019 12:50:11 +0100 Message-Id: <20191216115011.17664-26-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: TF+4kqNmP+2k From: Henning Schild Remember the time we imported the previously downloaded files, and only copy out new ones when exporting again. That saved pointless copies and time. Signed-off-by: Henning Schild --- meta/classes/deb-dl-dir.bbclass | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index f969960..e65fc51 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -8,24 +8,31 @@ inherit repository deb_dl_dir_import() { export pc="${DEBDIR}/${DISTRO}/" export rootfs="${1}" + rm -f "${T}"/deb_dl_dir_import.stamp + touch "${T}"/deb_dl_dir_import.stamp [ ! -d "${pc}" ] && return 0 + [ ! -d "${rootfs}"/var/cache/apt/archives/ ] && return 0 flock -s "${pc}".lock -c ' \ sudo find "${pc}" -type f -iname '*\.deb' -exec \ - cp -f --no-preserve=owner -t "${rootfs}"/var/cache/apt/archives/ '{}' + + cp -n --no-preserve=owner -t "${rootfs}"/var/cache/apt/archives/ '{}' + ' } deb_dl_dir_export() { export pc="${DEBDIR}/${DISTRO}/" export rootfs="${1}" + export T mkdir -p "${pc}" flock "${pc}".lock -c ' \ - find "${rootfs}"/var/cache/apt/archives/ -type f -iname '*\.deb' |\ + find "${rootfs}"/var/cache/apt/archives/ \ + -cnewer "${T}"/deb_dl_dir_import.stamp \ + -type f -iname '*\.deb' |\ while read p; do repo_contains_package "${REPO_ISAR_DIR}"/"${DISTRO}" "${p}" && \ continue - sudo cp -f "${p}" "${pc}" + sudo cp -n "${p}" "${pc}" done sudo chown -R $(id -u):$(id -g) "${pc}" ' + rm -f "${T}"/deb_dl_dir_import.stamp } -- 2.24.1