diff mbox series

[isar-cip-core] use ISAR snapshot infrastructure for sid

Message ID 20240510130716.152418-1-felix.moessbauer@siemens.com (mailing list archive)
State New
Headers show
Series [isar-cip-core] use ISAR snapshot infrastructure for sid | expand

Commit Message

Felix Moessbauer May 10, 2024, 1:07 p.m. UTC
To have a stable base for debian sid, we need to pin the package set to
a fixed (known to be good) timestamp. Previously, this was done by
changing the apt sources list. As ISAR now supports to use snapshot
mirrors on-the-fly, we replace the fixed list with that logic.

This also makes it possible to later manually update the images (only
the non-immutable ones) from a running system, as the default apt
sources are not modified.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 conf/distro/cip-core-sid.conf            | 5 +++--
 conf/distro/cip-debian-sid-snapshot.list | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 conf/distro/cip-debian-sid-snapshot.list

Comments

Jan Kiszka May 10, 2024, 2:42 p.m. UTC | #1
On 10.05.24 15:07, Felix Moessbauer wrote:
> To have a stable base for debian sid, we need to pin the package set to
> a fixed (known to be good) timestamp. Previously, this was done by
> changing the apt sources list. As ISAR now supports to use snapshot
> mirrors on-the-fly, we replace the fixed list with that logic.
> 
> This also makes it possible to later manually update the images (only
> the non-immutable ones) from a running system, as the default apt
> sources are not modified.
> 
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>  conf/distro/cip-core-sid.conf            | 5 +++--
>  conf/distro/cip-debian-sid-snapshot.list | 2 --
>  2 files changed, 3 insertions(+), 4 deletions(-)
>  delete mode 100644 conf/distro/cip-debian-sid-snapshot.list
> 
> diff --git a/conf/distro/cip-core-sid.conf b/conf/distro/cip-core-sid.conf
> index 48f26ff..eefcbb5 100644
> --- a/conf/distro/cip-core-sid.conf
> +++ b/conf/distro/cip-core-sid.conf
> @@ -12,8 +12,9 @@
>  require conf/distro/debian-sid.conf
>  require cip-core-common.inc
>  
> -DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-snapshot.list"
> -HOST_DISTRO_APT_SOURCES = "${DISTRO_APT_SOURCES}"
> +# corresponds to 20240211T000000Z
> +ISAR_APT_SNAPSHOT_TIMESTAMP ?= "1707606000"
> +ISAR_USE_APT_SNAPSHOT ?= "1"
>  
>  PREFERRED_VERSION_linux-cip ?= "6.1.%"
>  PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
> diff --git a/conf/distro/cip-debian-sid-snapshot.list b/conf/distro/cip-debian-sid-snapshot.list
> deleted file mode 100644
> index 874047b..0000000
> --- a/conf/distro/cip-debian-sid-snapshot.list
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -deb	[check-valid-until=no trusted=yes] https://snapshot-cloudflare.debian.org/archive/debian/20240211T000000Z sid main
> -deb-src	[check-valid-until=no trusted=yes] https://snapshot-cloudflare.debian.org/archive/debian/20240211T000000Z sid main

Thanks, applied.

Jan
diff mbox series

Patch

diff --git a/conf/distro/cip-core-sid.conf b/conf/distro/cip-core-sid.conf
index 48f26ff..eefcbb5 100644
--- a/conf/distro/cip-core-sid.conf
+++ b/conf/distro/cip-core-sid.conf
@@ -12,8 +12,9 @@ 
 require conf/distro/debian-sid.conf
 require cip-core-common.inc
 
-DISTRO_APT_SOURCES = "conf/distro/cip-debian-sid-snapshot.list"
-HOST_DISTRO_APT_SOURCES = "${DISTRO_APT_SOURCES}"
+# corresponds to 20240211T000000Z
+ISAR_APT_SNAPSHOT_TIMESTAMP ?= "1707606000"
+ISAR_USE_APT_SNAPSHOT ?= "1"
 
 PREFERRED_VERSION_linux-cip ?= "6.1.%"
 PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
diff --git a/conf/distro/cip-debian-sid-snapshot.list b/conf/distro/cip-debian-sid-snapshot.list
deleted file mode 100644
index 874047b..0000000
--- a/conf/distro/cip-debian-sid-snapshot.list
+++ /dev/null
@@ -1,2 +0,0 @@ 
-deb	[check-valid-until=no trusted=yes] https://snapshot-cloudflare.debian.org/archive/debian/20240211T000000Z sid main
-deb-src	[check-valid-until=no trusted=yes] https://snapshot-cloudflare.debian.org/archive/debian/20240211T000000Z sid main