[v9 08/13] Disable deb-dl-dir in base-apt prefetch mode

[Aliaksei Karpovich <akarpovich@ilbers.de>]

From: Uladzimir Bely <ubely@ilbers.de>

Since all packages and source packages are placed to base-apt repo
during build, there is no need to have them in one more place.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
Signed-off-by: Aliaksei Karpovich <akarpovich@ilbers.de>
---
 meta/classes-recipe/deb-dl-dir.bbclass                | 2 ++
 meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/classes-recipe/deb-dl-dir.bbclass b/meta/classes-recipe/deb-dl-dir.bbclass
index 7e9f89b1..2fafd0a7 100644
--- a/meta/classes-recipe/deb-dl-dir.bbclass
+++ b/meta/classes-recipe/deb-dl-dir.bbclass
@@ -174,6 +174,7 @@ deb_dl_dir_import() {
 
     # nothing to copy if download directory does not exist just yet
     [ ! -d "${pc}" ] && return 0
+    [ "${ISAR_PREFETCH_BASE_APT}" = "1" ] && return 0
 
     # attempt to create hard-links for .deb files from downloads/ into
     # /var/cache/apt/archives/ so apt will only download packages we
@@ -196,6 +197,7 @@ deb_dl_dir_export() {
     export rootfs="${1}"
     export owner=$(id -u):$(id -g)
     mkdir -p "${pc}"
+    [ "${ISAR_PREFETCH_BASE_APT}" = "1" ] && return 0
 
     export isar_debs=$(${SCRIPTSDIR}/lockrun.py -r -f '${REPO_ISAR_DIR}/isar.lock' -c \
     "find '${REPO_ISAR_DIR}/${DISTRO}' -name '*.deb' -print")
diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
index c452035f..94cc5fe3 100644
--- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
+++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
@@ -274,7 +274,8 @@ do_bootstrap() {
                    - \
                    "$bootstrap_list" > ${DEPLOYDIR}/${DEPLOY_ISAR_BOOTSTRAP}.tar.zst
 
-    if [ "${ISAR_USE_CACHED_BASE_REPO}" != "1" ]; then
+    if [ "${ISAR_USE_CACHED_BASE_REPO}" != "1" ] && \
+       [ "${ISAR_PREFETCH_BASE_APT}" != "1" ]; then
         deb_dl_dir_export "${WORKDIR}/dl_dir" "${BOOTSTRAP_BASE_DISTRO}-${BASE_DISTRO_CODENAME}"
         run_privileged find ${WORKDIR}/dl_dir -maxdepth 1 -mindepth 1 -exec rm -rf --one-file-system "{}" \;
         rmdir ${WORKDIR}/dl_dir
-- 
2.43.0

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20260820133934.383231-9-akarpovich%40ilbers.de.