Merge pull request #11427 from BbolroC/bump-rootfs-confidential-s390x

rootfs: Bump rootfs-{image,initrd} to 24.04
This commit is contained in:
Steve Horsman 2025-06-18 09:06:58 +01:00 committed by GitHub
commit d754e3939b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 16 deletions

View File

@ -12,6 +12,7 @@ PACKAGES="chrony iptables dbus"
[ "$AGENT_INIT" = no ] && PACKAGES+=" init"
[ "$MEASURED_ROOTFS" = yes ] && PACKAGES+=" cryptsetup-bin e2fsprogs"
[ "$SECCOMP" = yes ] && PACKAGES+=" libseccomp2"
[ "$(uname -m)" = "s390x" ] && PACKAGES+=" libcurl4 libnghttp2-14"
REPO_COMPONENTS=${REPO_COMPONENTS:-main}
case "$ARCH" in

View File

@ -122,25 +122,25 @@ assets:
architecture:
aarch64:
name: "ubuntu"
version: "jammy" # 22.04 LTS
version: "noble" # 24.04 LTS
nvidia-gpu:
name: "ubuntu"
version: "jammy" # 22.04 LTS
version: "noble" # 24.04 LTS
nvidia-gpu-confidential:
name: "ubuntu"
version: "jammy" # 22.04 LTS
version: "noble" # 24.04 LTS
ppc64le:
name: "ubuntu"
version: "jammy" # 22.04 LTS
version: "noble" # 24.04 LTS
s390x:
name: "ubuntu"
version: "jammy" # 22.04 LTS
version: "noble" # 24.04 LTS
confidential:
name: "ubuntu"
version: "jammy" # 22.04 LTS
version: "noble" # 24.04 LTS
x86_64:
name: "ubuntu"
version: "jammy" # 22.04 lTS
version: "noble" # 24.04 LTS
confidential:
name: "ubuntu"
version: "noble" # 24.04 LTS
@ -149,10 +149,10 @@ assets:
version: "3.0"
nvidia-gpu:
name: "ubuntu"
version: "jammy" # 22.04 LTS
version: "noble" # 24.04 LTS
nvidia-gpu-confidential:
name: "ubuntu"
version: "jammy" # 22.04 LTS
version: "noble" # 24.04 LTS
initrd:
description: |
@ -165,21 +165,21 @@ assets:
version: "3.18"
nvidia-gpu:
name: "ubuntu"
version: "jammy" # 22.04 LTS
version: "noble" # 24.04 LTS
nvidia-gpu-confidential:
name: "ubuntu"
version: "jammy" # 22.04 LTS
version: "noble" # 24.04 LTS
# Do not use Alpine on ppc64le & s390x, the agent cannot use musl because
# there is no such Rust target
ppc64le:
name: "ubuntu"
version: "jammy" # 22.04 LTS
version: "noble" # 24.04 LTS
s390x:
name: "ubuntu"
version: "jammy" # 22.04 LTS
version: "noble" # 24.04 LTS
confidential:
name: "ubuntu"
version: "jammy" # 22.04 LTS
version: "noble" # 24.04 LTS
x86_64:
name: "alpine"
version: "3.18"
@ -188,10 +188,10 @@ assets:
version: "noble" # 24.04 LTS
nvidia-gpu:
name: "ubuntu"
version: "jammy" # 22.04 LTS
version: "noble" # 24.04 LTS
nvidia-gpu-confidential:
name: "ubuntu"
version: "jammy" # 22.04 LTS
version: "noble" # 24.04 LTS
kernel:
description: "Linux kernel optimised for virtual machines"