From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a2e:9a01:: with SMTP id o1mr7912215lji.247.1584779529929; Sat, 21 Mar 2020 01:32:09 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5494:: with SMTP id t20ls129964lfk.1.gmail; Sat, 21 Mar 2020 01:32:09 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvYDWqvkVVt7ov1wrXsUjiC5w6ZN87Mpv8VYhYRHrb7bYbaCDKNZgRXaQlx7nEAMs2y5/A1 X-Received: by 2002:a19:4cc2:: with SMTP id z185mr7639031lfa.0.1584779529192; Sat, 21 Mar 2020 01:32:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584779529; cv=none; d=google.com; s=arc-20160816; b=LrpeU6hMlbzlraCtbVdO3fGX30Ou24MX6etGx0zyyEWUsJcVlIUBtu27UKft8gCisU ZKyAx+3Y3pBjPBRqdT7vn35XICo6xxK4N86HgLa9o9WvCT3q1PuCYWlNws2LC5bEStov Xlikv9cPcZWSpIMo3Q8+IU1gTU8ramEgOHo6vXESgZRIqDsWklXrI+jcBrkYHdGwd5dh 6p97gcvvIxFJL5vVldShPSCTpUnDzP0ZNRUwTfcgt0OzbC6fWPv9GaAlW77cDS/4JlXh RObYXe7kLhm/cbfB6gzECxgDzwvFJkeauk9K33C5sv1jTSDzS7CR9VQInlJD/KYMqIFF blYQ== 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=sSMwRcXRJySHWptuSn0HUbYiRpbNE94m5rVQRSjjcPE=; b=fqPmgBHFYLjESY+OdRAT5kD27InHpULg2fjhsuZrMC6amXm/qUhGVQ5ivmtGfq+ng2 2W2N8YFo7XDJM+7DDbFEcXM1Vhq+bgaFrayVRMMetJkFWvuB7ArztwJu0CeRzMZVZdc8 mwVbG6TogHhxuN0J/KuLTC3lFJ+PfawHYd7VO29VkEUlvfI2mrMkW+rhEFEexlyImYSi twgFZ1dkmVH/afeCdyrSw/71DuNaKmwRzTA4VP2vpoiqI1+25/Eth+3KBBlIytzMCd4A qgJBiEon8Q3xiNf36Z0bw3bPgWOY28qM7qiDJbVpsk1hx0E3qApLtUhEK8MubpvVsmAd hSrg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id b26si537040ljk.4.2020.03.21.01.32.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 01:32:09 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 02L8W849011822 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 21 Mar 2020 09:32:08 +0100 Received: from localhost.localdomain ([139.22.32.253]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02L8VuGd021533; Sat, 21 Mar 2020 09:32:07 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv7 25/29] meta: deb-dl-dir: only export newly downloaded files Date: Sat, 21 Mar 2020 09:31:44 +0100 Message-Id: <20200321083148.26160-26-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200321083148.26160-1-henning.schild@siemens.com> References: <20200321083148.26160-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: DZbbvHgCFxLe From: Henning Schild Always check if files are already at destination and skip copying or further processing to speed things up. Signed-off-by: Henning Schild --- meta/classes/deb-dl-dir.bbclass | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 7ef60a43..621350d9 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -12,7 +12,7 @@ deb_dl_dir_import() { mkdir -p "${rootfs}"/var/cache/apt/archives/ 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/ '{}' + ' } @@ -21,11 +21,14 @@ deb_dl_dir_export() { export rootfs="${1}" mkdir -p "${pc}" flock "${pc}".lock -c ' \ - find "${rootfs}"/var/cache/apt/archives/ -type f -iname '*\.deb' |\ + find "${rootfs}"/var/cache/apt/archives/ \ + -type f -iname '*\.deb' |\ while read p; do + # skip files from a previous export + [ -f "${pc}/${p##*/}" ] && continue 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}" ' -- 2.24.1