diff mbox series

[3/4] ubuntu: add default snapshot entry for ports

Message ID 20261113151058.1542335-4-felix.moessbauer@siemens.com
State Under Review
Headers show
Series A couple of fixes for snapshot handling on ubuntu | expand

Commit Message

Felix Moessbauer Nov. 13, 2026, 3:10 p.m. UTC 
Currently the snapshot settings on ports are silently ignored because
the apt filter does not match the ports.ubuntu.com mirror. While there
is a ports snapshot mirror, this currently does not correctly behave
like a snapshot mirrors but rather like a normal mirror. The details
remain unclear, but we anyways set it so the build fails instead of
silently building the wrong thing. If the mirror ever works again, it
will automatically start working (correctly) again.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta-isar/conf/distro/ubuntu-common.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta-isar/conf/distro/ubuntu-common.inc
index b4a0d588..fb8906e7 100644
--- a/meta-isar/conf/distro/ubuntu-common.inc
+++ b/meta-isar/conf/distro/ubuntu-common.inc
@@ -42,6 +42,11 @@  SYSTEMD_BOOTLOADER_INSTALL:focal = "systemd:${DISTRO_ARCH}"
 SYSTEMD_BOOTLOADER_INSTALL:jammy = "systemd:${DISTRO_ARCH}"
 
 # snapshot mirror for reproducible builds
-DISTRO_APT_SNAPSHOT_PREMIRROR ??= "(http|https)://archive.ubuntu.com/(.*) https://snapshot.ubuntu.com/\2/${ISAR_APT_SNAPSHOT_DATE_INTERNAL}\n"
+# note, that the ports snapshot currently does not provide a proper snapshot mirror
+# we keep it anyways to let the build fail instead of silently using a non-snapshot mirror
+DISTRO_APT_SNAPSHOT_PREMIRROR ??= " \
+    (http|https)://archive.ubuntu.com/(.*) https://snapshot.ubuntu.com/\2/${ISAR_APT_SNAPSHOT_DATE_INTERNAL}\n \
+    (http|https)://ports.ubuntu.com/(.*) https://snapshot.ports.ubuntu.com/\2/${ISAR_APT_SNAPSHOT_DATE_INTERNAL}\n \
+"
 
 SBOM_BASE_DISTRO_VENDOR ?= "ubuntu"