public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Henning Schild <henning.schild@siemens.com>
To: isar-users@googlegroups.com
Cc: Vijai Kumar K <vijaikumar.kanagarajan@gmail.com>,
	Baurzhan Ismagulov <ibr@radix50.net>,
	Jan Kiszka <jan.kiszka@siemens.com>,
	Henning Schild <henning.schild@siemens.com>
Subject: [PATCHv5 25/29] meta: deb-dl-dir: only export newly downloaded files
Date: Tue, 10 Mar 2020 22:56:27 +0100	[thread overview]
Message-ID: <20200310215631.24859-26-henning.schild@siemens.com> (raw)
In-Reply-To: <20200310215631.24859-1-henning.schild@siemens.com>

From: Henning Schild <henning.schild@siemens.com>

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 <henning.schild@siemens.com>
---
 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 011dd717..55c4a839 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


  parent reply	other threads:[~2020-03-10 21:56 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-10 21:56 [PATCHv5 00/29] base-apt-rework Henning Schild
2020-03-10 21:56 ` [PATCHv5 01/29] repository: new class to deal with repos Henning Schild
2020-03-10 21:56 ` [PATCHv5 02/29] dpkg-base: add download caching of apt:// downloads Henning Schild
2020-03-10 21:56 ` [PATCHv5 03/29] meta: dpkg-base: convert "exit" into "return 0" Henning Schild
2020-03-10 21:56 ` [PATCHv5 04/29] base-apt: change the sources.list to also offer deb-src Henning Schild
2020-03-10 21:56 ` [PATCHv5 05/29] base-apt: add deb-src packages as well Henning Schild
2020-03-10 21:56 ` [PATCHv5 06/29] base-apt: do not skip gpg check when it is signed Henning Schild
2020-03-10 21:56 ` [PATCHv5 07/29] ci: conf: add "hello" to the sample config and every build Henning Schild
2020-03-10 21:56 ` [PATCHv5 08/29] meta: split all apt-get invocations into download and execution Henning Schild
2020-03-10 21:56 ` [PATCHv5 09/29] meta: create DL_DIR support for all apt-get downloaded .debs Henning Schild
2020-03-10 21:56 ` [PATCHv5 10/29] meta: import DL_DIR debs before apt-get download steps Henning Schild
2020-03-10 21:56 ` [PATCHv5 11/29] meta: include DL_DIR deb import/export into bootstrap Henning Schild
2020-03-10 21:56 ` [PATCHv5 12/29] base-apt: populate from DEBDIR as well Henning Schild
2020-03-10 21:56 ` [PATCHv5 13/29] base-apt: drop the "apt_cache" feature Henning Schild
2020-03-10 21:56 ` [PATCHv5 14/29] base-apt: do not copy debs directly out of rootfss anymore Henning Schild
2020-03-10 21:56 ` [PATCHv5 15/29] base-apt: rework base-apt population Henning Schild
2020-03-10 21:56 ` [PATCHv5 16/29] base-apt: move class "base-apt-helper" into only user Henning Schild
2020-03-10 21:56 ` [PATCHv5 17/29] CI: include "isar-disable-apt-cache" into all CI images Henning Schild
2020-03-10 21:56 ` [PATCHv5 18/29] CI: include "cowsay" into default build to test dpkg-gbp Henning Schild
2020-03-10 21:56 ` [PATCHv5 19/29] CI: set BB_NO_NETWORK for cached rebuild Henning Schild
2020-03-10 21:56 ` [PATCHv5 20/29] meta: repository: implement repo_contains_package and use it in base_apt Henning Schild
2020-03-10 21:56 ` [PATCHv5 21/29] meta: repository: simplify the matching of packages Henning Schild
2020-03-10 21:56 ` [PATCHv5 22/29] meta: deb-dl-dir: do not cache debs from isar-apt Henning Schild
2020-03-10 21:56 ` [PATCHv5 23/29] base-apt: pull base-apt population to the front of the build chain Henning Schild
2020-03-10 21:56 ` [PATCHv5 24/29] meta: base-apt: remove isar-apt check from population Henning Schild
2020-03-10 21:56 ` Henning Schild [this message]
2020-03-18  7:59   ` [PATCHv5 25/29] meta: deb-dl-dir: only export newly downloaded files Henning Schild
2020-03-20  9:27     ` Henning Schild
2020-03-20 13:47       ` Baurzhan Ismagulov
2020-03-10 21:56 ` [PATCHv5 26/29] CI: test a custom kernel build in the base-apt offline rebuild Henning Schild
2020-03-10 21:56 ` [PATCHv5 27/29] meta/deb-dl-dir: make subshell verbose and fail on error Henning Schild
2020-03-10 21:56 ` [PATCHv5 28/29] meta: deb-dl-dir: fix "command not found" error when excluding pkgs Henning Schild
2020-03-10 21:56 ` [PATCHv5 29/29] RECIPE-API-CHANGELOG: add a few bits on the base-apt caching changes Henning Schild
2020-03-15 16:58 ` [PATCHv5 00/29] base-apt-rework Baurzhan Ismagulov
2020-03-15 17:02   ` [PATCH] base-apt, isar-apt: Split code and configuration Baurzhan Ismagulov
2020-03-30 20:26     ` Baurzhan Ismagulov
2020-03-17  8:04   ` [PATCHv5 00/29] base-apt-rework Henning Schild
2020-03-20 13:38     ` [PATCH v6 20/29] meta: repository: implement repo_contains_package and use it in base_apt Baurzhan Ismagulov
2020-03-20 13:38     ` [PATCH v6 23/29] base-apt: pull base-apt population to the front of the build chain Baurzhan Ismagulov
2020-03-20 13:39     ` [PATCH v6 24/29] meta: base-apt: remove isar-apt check from population Baurzhan Ismagulov
2020-03-20 13:39     ` [PATCH v6 28/29] meta: deb-dl-dir: fix "command not found" error when excluding pkgs Baurzhan Ismagulov
2020-03-20 13:41     ` [PATCH v6 29/29] RECIPE-API-CHANGELOG: add a few bits on the base-apt caching changes Baurzhan Ismagulov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200310215631.24859-26-henning.schild@siemens.com \
    --to=henning.schild@siemens.com \
    --cc=ibr@radix50.net \
    --cc=isar-users@googlegroups.com \
    --cc=jan.kiszka@siemens.com \
    --cc=vijaikumar.kanagarajan@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox