enderice2/Fennix
enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-05-28 23:44:31 +00:00
Code Issues Actions Releases Wiki Activity

Change BOOTLOADER options

Browse Source
This commit is contained in:
Alex 2023-03-19 22:19:40 +02:00
parent b0ff30941d
commit 9230491801
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -133,8 +133,7 @@ ifeq ($(BOOTLOADER), lynx)
-efi-boot-part --efi-boot-image --protective-msdos-label \ -efi-boot-part --efi-boot-image --protective-msdos-label \
iso_tmp_data -o $(OSNAME).iso iso_tmp_data -o $(OSNAME).iso
endif endif
ifeq ($(BOOTLOADER), other) ifeq ($(BOOTLOADER), limine)
ifeq ($(OSARCH), amd64)
cp tools/limine.cfg $(LIMINE_FOLDER)/limine.sys $(LIMINE_FOLDER)/limine-cd.bin $(LIMINE_FOLDER)/limine-cd-efi.bin iso_tmp_data/ cp tools/limine.cfg $(LIMINE_FOLDER)/limine.sys $(LIMINE_FOLDER)/limine-cd.bin $(LIMINE_FOLDER)/limine-cd-efi.bin iso_tmp_data/
xorriso -as mkisofs -quiet -b limine-cd.bin \ xorriso -as mkisofs -quiet -b limine-cd.bin \
-no-emul-boot -boot-load-size 4 -boot-info-table \ -no-emul-boot -boot-load-size 4 -boot-info-table \
@ -142,7 +141,7 @@ ifeq ($(OSARCH), amd64)
-efi-boot-part --efi-boot-image --protective-msdos-label \ -efi-boot-part --efi-boot-image --protective-msdos-label \
iso_tmp_data -o $(OSNAME).iso iso_tmp_data -o $(OSNAME).iso
endif endif
ifeq ($(OSARCH), i686) ifeq ($(BOOTLOADER), grub)
# TODO: Add custom language support for GRUB or detect the system language using "echo $LANG | cut -d . -f 1" and set "lang" variable inside grub.cfg # TODO: Add custom language support for GRUB or detect the system language using "echo $LANG | cut -d . -f 1" and set "lang" variable inside grub.cfg
mkdir -p iso_tmp_data/boot mkdir -p iso_tmp_data/boot
mkdir -p iso_tmp_data/boot/grub mkdir -p iso_tmp_data/boot/grub
@ -152,7 +151,6 @@ endif
ifeq ($(OSARCH), aarch64) ifeq ($(OSARCH), aarch64)
$(COMPILER_PATH)/$(COMPILER_ARCH)objcopy Kernel/kernel.fsys -O binary $(OSNAME).img $(COMPILER_PATH)/$(COMPILER_ARCH)objcopy Kernel/kernel.fsys -O binary $(OSNAME).img
endif endif
endif
ifeq ($(OSARCH), amd64) ifeq ($(OSARCH), amd64)
QEMU_UEFI_BIOS = -bios /usr/share/qemu/OVMF.fd QEMU_UEFI_BIOS = -bios /usr/share/qemu/OVMF.fd

7
Makefile.conf
View File

@ -15,9 +15,10 @@ KERNEL_VERSION = pre-alpha-0.0.0.1
# Which bootloader to use. # Which bootloader to use.
# Available bootloaders: # Available bootloaders:
# - lynx - Lynx Bootloader (still under development) # - lynx - Lynx (still under development)
# - other - Limine (64-bit) & GRUB Bootloader (32-bit) # - limine - Limine
BOOTLOADER=other # - grub - GRUB
BOOTLOADER=limine
# The path of the cross-compiler. # The path of the cross-compiler.
COMPILER_PATH = tools/cross/bin COMPILER_PATH = tools/cross/bin