Fiddling with the kernel naming..

diff --git a/build-installer.sh b/build-installer.sh
index ecb04f9936730ef936c693e09dc54be2dad382de..949cf04635592f0e8679cc423fa259160cd7bc6e 100755 (executable)
--- a/build-installer.sh
+++ b/build-installer.sh
@@ -211,4 +211,8 @@ mv $INITRD/{bin,sbin}/archdetect
 # Pack up $INITRD into a top-level initrd.gz, and copy out vmlinuz
 find $INITRD -not -name udebs -printf '%P\n' | \
     fakeroot cpio -o -H newc -D $INITRD | gzip > $TARGET_ARCH/initrd.gz
-cp $INITRD/boot/vmlinuz $TARGET_ARCH/
+VMLINUZ=( $INITRD/boot/vmlinu* )
+#-- Note that this renames it to vmlinuz regarless of its real name
+#-- Eg the riscv64 kernel is actually not compressed
+cp $VMLINUZ $TARGET_ARCH/vmlinuz
+

diff --git a/vm.sh b/vm.sh
index 910cda3a00db62f615a8899bb71cae2514958c7c..f336f4e7e78cd2b5d4f6767e000e38c8c0c4bf80 100755 (executable)
--- a/vm.sh
+++ b/vm.sh
@@ -82,7 +82,8 @@ case "$ARCH" in
        QEMU=qemu-system-riscv64
        ARGS=(
            -M virt -smp 4 -m 4G -nographic -serial stdio
-           -kernel riscv64/build/initrd/boot/vmlinux-6.10.9-riscv64
+           #-kernel riscv64/build/initrd/boot/vmlinux-6.10.9-riscv64
+           -kernel riscv64/vmlinuz
            -initrd riscv64/initrd.gz
            -append "console=ttyS0 root=/dev/vda1 roottype=ext4$APPEND"
            -chardev socket,id=QEMU,server=on,wait=off,path=QEMU-riscv64