From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a5d:6441:: with SMTP id d1mr2871041wrw.301.1585230221481; Thu, 26 Mar 2020 06:43:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:9781:: with SMTP id s1ls2842633wrb.2.gmail; Thu, 26 Mar 2020 06:43:40 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuGWg+X0hOqaEDWFrjjLkpHuNkqTwrwy3FVES8z+fzgharnWUoX7tfcNq4B4SfPoJoZPbpr X-Received: by 2002:adf:e948:: with SMTP id m8mr9361113wrn.193.1585230220916; Thu, 26 Mar 2020 06:43:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585230220; cv=none; d=google.com; s=arc-20160816; b=BSPPUvUKNnYctu1xb6kFahDnIHooqJBBKrbyfTFmQS0Bq3yKPGjAGtspxzDx/9Dmmc A15bslIgQwqTvggYp7ah95gGPzk5u6OVMfEg5tyv63/zPD/tLABavEycGDW+HD2Uf2BV uuKttJNZZf7Xnw6i5w0ihcVvesHyLqss1MPL8mstd8AVuS6h2Fs6EV/08E190OuETKU4 LcWsioWxWm+tBbU/uP/go9305gQKtkv2f1qT/BhjCiGANstzOEYfroUcvT/a2kfxTY42 BU4f9wm093+wK+4+UOXf62GlCLZlsgD4tkNT3seAhE6WTCPEUmxeIeM2+04T+10pRgYP jHVQ== 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=+HtohdjmkhOARb+aLXiQOX1+dGNq18DpyTzaIgJiyrk=; b=ihju8NYi+OKwSsUZl86NgZS3i6VW5onAGI7tyc9ln3/AXqNW5l1mC1iq0Wh/tfzqme SNBlRRt03RVupQI7VZSRZ3GGrNMfYu8WV8JJmn/D6Bz53LPvlVAdOWZWY5yHMe9SuGex utG4lN0DZuDs9B/dAaz4Ogy5zym4EEvd3hVAJ5EQNEFatGjvvxMIfLGebX3dh/EDDrVx +o0mEVFv3FnsSQ3cyBdlqX0vJztg/E8oCvZO8nQhYF8bSkuM7YPprUE2QmvN+lTxeDsW hR3Toyopxl2SrJHjBbn+R48Ag386YOlw7ggMIvTwJFjUqJr3h8VZYC/JFM+s8g/GHk4L cxOg== 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 l2si632156wmg.3.2020.03.26.06.43.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 06:43:40 -0700 (PDT) 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 02QDheBj022579 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Mar 2020 14:43:40 +0100 Received: from localhost.localdomain ([167.87.11.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02QDhSBv031897; Thu, 26 Mar 2020 14:43:39 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv8 25/29] meta: deb-dl-dir: only export newly downloaded files Date: Thu, 26 Mar 2020 14:43:21 +0100 Message-Id: <20200326134325.8672-26-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: 6tLxfQgFfUhb 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 75cb2f5..e9adc99 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -12,7 +12,7 @@ deb_dl_dir_import() { sudo 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