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

Make sure kernel is 'vmlinux' on riscv64

Browse Source 
Commit 51624c1b444d034ac06d9d0d6e2c02f73e856aa1 introduced a regression, changing kernel name from vmlinux to vmlinux (default) on riscv64. This fixes the regression and the bug in recent riscv64 iso images (preventing boot).

Fixes: 51624c1b444d ("Place ISO artifacts directly into the ISO tree")

Signed-off-by: Valentin Haudiquet <valentin.haudiquet@canonical.com>
This commit is contained in:
Valentin Haudiquet 2026-04-15 15:50:46 +02:00
parent 4a0c43b28a
commit d7615a2237
No known key found for this signature in database
GPG Key ID: 5F2E1B25AFD6F352
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -2,6 +2,8 @@ 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'
-- Florent 'Skia' Jacquet <skia@ubuntu.com> Tue, 14 Apr 2026 12:56:52 +0200

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}