Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2026-04-16 05:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'vhaudiquet/riscv64-restore-vmlinux' into ubuntu/master

Browse Source
This commit is contained in:
michael.hudson@canonical.com 2026-04-16 08:09:02 +12:00
commit 29baaee6b0
No known key found for this signature in database
GPG Key ID: 80E627A0AB757E23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -3,6 +3,9 @@ livecd-rootfs (26.04.32) UNRELEASED; urgency=medium
[ Alfonso Sanchez-Beato ]
* Add support for building Ubuntu Core 26 images.
[ Valentin Haudiquet ]
* Make sure kernel is 'vmlinux' on riscv64, and not 'vmlinuz'
[ Michael Hudson-Doyle & Simon Poirier ]
* Add a hook 03-initramfs-enforcement.chroot to many ISO builds to ensure
that the live layer gets an initramfs built with casper and

2
live-build/functions
View File

@ -1464,7 +1464,7 @@ CASPER_DIR=config/iso-dir/iso-root/casper
iso_install_kernel() {
local flavor=$1 kernel=$2 initrd=$3
local kernel_name=vmlinuz
case $ARCH in ppc64el) kernel_name=vmlinux ;; esac
case $ARCH in ppc64el|riscv64) kernel_name=vmlinux ;; esac
local prefix=""
case $flavor in *-hwe) prefix="hwe-" ;; esac
cp "$kernel" "$CASPER_DIR/${prefix}${kernel_name}"

2
live-build/ubuntu-server/hooks/05-netboot-tarball.binary
View File

@ -34,7 +34,7 @@ PROJECT=$PROJECT${SUBARCH:+-$SUBARCH}
# Read kernel/initrd from the ISO casper directory where iso_install_kernel
# placed them.
kernel_name=vmlinuz
case $ARCH in ppc64el) kernel_name=vmlinux ;; esac
case $ARCH in ppc64el|riscv64) kernel_name=vmlinux ;; esac
casper_prefix=""
case $flavor in *-hwe) casper_prefix="hwe-" ;; esac
KERNEL=${CASPER_DIR}/${casper_prefix}${kernel_name}