From: Ralph Ronnquist Date: Sat, 21 Sep 2024 23:47:42 +0000 (+1000) Subject: Fiddling with the kernel naming.. X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=7a513355c40652a835205e8d69a6e482decd60ac;p=rrq%2Fbespoke-installer.git Fiddling with the kernel naming.. --- diff --git a/build-installer.sh b/build-installer.sh index ecb04f9..949cf04 100755 --- 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 910cda3..f336f4e 100755 --- 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