diff mbox series

[v3,3/4] Revert "Split up isar-apt into distro-arch specific instances"

Message ID 20260506121931.4167983-4-felix.moessbauer@siemens.com
State Under Review
Headers show
Series Only build arch=all package from -native variant | expand

Commit Message

Felix Moessbauer May 6, 2026, 12:19 p.m. UTC 
This reverts commit dfa31ce4c8274b18c09c24fee804be6961c2ffd6.

The split was needed, because both the native and target builds
generated the arch=all packages, leading to conflicts. As we now only
build arch=all packages from the -native variant, each arch=all package
is just build once. By that, we also must use the same repo for both
host and target packages, as otherwise the arch=all packages are not
visible to the target install step.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta/conf/bitbake.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 5c71078d..08c525d9 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -93,8 +93,8 @@  TARGET_OS = "isar"
 PACKAGE_ARCH ?= "${DISTRO_ARCH}"
 
 # Isar apt repository paths
-REPO_ISAR_DIR = "${DEPLOY_DIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/apt"
-REPO_ISAR_DB_DIR = "${DEPLOY_DIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/db"
+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"