From 13b9a333adc2791ea07080042a0998cdd5b6c003 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Tue, 14 Jun 2022 05:58:34 +0200 Subject: [PATCH] build: Update due to limine-efi rebranding --- .gitignore | 2 +- GNUmakefile.in | 8 ++++---- autogen.sh | 2 +- common/GNUmakefile | 46 +++++++++++++++++++++++----------------------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index ca746723..a345e4c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ /bin /build /toolchain -/reduced-gnu-efi +/limine-efi /freestanding_headers /ovmf* *.o diff --git a/GNUmakefile.in b/GNUmakefile.in index 1e5b65c8..016ab546 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -170,13 +170,13 @@ limine-uefi: @BUILD_UEFI32@ @BUILD_UEFI64@ $(MAKE) limine-cd-efi .PHONY: limine-uefi64 -limine-uefi64: $(call MKESCAPE,$(SRCDIR))/reduced-gnu-efi +limine-uefi64: $(call MKESCAPE,$(SRCDIR))/limine-efi $(MAKE) common-uefi64 mkdir -p '$(call SHESCAPE,$(BINDIR))' cp '$(call SHESCAPE,$(BUILDDIR))/common-uefi64/BOOTX64.EFI' '$(call SHESCAPE,$(BINDIR))/' .PHONY: limine-uefi32 -limine-uefi32: $(call MKESCAPE,$(SRCDIR))/reduced-gnu-efi +limine-uefi32: $(call MKESCAPE,$(SRCDIR))/limine-efi $(MAKE) common-uefi32 mkdir -p '$(call SHESCAPE,$(BINDIR))' cp '$(call SHESCAPE,$(BUILDDIR))/common-uefi32/BOOTIA32.EFI' '$(call SHESCAPE,$(BINDIR))/' @@ -198,7 +198,7 @@ dist: cd '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)" && git checkout . cd '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)" && NOCONFIGURE=yes ./autogen.sh rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/freestanding_headers/.git" - rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/reduced-gnu-efi/.git" + rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/limine-efi/.git" rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/.git" rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/autom4te.cache" rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/test" @@ -214,7 +214,7 @@ distclean: clean .PHONY: maintainer-clean maintainer-clean: distclean - cd '$(call SHESCAPE,$(SRCDIR))' && rm -rf freestanding_headers reduced-gnu-efi configure build-aux *'~' autom4te.cache *.tar.xz *.tar.gz + cd '$(call SHESCAPE,$(SRCDIR))' && rm -rf freestanding_headers limine-efi configure build-aux *'~' autom4te.cache *.tar.xz *.tar.gz .PHONY: common-uefi64 common-uefi64: diff --git a/autogen.sh b/autogen.sh index 4baf2368..4b0a6762 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,7 +10,7 @@ test -z "$srcdir" && srcdir=. cd "$srcdir" [ -d freestanding_headers ] || git clone https://github.com/mintsuki/freestanding_headers.git -[ -d reduced-gnu-efi ] || git clone https://github.com/limine-bootloader/reduced-gnu-efi.git +[ -d limine-efi ] || git clone https://github.com/limine-bootloader/limine-efi.git automake_libdir="$(automake --print-libdir)" diff --git a/common/GNUmakefile b/common/GNUmakefile index 9cad8842..897385d4 100644 --- a/common/GNUmakefile +++ b/common/GNUmakefile @@ -101,8 +101,8 @@ override INTERNAL_CFLAGS += \ -mtune=generic \ -mabi=sysv \ -DGNU_EFI_USE_MS_ABI \ - -I'$(call SHESCAPE,$(BUILDDIR))/reduced-gnu-efi/inc' \ - -I'$(call SHESCAPE,$(BUILDDIR))/reduced-gnu-efi/inc/x86_64' \ + -I'$(call SHESCAPE,$(BUILDDIR))/limine-efi/inc' \ + -I'$(call SHESCAPE,$(BUILDDIR))/limine-efi/inc/x86_64' \ -fpie \ -mno-red-zone endif @@ -116,8 +116,8 @@ override INTERNAL_CFLAGS += \ -mtune=generic \ -mabi=sysv \ -DGNU_EFI_USE_MS_ABI \ - -I'$(call SHESCAPE,$(BUILDDIR))/reduced-gnu-efi/inc' \ - -I'$(call SHESCAPE,$(BUILDDIR))/reduced-gnu-efi/inc/ia32' \ + -I'$(call SHESCAPE,$(BUILDDIR))/limine-efi/inc' \ + -I'$(call SHESCAPE,$(BUILDDIR))/limine-efi/inc/ia32' \ -fpie endif @@ -273,9 +273,9 @@ $(call MKESCAPE,$(BUILDDIR))/limine.elf: $(OBJ) $(call MKESCAPE,$(BUILDDIR))/tin endif -$(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi: ../reduced-gnu-efi/* +$(call MKESCAPE,$(BUILDDIR))/limine-efi: ../limine-efi/* mkdir -p '$(call SHESCAPE,$(BUILDDIR))/' - cp -r ../reduced-gnu-efi '$(call SHESCAPE,$(BUILDDIR))/' + cp -r ../limine-efi '$(call SHESCAPE,$(BUILDDIR))/' ifeq ($(TARGET), uefi64) @@ -288,16 +288,16 @@ $(call MKESCAPE,$(BUILDDIR))/full.map.o: $(call MKESCAPE,$(BUILDDIR))/limine_nom $(call MKESCAPE,$(BUILDDIR))/BOOTX64.EFI: $(call MKESCAPE,$(BUILDDIR))/limine.elf $(LIMINE_OBJCOPY) -O binary '$(call SHESCAPE,$<)' '$(call SHESCAPE,$@)' -$(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi/crt0-efi-x86_64.o: reduced-gnu-efi +$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-x86_64.o: limine-efi true -$(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi/libgnuefi.a: reduced-gnu-efi +$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/libgnuefi.a: limine-efi true -.PHONY: reduced-gnu-efi -reduced-gnu-efi: $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi +.PHONY: limine-efi +limine-efi: $(call MKESCAPE,$(BUILDDIR))/limine-efi unset ARFLAGS; unset CPPFLAGS; \ - $(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi' \ + $(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/limine-efi/gnuefi' \ CC="$(LIMINE_CC) -m64 -march=x86-64 -mtune=generic" \ CFLAGS='-nostdinc' \ INCDIR='-I$(call SHESCAPE,$(SRCDIR))/../freestanding_headers' \ @@ -308,7 +308,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi64.ld.in mkdir -p '$(call SHESCAPE,$(BUILDDIR))' $(LIMINE_CC) -x c -E -P -undef -DLINKER_NOMAP linker_uefi64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' -$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi/crt0-efi-x86_64.o $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi/libgnuefi.a $(OBJ) $(call MKESCAPE,$(BUILDDIR))/tinf/tinfgzip.o $(call MKESCAPE,$(BUILDDIR))/tinf/tinflate.o $(call MKESCAPE,$(BUILDDIR))/font.o $(call MKESCAPE,$(BUILDDIR))/sys/smp_trampoline.o +$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-x86_64.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/libgnuefi.a $(OBJ) $(call MKESCAPE,$(BUILDDIR))/tinf/tinfgzip.o $(call MKESCAPE,$(BUILDDIR))/tinf/tinflate.o $(call MKESCAPE,$(BUILDDIR))/font.o $(call MKESCAPE,$(BUILDDIR))/sys/smp_trampoline.o $(MAKE) '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' $(LIMINE_LD) \ -T'$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' \ @@ -318,7 +318,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker.ld: linker_uefi64.ld.in mkdir -p '$(call SHESCAPE,$(BUILDDIR))' $(LIMINE_CC) -x c -E -P -undef linker_uefi64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker.ld' -$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi/crt0-efi-x86_64.o $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi/libgnuefi.a $(OBJ) $(call MKESCAPE,$(BUILDDIR))/tinf/tinfgzip.o $(call MKESCAPE,$(BUILDDIR))/tinf/tinflate.o $(call MKESCAPE,$(BUILDDIR))/font.o $(call MKESCAPE,$(BUILDDIR))/sys/smp_trampoline.o $(call MKESCAPE,$(BUILDDIR))/full.map.o +$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-x86_64.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/libgnuefi.a $(OBJ) $(call MKESCAPE,$(BUILDDIR))/tinf/tinfgzip.o $(call MKESCAPE,$(BUILDDIR))/tinf/tinflate.o $(call MKESCAPE,$(BUILDDIR))/font.o $(call MKESCAPE,$(BUILDDIR))/sys/smp_trampoline.o $(call MKESCAPE,$(BUILDDIR))/full.map.o $(MAKE) '$(call SHESCAPE,$(BUILDDIR))/linker.ld' $(LIMINE_LD) \ -T'$(call SHESCAPE,$(BUILDDIR))/linker.ld' \ @@ -337,16 +337,16 @@ $(call MKESCAPE,$(BUILDDIR))/full.map.o: $(call MKESCAPE,$(BUILDDIR))/limine_nom $(call MKESCAPE,$(BUILDDIR))/BOOTIA32.EFI: $(call MKESCAPE,$(BUILDDIR))/limine.elf $(LIMINE_OBJCOPY) -O binary '$(call SHESCAPE,$<)' '$(call SHESCAPE,$@)' -$(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi/crt0-efi-ia32.o: reduced-gnu-efi +$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-ia32.o: limine-efi true -$(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi/libgnuefi.a: reduced-gnu-efi +$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/libgnuefi.a: limine-efi true -.PHONY: reduced-gnu-efi -reduced-gnu-efi: $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi +.PHONY: limine-efi +limine-efi: $(call MKESCAPE,$(BUILDDIR))/limine-efi unset ARFLAGS; unset CPPFLAGS; \ - $(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi' \ + $(MAKE) -C '$(call SHESCAPE,$(BUILDDIR))/limine-efi/gnuefi' \ CC="$(LIMINE_CC) -m32 -march=i686 -mtune=generic" \ CFLAGS='-nostdinc' \ INCDIR='-I$(call SHESCAPE,$(SRCDIR))/../freestanding_headers' \ @@ -357,7 +357,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi32.ld.in mkdir -p '$(call SHESCAPE,$(BUILDDIR))' $(LIMINE_CC) -x c -E -P -undef -DLINKER_NOMAP linker_uefi32.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' -$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi/crt0-efi-ia32.o $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi/libgnuefi.a $(OBJ) $(call MKESCAPE,$(BUILDDIR))/tinf/tinfgzip.o $(call MKESCAPE,$(BUILDDIR))/tinf/tinflate.o $(call MKESCAPE,$(BUILDDIR))/font.o $(call MKESCAPE,$(BUILDDIR))/sys/smp_trampoline.o +$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-ia32.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/libgnuefi.a $(OBJ) $(call MKESCAPE,$(BUILDDIR))/tinf/tinfgzip.o $(call MKESCAPE,$(BUILDDIR))/tinf/tinflate.o $(call MKESCAPE,$(BUILDDIR))/font.o $(call MKESCAPE,$(BUILDDIR))/sys/smp_trampoline.o $(MAKE) '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' $(LIMINE_LD) \ -T'$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' \ @@ -367,7 +367,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker.ld: linker_uefi32.ld.in mkdir -p '$(call SHESCAPE,$(BUILDDIR))' $(LIMINE_CC) -x c -E -P -undef linker_uefi32.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker.ld' -$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi/crt0-efi-ia32.o $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi/gnuefi/libgnuefi.a $(OBJ) $(call MKESCAPE,$(BUILDDIR))/tinf/tinfgzip.o $(call MKESCAPE,$(BUILDDIR))/tinf/tinflate.o $(call MKESCAPE,$(BUILDDIR))/font.o $(call MKESCAPE,$(BUILDDIR))/sys/smp_trampoline.o $(call MKESCAPE,$(BUILDDIR))/full.map.o +$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-ia32.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/libgnuefi.a $(OBJ) $(call MKESCAPE,$(BUILDDIR))/tinf/tinfgzip.o $(call MKESCAPE,$(BUILDDIR))/tinf/tinflate.o $(call MKESCAPE,$(BUILDDIR))/font.o $(call MKESCAPE,$(BUILDDIR))/sys/smp_trampoline.o $(call MKESCAPE,$(BUILDDIR))/full.map.o $(MAKE) '$(call SHESCAPE,$(BUILDDIR))/linker.ld' $(LIMINE_LD) \ -T'$(call SHESCAPE,$(BUILDDIR))/linker.ld' \ @@ -378,13 +378,13 @@ endif -include $(HEADER_DEPS) ifeq ($(TARGET), uefi64) -$(call MKESCAPE,$(BUILDDIR))/%.o: %.c $(call MKESCAPE,$(BUILDDIR))/tinf-copied $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi +$(call MKESCAPE,$(BUILDDIR))/%.o: %.c $(call MKESCAPE,$(BUILDDIR))/tinf-copied $(call MKESCAPE,$(BUILDDIR))/limine-efi mkdir -p "$$(dirname '$(call SHESCAPE,$@)')" $(LIMINE_CC) $(LIMINE_CFLAGS) $(INTERNAL_CFLAGS) -c '$(call SHESCAPE,$<)' -o '$(call SHESCAPE,$@)' endif ifeq ($(TARGET), uefi32) -$(call MKESCAPE,$(BUILDDIR))/%.o: %.c $(call MKESCAPE,$(BUILDDIR))/tinf-copied $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi +$(call MKESCAPE,$(BUILDDIR))/%.o: %.c $(call MKESCAPE,$(BUILDDIR))/tinf-copied $(call MKESCAPE,$(BUILDDIR))/limine-efi mkdir -p "$$(dirname '$(call SHESCAPE,$@)')" $(LIMINE_CC) $(LIMINE_CFLAGS) $(INTERNAL_CFLAGS) -c '$(call SHESCAPE,$<)' -o '$(call SHESCAPE,$@)' endif @@ -406,7 +406,7 @@ endif -include $(HEADER_DEPS) ifeq ($(TARGET), uefi64) -$(call MKESCAPE,$(BUILDDIR))/%.32.o: %.32.c $(call MKESCAPE,$(BUILDDIR))/reduced-gnu-efi +$(call MKESCAPE,$(BUILDDIR))/%.32.o: %.32.c $(call MKESCAPE,$(BUILDDIR))/limine-efi mkdir -p "$$(dirname '$(call SHESCAPE,$@)')" $(LIMINE_CC) $(LIMINE_CFLAGS) $(INTERNAL_CFLAGS32) -c '$(call SHESCAPE,$<)' -o '$(call SHESCAPE,$@).32' $(LIMINE_OBJCOPY) -I elf32-i386 -O elf64-x86-64 '$(call SHESCAPE,$@).32' '$(call SHESCAPE,$@)'