diff options
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | src/kernel/arch/amd64/grub.cfg | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -67,7 +67,7 @@ ports/%: portdeps +$@/port install """) -t('out/boot.iso', 'out/fs/boot/kernel out/fs/boot/grub/grub.cfg out/fs/boot/init', [ +t('out/boot.iso', 'out/fs/boot/kernel out/fs/boot/grub/grub.cfg out/fs/boot/init.gz', [ 'grub-mkrescue -o $@ out/fs/ >/dev/null 2>&1' ]) @@ -89,7 +89,7 @@ t('out/bootstrap.elf', 'src/bootstrap/linker.ld' + srcobj('src/bootstrap/') + 'o '$(CC) -nostdlib -Wl,-no-pie -T $^ -o $@' ]) -t('out/fs/boot/init', 'out/bootstrap out/initrd.tar', ['cat $^ > $@']) +t('out/fs/boot/init.gz', 'out/bootstrap out/initrd.tar', ['cat $^ | gzip > $@']) t('out/fs/boot/grub/grub.cfg', 'src/kernel/arch/amd64/grub.cfg', ['cp $< $@']) diff --git a/src/kernel/arch/amd64/grub.cfg b/src/kernel/arch/amd64/grub.cfg index 528b39c..6bdd30d 100644 --- a/src/kernel/arch/amd64/grub.cfg +++ b/src/kernel/arch/amd64/grub.cfg @@ -2,5 +2,5 @@ set timeout=0 menuentry "Camellia" { multiboot2 /boot/kernel - module2 /boot/init + module2 /boot/init.gz } |