diff mbox series

[v9,13/13] base-apt: Move bullseye-mipsel in separate dir

Message ID 20260820133934.383231-14-akarpovich@ilbers.de
State Under Review
Headers show
Series Improving base-apt usage | expand

Commit Message

Aliaksei Karpovich Aug. 20, 2026, 1:29 p.m. UTC 
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 mbox series

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 1372a00e..a8eb62f7 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