[v6,09/11] Disable deb-dl-dir in base-apt prefetch mode

Message ID	20240314073047.29465-10-ubely@ilbers.de
State	Superseded, archived
Headers	show Return-Path: <isar-users+bncBDMIDDH5TIOBBMWPZKXQMGQEDNU5KIA@googlegroups.com> Sender: isar-users@googlegroups.com Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; From: Uladzimir Bely <ubely@ilbers.de> To: isar-users@googlegroups.com Subject: [PATCH v6 09/11] Disable deb-dl-dir in base-apt prefetch mode Date: Thu, 14 Mar 2024 10:27:26 +0300 Message-ID: <20240314073047.29465-10-ubely@ilbers.de> In-Reply-To: <20240314073047.29465-1-ubely@ilbers.de> References: <20240314073047.29465-1-ubely@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 [v6,00/11] Improving base-apt usage [v6,01/11] scripts: Add debrepo python script handling base-apt [v6,02/11] meta: Add debrepo bbclass handling base-apt prefetching [v6,03/11] meta: Always use base-apt repo in local mode [v6,04/11] meta: Use cached base-apt repo to debootstrap [v6,05/11] meta: Consider global debrepo context [v6,06/11] base-apt: Predownload packages to base-apt before install [v6,07/11] meta: Add cache-deb-src functionality in base-apt mode [v6,08/11] testsuite: Set ISAR_PREFETCH_BASE_APT by default [v6,09/11] Disable deb-dl-dir in base-apt prefetch mode [v6,10/11] kas: Add PREFETCH_BASE_APT config entry [v6,11/11] ci_build.sh: Install python3-apt if not installed

Message ID

20240314073047.29465-10-ubely@ilbers.de

State

Superseded, archived

Headers

Sender: isar-users@googlegroups.com
Received-SPF: pass (google.com: domain of ubely@ilbers.de designates
 85.214.156.166 as permitted sender) client-ip=85.214.156.166;
From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH v6 09/11] Disable deb-dl-dir in base-apt prefetch mode
Date: Thu, 14 Mar 2024 10:27:26 +0300
Message-ID: <20240314073047.29465-10-ubely@ilbers.de>
In-Reply-To: <20240314073047.29465-1-ubely@ilbers.de>
References: <20240314073047.29465-1-ubely@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

Uladzimir Bely March 14, 2024, 7:27 a.m. UTC

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>
---
 meta/classes/deb-dl-dir.bbclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass
index 2bb05b31..4e4741be 100644
--- a/meta/classes/deb-dl-dir.bbclass
+++ b/meta/classes/deb-dl-dir.bbclass
@@ -89,6 +89,7 @@  deb_dl_dir_import() {
     export rootfs="${1}"
     sudo mkdir -p "${rootfs}"/var/cache/apt/archives/
     [ ! -d "${pc}" ] && return 0
+    [ "${ISAR_PREFETCH_BASE_APT}" = "1" ] && return 0
     flock -s "${pc}".lock sudo -Es << 'EOSUDO'
         set -e
         printenv | grep -q BB_VERBOSE_LOGS && set -x
@@ -106,6 +107,7 @@  deb_dl_dir_export() {
     export rootfs="${1}"
     export owner=$(id -u):$(id -g)
     mkdir -p "${pc}"
+    [ "${ISAR_PREFETCH_BASE_APT}" = "1" ] && return 0
     flock "${pc}".lock sudo -Es << 'EOSUDO'
         set -e
         printenv | grep -q BB_VERBOSE_LOGS && set -x

[v6,09/11] Disable deb-dl-dir in base-apt prefetch mode

Commit Message

Patch