[v8,08/14] Disable deb-dl-dir in base-apt prefetch mode

Message ID	20260727112812.2255297-9-akarpovich@ilbers.de
State	New
Headers	show Return-Path: <isar-users+bncBD4NPHXZPUIIFAU52MDBUBCNJEI4G@googlegroups.com> Sender: isar-users@googlegroups.com Received-SPF: pass (google.com: domain of akarpovich@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; From: Aliaksei Karpovich <akarpovich@ilbers.de> To: isar-users@googlegroups.com Cc: Uladzimir Bely <ubely@ilbers.de>, Aliaksei Karpovich <akarpovich@ilbers.de> Subject: [v8 08/14] Disable deb-dl-dir in base-apt prefetch mode Date: Mon, 27 Jul 2026 13:26:26 +0200 Message-ID: <20260727112812.2255297-9-akarpovich@ilbers.de> In-Reply-To: <20260727112812.2255297-1-akarpovich@ilbers.de> References: <20260727112812.2255297-1-akarpovich@ilbers.de> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com
Series	Improving base-apt usage \| expand [v8,00/14] Improving base-apt usage [v8,01/14] scripts: Add debrepo python script handling base-apt [v8,02/14] meta: Add debrepo bbclass handling base-apt prefetching [v8,03/14] meta: Always use base-apt repo in local mode [v8,04/14] meta: Use cached base-apt repo to bootstrap [v8,05/14] base-apt: Predownload packages to base-apt before install [v8,06/14] meta: Add cache-deb-src functionality in base-apt mode [v8,07/14] testsuite: Set ISAR_PREFETCH_BASE_APT by default [v8,08/14] Disable deb-dl-dir in base-apt prefetch mode [v8,09/14] kas: Add PREFETCH_BASE_APT config entry [v8,10/14] ci_build.sh: Install python3-apt if not installed [v8,11/14] rootfs: Fix URL parsing [v8,12/14] rootfs: Add version and arch for downloaded package [v8,13/14] sbom-chroot: Fix python3-apt dependency [v8,14/14] debrepo: Add using override for reprepro

Message ID

20260727112812.2255297-9-akarpovich@ilbers.de

State

New

Headers

Sender: isar-users@googlegroups.com
Received-SPF: pass (google.com: domain of akarpovich@ilbers.de designates
 85.214.156.166 as permitted sender) client-ip=85.214.156.166;
From: Aliaksei Karpovich <akarpovich@ilbers.de>
To: isar-users@googlegroups.com
Cc: Uladzimir Bely <ubely@ilbers.de>,
        Aliaksei Karpovich <akarpovich@ilbers.de>
Subject: [v8 08/14] Disable deb-dl-dir in base-apt prefetch mode
Date: Mon, 27 Jul 2026 13:26:26 +0200
Message-ID: <20260727112812.2255297-9-akarpovich@ilbers.de>
In-Reply-To: <20260727112812.2255297-1-akarpovich@ilbers.de>
References: <20260727112812.2255297-1-akarpovich@ilbers.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Precedence: list
Mailing-list: list isar-users@googlegroups.com;
 contact isar-users+owners@googlegroups.com

Series

Improving base-apt usage | expand

Commit Message

Aliaksei Karpovich July 27, 2026, 11:26 a.m. UTC

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 39c77151..29ed7822 100644
--- a/meta/classes-recipe/deb-dl-dir.bbclass
+++ b/meta/classes-recipe/deb-dl-dir.bbclass
@@ -178,6 +178,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
@@ -200,6 +201,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 8220d15e..d98db7fc 100644
--- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
+++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
@@ -270,7 +270,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

[v8,08/14] Disable deb-dl-dir in base-apt prefetch mode

Commit Message

Patch