* [PATCH v2 2/4] fix(resolute-arm64): use official mirror instead of ports
2026-11-16 12:57 [PATCH v2 0/4] A couple of fixes for snapshot handling on Ubuntu 'Felix Moessbauer' via isar-users
2026-11-16 12:57 ` [PATCH v2 1/4] update source date epoch fallback to cover all distro versions 'Felix Moessbauer' via isar-users
@ 2026-11-16 12:57 ` 'Felix Moessbauer' via isar-users
2026-11-16 12:57 ` [PATCH v2 3/4] ubuntu: add default snapshot entry for ports 'Felix Moessbauer' via isar-users
2026-11-16 12:57 ` [PATCH v2 4/4] testsuite: check if all ubuntu targets can be bootstrapped 'Felix Moessbauer' via isar-users
3 siblings, 0 replies; 5+ messages in thread
From: 'Felix Moessbauer' via isar-users @ 2026-11-16 12:57 UTC (permalink / raw)
To: isar-users; +Cc: Felix Moessbauer
From Ubuntu resolute on, the arm64 architecture is provided by the
official mirrors. Note, that while the ports still serves arm64, there
is no usable snapshot mirror for ports.
As the official repo and ports are not in sync, mixing architectures via
compat is no longer supported. By that, we simply disable compat on this
combination.
Fixes: 160c3cae ("meta: Add Ubuntu 26.04 (Resolute Raccoon) support")
Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
kas/opt/Kconfig | 5 +++--
meta-isar/conf/distro/ubuntu-common.inc | 3 ---
meta-isar/conf/distro/ubuntu-focal.conf | 3 +++
meta-isar/conf/distro/ubuntu-jammy.conf | 3 +++
meta-isar/conf/distro/ubuntu-noble.conf | 3 +++
meta-isar/conf/distro/ubuntu-resolute-ports.list | 12 ++++++------
meta-isar/conf/distro/ubuntu-resolute.conf | 3 +++
meta-isar/conf/distro/ubuntu-resolute.list | 12 ++++++------
8 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/kas/opt/Kconfig b/kas/opt/Kconfig
index ec010757..af54bcd5 100644
--- a/kas/opt/Kconfig
+++ b/kas/opt/Kconfig
@@ -8,7 +8,7 @@
# SPDX-License-Identifier: MIT
menu "Mirror selection"
- depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || DEBIAN_SID || UBUNTU_FOCAL || UBUNTU_JAMMY || UBUNTU_NOBLE
+ depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || DEBIAN_SID || UBUNTU_FOCAL || UBUNTU_JAMMY || UBUNTU_NOBLE || UBUNTU_RESOLUTE
config MIRROR_DEBIAN
bool "Use specific Debian mirror"
@@ -45,7 +45,7 @@ config KAS_INCLUDE_MIRROR_UBUNTU
config USE_APT_SNAPSHOT
bool "Use the distros snapshot mirror"
- depends on !MIRROR_DEBIAN && (DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || DEBIAN_SID || UBUNTU_FOCAL || UBUNTU_JAMMY || UBUNTU_NOBLE)
+ depends on !MIRROR_DEBIAN && (DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || DEBIAN_SID || UBUNTU_FOCAL || UBUNTU_JAMMY || UBUNTU_NOBLE || UBUNTU_RESOLUTE)
help
Use a snapshot mirror for the selected distribution.
@@ -141,6 +141,7 @@ config KAS_INCLUDE_IMAGE_FSTYPES
config COMPAT_ARCH
bool "Enable compat arch support"
+ depends on !(UBUNTU_RESOLUTE && MACHINE_QEMU_ARM64)
config KAS_INCLUDE_COMPAT_ARCH
string
diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta-isar/conf/distro/ubuntu-common.inc
index 1ee9bb84..b4a0d588 100644
--- a/meta-isar/conf/distro/ubuntu-common.inc
+++ b/meta-isar/conf/distro/ubuntu-common.inc
@@ -10,9 +10,6 @@ BASE_DISTRO = "ubuntu"
HOST_BASE_DISTRO = "${BASE_DISTRO}"
-DISTRO_APT_SOURCES:arm64 ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}-ports.list"
-HOST_DISTRO_APT_SOURCES:arm64 ?= "conf/distro/${HOST_DISTRO}.list conf/distro/${HOST_DISTRO}-ports.list"
-
DISTRO_APT_SOURCES:riscv64 ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}-ports.list"
HOST_DISTRO_APT_SOURCES:riscv64 ?= "conf/distro/${HOST_DISTRO}.list conf/distro/${HOST_DISTRO}-ports.list"
diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf
index 155644c1..c734b2b9 100644
--- a/meta-isar/conf/distro/ubuntu-focal.conf
+++ b/meta-isar/conf/distro/ubuntu-focal.conf
@@ -12,3 +12,6 @@ DISTRO_GCC = "9"
DEBIAN_COMPAT = "12"
DEBIAN_STANDARDS_VERSION ?= "4.5.0"
+
+DISTRO_APT_SOURCES:arm64 ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}-ports.list"
+HOST_DISTRO_APT_SOURCES:arm64 ?= "conf/distro/${HOST_DISTRO}.list conf/distro/${HOST_DISTRO}-ports.list"
diff --git a/meta-isar/conf/distro/ubuntu-jammy.conf b/meta-isar/conf/distro/ubuntu-jammy.conf
index 492ab126..faa0d5c0 100644
--- a/meta-isar/conf/distro/ubuntu-jammy.conf
+++ b/meta-isar/conf/distro/ubuntu-jammy.conf
@@ -12,3 +12,6 @@ DISTRO_GCC = "11"
DEBIAN_COMPAT = "13"
DEBIAN_STANDARDS_VERSION ?= "4.6.0"
+
+DISTRO_APT_SOURCES:arm64 ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}-ports.list"
+HOST_DISTRO_APT_SOURCES:arm64 ?= "conf/distro/${HOST_DISTRO}.list conf/distro/${HOST_DISTRO}-ports.list"
diff --git a/meta-isar/conf/distro/ubuntu-noble.conf b/meta-isar/conf/distro/ubuntu-noble.conf
index 5a9bd100..48c8b91f 100644
--- a/meta-isar/conf/distro/ubuntu-noble.conf
+++ b/meta-isar/conf/distro/ubuntu-noble.conf
@@ -12,3 +12,6 @@ DISTRO_GCC = "13"
DEBIAN_COMPAT = "13"
DEBIAN_STANDARDS_VERSION ?= "4.7.0"
+
+DISTRO_APT_SOURCES:arm64 ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}-ports.list"
+HOST_DISTRO_APT_SOURCES:arm64 ?= "conf/distro/${HOST_DISTRO}.list conf/distro/${HOST_DISTRO}-ports.list"
diff --git a/meta-isar/conf/distro/ubuntu-resolute-ports.list b/meta-isar/conf/distro/ubuntu-resolute-ports.list
index 239cafe6..a37f150c 100644
--- a/meta-isar/conf/distro/ubuntu-resolute-ports.list
+++ b/meta-isar/conf/distro/ubuntu-resolute-ports.list
@@ -1,6 +1,6 @@
-deb [arch=armhf,arm64,riscv64] http://ports.ubuntu.com/ubuntu-ports resolute main restricted universe multiverse
-deb-src [arch=armhf,arm64,riscv64] http://ports.ubuntu.com/ubuntu-ports resolute main restricted universe multiverse
-deb [arch=armhf,arm64,riscv64] http://ports.ubuntu.com/ubuntu-ports resolute-updates main restricted universe multiverse
-deb-src [arch=armhf,arm64,riscv64] http://ports.ubuntu.com/ubuntu-ports resolute-updates main restricted universe multiverse
-deb [arch=armhf,arm64,riscv64] http://ports.ubuntu.com/ubuntu-ports resolute-security main restricted universe multiverse
-deb-src [arch=armhf,arm64,riscv64] http://ports.ubuntu.com/ubuntu-ports resolute-security main restricted universe multiverse
+deb [arch=armhf,riscv64] http://ports.ubuntu.com/ubuntu-ports resolute main restricted universe multiverse
+deb-src [arch=armhf,riscv64] http://ports.ubuntu.com/ubuntu-ports resolute main restricted universe multiverse
+deb [arch=armhf,riscv64] http://ports.ubuntu.com/ubuntu-ports resolute-updates main restricted universe multiverse
+deb-src [arch=armhf,riscv64] http://ports.ubuntu.com/ubuntu-ports resolute-updates main restricted universe multiverse
+deb [arch=armhf,riscv64] http://ports.ubuntu.com/ubuntu-ports resolute-security main restricted universe multiverse
+deb-src [arch=armhf,riscv64] http://ports.ubuntu.com/ubuntu-ports resolute-security main restricted universe multiverse
diff --git a/meta-isar/conf/distro/ubuntu-resolute.conf b/meta-isar/conf/distro/ubuntu-resolute.conf
index 141f438f..ffdf1ab6 100644
--- a/meta-isar/conf/distro/ubuntu-resolute.conf
+++ b/meta-isar/conf/distro/ubuntu-resolute.conf
@@ -12,3 +12,6 @@ DISTRO_GCC = "15"
DEBIAN_COMPAT = "13"
DEBIAN_STANDARDS_VERSION ?= "4.7.4"
+
+# this would mix sources from official repos and ports
+ISAR_ENABLE_COMPAT_ARCH:arm64 = "0"
diff --git a/meta-isar/conf/distro/ubuntu-resolute.list b/meta-isar/conf/distro/ubuntu-resolute.list
index 65dcc81e..bf0a28b7 100644
--- a/meta-isar/conf/distro/ubuntu-resolute.list
+++ b/meta-isar/conf/distro/ubuntu-resolute.list
@@ -1,6 +1,6 @@
-deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu resolute main restricted universe multiverse
-deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu resolute main restricted universe multiverse
-deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu resolute-updates main restricted universe multiverse
-deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu resolute-updates main restricted universe multiverse
-deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu resolute-security main restricted universe multiverse
-deb-src [arch=amd64,i386] http://archive.ubuntu.com/ubuntu resolute-security main restricted universe multiverse
+deb [arch=amd64,i386,arm64] http://archive.ubuntu.com/ubuntu resolute main restricted universe multiverse
+deb-src [arch=amd64,i386,arm64] http://archive.ubuntu.com/ubuntu resolute main restricted universe multiverse
+deb [arch=amd64,i386,arm64] http://archive.ubuntu.com/ubuntu resolute-updates main restricted universe multiverse
+deb-src [arch=amd64,i386,arm64] http://archive.ubuntu.com/ubuntu resolute-updates main restricted universe multiverse
+deb [arch=amd64,i386,arm64] http://archive.ubuntu.com/ubuntu resolute-security main restricted universe multiverse
+deb-src [arch=amd64,i386,arm64] http://archive.ubuntu.com/ubuntu resolute-security main restricted universe multiverse
--
2.55.0
--
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20261116125708.2997360-3-felix.moessbauer%40siemens.com.
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v2 4/4] testsuite: check if all ubuntu targets can be bootstrapped
2026-11-16 12:57 [PATCH v2 0/4] A couple of fixes for snapshot handling on Ubuntu 'Felix Moessbauer' via isar-users
` (2 preceding siblings ...)
2026-11-16 12:57 ` [PATCH v2 3/4] ubuntu: add default snapshot entry for ports 'Felix Moessbauer' via isar-users
@ 2026-11-16 12:57 ` 'Felix Moessbauer' via isar-users
3 siblings, 0 replies; 5+ messages in thread
From: 'Felix Moessbauer' via isar-users @ 2026-11-16 12:57 UTC (permalink / raw)
To: isar-users; +Cc: Felix Moessbauer
As ubuntu is a constant trouble maker, we add a dedicated test that
checks if bootstrapping against the default mirrors and snapshot mirrors
(for supported targets) works.
Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
testsuite/citest.py | 43 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
diff --git a/testsuite/citest.py b/testsuite/citest.py
index 5a9ebbc4..cf6b9a94 100644
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -665,6 +665,49 @@ class CrossTest(CIBaseTest):
self.init()
self.perform_build_test(targets)
+
+class UbuntuTest(CIBaseTest):
+ """
+ Tests bootstrapping of Ubuntu distributions
+ :avocado: tags=ubuntu,full
+ """
+
+ @staticmethod
+ def bootstrap_targets():
+ recipe = ['isar-mmdebstrap-target', 'isar-mmdebstrap-host']
+ # focal is EOL, so we skip it
+ distro = ['jammy', 'noble', 'resolute']
+ archs = ['amd64', 'arm64', 'armhf', 'riscv64']
+ machines = {'armhf': 'qemuarm'}
+ available = set(CIUtils.get_targets())
+ return [
+ f'mc:{mc}:{r}'
+ for d in distro
+ for a in archs
+ for r in recipe
+ if (mc := f"{machines.get(a, 'qemu' + a)}-{d}") in available
+ ]
+
+ @staticmethod
+ def snapshot_supported(target):
+ machine, distro = target.split(':')[1].rsplit('-', 1)
+ if distro in ('jammy', 'noble'):
+ return machine == 'qemuamd64'
+ return machine in ('qemuamd64', 'qemuarm64')
+
+ def test_ubuntu_bootstrap_mirror(self):
+ self.init()
+ self.perform_build_test(self.bootstrap_targets())
+
+ def test_ubuntu_bootstrap_snapshot(self):
+ self.init()
+ targets = self.bootstrap_targets()
+
+ targets = [t for t in targets if self.snapshot_supported(t)]
+ self.perform_build_test(targets,
+ use_apt_snapshot=True)
+
+
class PrebuiltTest(CIBaseTest):
"""
Tests associated with prebuilt artifacts (containers, debs).
--
2.55.0
--
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20261116125708.2997360-5-felix.moessbauer%40siemens.com.
^ permalink raw reply [flat|nested] 5+ messages in thread