Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions releng/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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<major>.<minor>
# Include the specified Void Linux kernel series in the image;
# kernel series take the form linux<major>.<minor>
#
# 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
Expand Down
4 changes: 2 additions & 2 deletions releng/docker/image-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ usage() {
series take the form <major>.<minor> and correspond to Void packages
linux<kver> and linux<kver>-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)

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion testing/helpers/chroot-void.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down