diff --git a/releng/docker/Dockerfile b/releng/docker/Dockerfile index b6cafcee..f25ef4fc 100644 --- a/releng/docker/Dockerfile +++ b/releng/docker/Dockerfile @@ -16,12 +16,11 @@ LABEL org.opencontainers.image.authors="ZFSBootMenu Team, https://zfsbootmenu.or ARG XBPS_REPOS="https://repo-fastly.voidlinux.org/current" -# Include the specified Void Linux kernel series in the image; kernel -# series take the form linux. +# Include the specified Void Linux kernel series in the image; +# kernel series take the form linux. # -# Default: linux5.10 linux5.15 linux6.1 # (multiple entries must be seperated by spaces) -ARG KERNELS="linux5.10 linux5.15 linux6.1" +ARG KERNELS="linux6.6 linux6.12 linux6.18" # Update repos and install kernels and base dependencies. # Run the following within an external cache (/var/cache/xbps) for the diff --git a/releng/docker/image-build.sh b/releng/docker/image-build.sh index 5b4ab24c..9d7a1c53 100755 --- a/releng/docker/image-build.sh +++ b/releng/docker/image-build.sh @@ -28,7 +28,7 @@ usage() { series take the form . and correspond to Void packages linux and linux-headers - Default: install 6.1, 6.6 and 6.12 + Default: install 6.6, 6.12, 6.18 (One version per argument; may be repeated as needed) @@ -122,7 +122,7 @@ fi # Use default kernel series when nothing was specified if [ "${#kern_series[@]}" -lt 1 ]; then - kern_series=( "linux6.1" "linux6.6" "linux6.12" ) + kern_series=( "linux6.6" "linux6.12" "linux6.18" ) fi # Populate the correspoding headers list diff --git a/testing/helpers/chroot-void.sh b/testing/helpers/chroot-void.sh index aacb87fd..da90ac96 100755 --- a/testing/helpers/chroot-void.sh +++ b/testing/helpers/chroot-void.sh @@ -34,7 +34,7 @@ for keyfile in /etc/zfs/*.key; do echo "install_items+=\" ${keyfile} \"" >> /etc/dracut.conf.d/zol.conf done -: "${KERNEL:=linux6.1}" +: "${KERNEL:=linux6.12}" xbps-install -y "${KERNEL}" "${KERNEL}-headers" dracut zfs