@@ -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
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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
@@ -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"
@@ -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
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(-)