[v11,12/12] base-apt: Move bullseye-mipsel in separate dir

Message ID	20261002070335.26526-13-akarpovich@ilbers.de
State	New
Headers	show Return-Path: <isar-users+bncBD4NPHXZPUIKFL752UDBUBAZN7NEI@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: akarpovich <akarpovich@ilbers.de> To: isar-users@googlegroups.com Cc: Aliaksei Karpovich <akarpovich@ilbers.de> Subject: [v11 12/12] base-apt: Move bullseye-mipsel in separate dir Date: Fri, 2 Oct 2026 09:01:15 +0200 Message-ID: <20261002070335.26526-13-akarpovich@ilbers.de> In-Reply-To: <20261002070335.26526-1-akarpovich@ilbers.de> References: <20261002070335.26526-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	[v11,01/12] scripts: Add debrepo python script handling base-apt \| expand [v11,01/12] scripts: Add debrepo python script handling base-apt [v11,02/12] meta: Add debrepo bbclass handling base-apt prefetching [v11,03/12] meta: Always use base-apt repo in local mode [v11,04/12] meta: Use cached base-apt repo to bootstrap [v11,05/12] base-apt: Predownload packages to base-apt before install [v11,06/12] meta: Add cache-deb-src functionality in base-apt mode [v11,07/12] testsuite: Set ISAR_PREFETCH_BASE_APT by default [v11,08/12] Disable deb-dl-dir in base-apt prefetch mode [v11,09/12] kas: Add PREFETCH_BASE_APT config entry [v11,10/12] ci_build.sh: Install python3-apt if not installed [v11,11/12] debrepo: Add override for reprepro [v11,12/12] base-apt: Move bullseye-mipsel in separate dir

Message ID

20261002070335.26526-13-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: akarpovich <akarpovich@ilbers.de>
To: isar-users@googlegroups.com
Cc: Aliaksei Karpovich <akarpovich@ilbers.de>
Subject: [v11 12/12] base-apt: Move bullseye-mipsel in separate dir
Date: Fri,  2 Oct 2026 09:01:15 +0200
Message-ID: <20261002070335.26526-13-akarpovich@ilbers.de>
In-Reply-To: <20261002070335.26526-1-akarpovich@ilbers.de>
References: <20261002070335.26526-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

[v11,01/12] scripts: Add debrepo python script handling base-apt | expand

Commit Message

akarpovich Oct. 2, 2026, 7:01 a.m. UTC

From: Aliaksei Karpovich <akarpovich@ilbers.de>

As the bullseye-mipsel has separate bullseye repo (archive) it leads to
unresolving dependency (f.e. gnupg) in base-apt repo. It happens because
mipsel satied on deb11u2 version (and dont't have secure update) then other
move formward and have deb11u3 version.
When the bullseye-mipsel is built in the same time with other arch targed
(f.e. bullseye arm) the following dependency issue occurs:
 | The following packages have unmet dependencies:
 |  gnupg : Depends: dirmngr (< 2.2.27-2+deb11u3.1~) but it is not going to be installed
 |          Depends: dirmngr (>= 2.2.27-2+deb11u3) but it is not going to be installed
 |          Depends: gnupg-utils (>= 2.2.27-2+deb11u3) but 2.2.27-2+deb11u2 is to be installed
 |          Depends: gpg (>= 2.2.27-2+deb11u3) but 2.2.27-2+deb11u2 is to be installed
 |          Depends: gpg-agent (>= 2.2.27-2+deb11u3) but 2.2.27-2+deb11u2 is to be installed

It happens becasue (during arm build) gnupg_2.2.27-2+deb11u3_all.deb was
fetched, but other dependencies (dirmngr, gnupg-utils) for mipsel have old
deb11u2 version.

Fix: separate bullseye-mipsel into separate repo in base-apt.

Signed-off-by: Aliaksei Karpovich <akarpovich@ilbers.de>
---
 meta/conf/bitbake.conf                | 5 +++--
 meta/conf/distro/debian-bullseye.conf | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c8503ec6..97f200a0 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -99,8 +99,9 @@  REPO_ISAR_DIR = "${DEPLOY_DIR}/isar-apt/${DISTRO}/apt"
 REPO_ISAR_DB_DIR = "${DEPLOY_DIR}/isar-apt/${DISTRO}/db"
 
 # Base apt repository paths
-REPO_BASE_DIR = "${DEPLOY_DIR}/base-apt/${DISTRO}/apt"
-REPO_BASE_DB_DIR = "${DEPLOY_DIR}/base-apt/${DISTRO}/db"
+REPO_BASE_DIR_NAME ?= "${DISTRO}"
+REPO_BASE_DIR = "${DEPLOY_DIR}/base-apt/${REPO_BASE_DIR_NAME}/apt"
+REPO_BASE_DB_DIR = "${DEPLOY_DIR}/base-apt/${REPO_BASE_DIR_NAME}/db"
 
 # Setup our default hash policy
 BB_SIGNATURE_HANDLER ?= "OEBasicHash"
diff --git a/meta/conf/distro/debian-bullseye.conf b/meta/conf/distro/debian-bullseye.conf
index c368dcaf..00d50df4 100644
--- a/meta/conf/distro/debian-bullseye.conf
+++ b/meta/conf/distro/debian-bullseye.conf
@@ -2,6 +2,7 @@ 
 
 HOST_DISTRO_APT_SOURCES:mipsel ?= "conf/distro/${HOST_DISTRO}-mipsel.list"
 DISTRO_APT_SOURCES:mipsel ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}-mipsel.list"
+REPO_BASE_DIR_NAME:mipsel = "${DISTRO}-mipsel"
 
 require debian-common.conf

[v11,12/12] base-apt: Move bullseye-mipsel in separate dir

Commit Message

Patch