mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 04:57:45 +00:00
Kernel/x86: Bake the Prekernel and the Kernel into one image
The new baked image is a Prekernel and a Kernel baked together now, so essentially we no longer need to pass the Prekernel as -kernel and the actual kernel image as -initrd to QEMU, leaving the option to pass an actual initrd or initramfs module later on with multiboot.
This commit is contained in:
parent
2a1e58f8cc
commit
897c4e5145
10 changed files with 81 additions and 50 deletions
|
@ -328,16 +328,9 @@ if [ "$NATIVE_WINDOWS_QEMU" -ne "1" ]; then
|
|||
-qmp unix:qmp-sock,server,nowait"
|
||||
fi
|
||||
|
||||
if [ "$SERENITY_ARCH" = "aarch64" ]; then
|
||||
SERENITY_KERNEL_AND_INITRD="
|
||||
SERENITY_KERNEL_AND_INITRD="
|
||||
-kernel Kernel/Kernel
|
||||
"
|
||||
else
|
||||
SERENITY_KERNEL_AND_INITRD="
|
||||
-kernel Kernel/Prekernel/Prekernel
|
||||
-initrd Kernel/Kernel
|
||||
"
|
||||
fi
|
||||
|
||||
|
||||
[ -z "$SERENITY_COMMON_QEMU_ARGS" ] && SERENITY_COMMON_QEMU_ARGS="
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue