From 264decd0ef70ab4f142c729dcfdbddf0b2ce0dee Mon Sep 17 00:00:00 2001 From: mintsuki Date: Wed, 14 Jun 2023 03:14:41 +0200 Subject: [PATCH] misc: limine-cd-efi.bin -> limine-uefi-cd.bin --- GNUmakefile.in | 38 +++++++++++++++++++------------------- README.md | 16 ++++++++-------- configure.ac | 18 +++++++++--------- host/Makefile | 2 +- test.mk | 2 +- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index 5fd37872..51cc1884 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -41,7 +41,7 @@ override BUILD_UEFI_X86_64 := @BUILD_UEFI_X86_64@ override BUILD_UEFI_IA32 := @BUILD_UEFI_IA32@ override BUILD_UEFI_AARCH64 := @BUILD_UEFI_AARCH64@ override BUILD_UEFI_RISCV64 := @BUILD_UEFI_RISCV64@ -override BUILD_CD_EFI := @BUILD_CD_EFI@ +override BUILD_UEFI_CD := @BUILD_UEFI_CD@ override BUILD_BIOS_PXE := @BUILD_BIOS_PXE@ override BUILD_CD := @BUILD_CD@ @@ -107,7 +107,7 @@ all: $(call MKESCAPE,$(BINDIR))/Makefile .PHONY: all1 all1: $(BUILD_UEFI_X86_64) $(BUILD_UEFI_IA32) $(BUILD_UEFI_AARCH64) $(BUILD_UEFI_RISCV64) $(BUILD_BIOS) $(MAKE) '$(call SHESCAPE,$(BINDIR))/limine' - $(MAKE) '$(call SHESCAPE,$(BINDIR))/limine-cd-efi.bin' + $(MAKE) '$(call SHESCAPE,$(BINDIR))/limine-uefi-cd.bin' $(call MKESCAPE,$(BINDIR))/limine-hdd.h: $(call MKESCAPE,$(BINDIR))/limine-hdd.bin $(MKDIR_P) '$(call SHESCAPE,$(BINDIR))' @@ -153,8 +153,8 @@ endif ifneq ($(BUILD_CD),no) $(INSTALL_DATA) '$(call SHESCAPE,$(BINDIR))/limine-cd.bin' '$(call SHESCAPE,$(DESTDIR)$(datarootdir))/limine/' endif -ifneq ($(BUILD_CD_EFI),no) - $(INSTALL_DATA) '$(call SHESCAPE,$(BINDIR))/limine-cd-efi.bin' '$(call SHESCAPE,$(DESTDIR)$(datarootdir))/limine/' +ifneq ($(BUILD_UEFI_CD),no) + $(INSTALL_DATA) '$(call SHESCAPE,$(BINDIR))/limine-uefi-cd.bin' '$(call SHESCAPE,$(DESTDIR)$(datarootdir))/limine/' endif ifneq ($(BUILD_BIOS_PXE),no) $(INSTALL_DATA) '$(call SHESCAPE,$(BINDIR))/limine-bios-pxe.bin' '$(call SHESCAPE,$(DESTDIR)$(datarootdir))/limine/' @@ -208,28 +208,28 @@ endif limine-bios: common-bios decompressor $(MAKE) '$(call SHESCAPE,$(BUILDDIR))/stage1.stamp' -$(call MKESCAPE,$(BINDIR))/limine-cd-efi.bin: $(if $(BUILD_UEFI_IA32),$(call MKESCAPE,$(BUILDDIR))/common-uefi-ia32/BOOTIA32.EFI) $(if $(BUILD_UEFI_X86_64),$(call MKESCAPE,$(BUILDDIR))/common-uefi-x86-64/BOOTX64.EFI) $(if $(BUILD_UEFI_AARCH64),$(call MKESCAPE,$(BUILDDIR))/common-uefi-aarch64/BOOTAA64.EFI) $(if $(BUILD_UEFI_RISCV64),$(call MKESCAPE,$(BUILDDIR))/common-uefi-riscv64/BOOTRISCV64.EFI) -ifneq ($(BUILD_CD_EFI),no) +$(call MKESCAPE,$(BINDIR))/limine-uefi-cd.bin: $(if $(BUILD_UEFI_IA32),$(call MKESCAPE,$(BUILDDIR))/common-uefi-ia32/BOOTIA32.EFI) $(if $(BUILD_UEFI_X86_64),$(call MKESCAPE,$(BUILDDIR))/common-uefi-x86-64/BOOTX64.EFI) $(if $(BUILD_UEFI_AARCH64),$(call MKESCAPE,$(BUILDDIR))/common-uefi-aarch64/BOOTAA64.EFI) $(if $(BUILD_UEFI_RISCV64),$(call MKESCAPE,$(BUILDDIR))/common-uefi-riscv64/BOOTRISCV64.EFI) +ifneq ($(BUILD_UEFI_CD),no) $(MKDIR_P) '$(call SHESCAPE,$(BINDIR))' - rm -f '$(call SHESCAPE,$(BINDIR))/limine-cd-efi.bin' - dd if=/dev/zero of='$(call SHESCAPE,$(BINDIR))/limine-cd-efi.bin' bs=512 count=2880 2>/dev/null - ( mformat -i '$(call SHESCAPE,$(BINDIR))/limine-cd-efi.bin' -f 1440 :: && \ - mmd -D s -i '$(call SHESCAPE,$(BINDIR))/limine-cd-efi.bin' ::/EFI && \ - mmd -D s -i '$(call SHESCAPE,$(BINDIR))/limine-cd-efi.bin' ::/EFI/BOOT && \ + rm -f '$(call SHESCAPE,$(BINDIR))/limine-uefi-cd.bin' + dd if=/dev/zero of='$(call SHESCAPE,$(BINDIR))/limine-uefi-cd.bin' bs=512 count=2880 2>/dev/null + ( mformat -i '$(call SHESCAPE,$(BINDIR))/limine-uefi-cd.bin' -f 1440 :: && \ + mmd -D s -i '$(call SHESCAPE,$(BINDIR))/limine-uefi-cd.bin' ::/EFI && \ + mmd -D s -i '$(call SHESCAPE,$(BINDIR))/limine-uefi-cd.bin' ::/EFI/BOOT && \ ( ( [ -f '$(call SHESCAPE,$(BUILDDIR))/common-uefi-aarch64/BOOTAA64.EFI' ] && \ - mcopy -D o -i '$(call SHESCAPE,$(BINDIR))/limine-cd-efi.bin' '$(call SHESCAPE,$(BUILDDIR))/common-uefi-aarch64/BOOTAA64.EFI' ::/EFI/BOOT ) || true ) && \ + mcopy -D o -i '$(call SHESCAPE,$(BINDIR))/limine-uefi-cd.bin' '$(call SHESCAPE,$(BUILDDIR))/common-uefi-aarch64/BOOTAA64.EFI' ::/EFI/BOOT ) || true ) && \ ( ( [ -f '$(call SHESCAPE,$(BUILDDIR))/common-uefi-riscv64/BOOTRISCV64.EFI' ] && \ - mcopy -D o -i '$(call SHESCAPE,$(BINDIR))/limine-cd-efi.bin' '$(call SHESCAPE,$(BUILDDIR))/common-uefi-riscv64/BOOTRISCV64.EFI' ::/EFI/BOOT ) || true ) && \ + mcopy -D o -i '$(call SHESCAPE,$(BINDIR))/limine-uefi-cd.bin' '$(call SHESCAPE,$(BUILDDIR))/common-uefi-riscv64/BOOTRISCV64.EFI' ::/EFI/BOOT ) || true ) && \ ( ( [ -f '$(call SHESCAPE,$(BUILDDIR))/common-uefi-x86-64/BOOTX64.EFI' ] && \ - mcopy -D o -i '$(call SHESCAPE,$(BINDIR))/limine-cd-efi.bin' '$(call SHESCAPE,$(BUILDDIR))/common-uefi-x86-64/BOOTX64.EFI' ::/EFI/BOOT ) || true ) && \ + mcopy -D o -i '$(call SHESCAPE,$(BINDIR))/limine-uefi-cd.bin' '$(call SHESCAPE,$(BUILDDIR))/common-uefi-x86-64/BOOTX64.EFI' ::/EFI/BOOT ) || true ) && \ ( ( [ -f '$(call SHESCAPE,$(BUILDDIR))/common-uefi-ia32/BOOTIA32.EFI' ] && \ - mcopy -D o -i '$(call SHESCAPE,$(BINDIR))/limine-cd-efi.bin' '$(call SHESCAPE,$(BUILDDIR))/common-uefi-ia32/BOOTIA32.EFI' ::/EFI/BOOT ) || true ) \ - ) || rm -f '$(call SHESCAPE,$(BINDIR))/limine-cd-efi.bin' + mcopy -D o -i '$(call SHESCAPE,$(BINDIR))/limine-uefi-cd.bin' '$(call SHESCAPE,$(BUILDDIR))/common-uefi-ia32/BOOTIA32.EFI' ::/EFI/BOOT ) || true ) \ + ) || rm -f '$(call SHESCAPE,$(BINDIR))/limine-uefi-cd.bin' endif -.PHONY: limine-cd-efi -limine-cd-efi: - $(MAKE) '$(call SHESCAPE,$(BINDIR))/limine-cd-efi.bin' +.PHONY: limine-uefi-cd +limine-uefi-cd: + $(MAKE) '$(call SHESCAPE,$(BINDIR))/limine-uefi-cd.bin' $(call MKESCAPE,$(BINDIR))/BOOTX64.EFI: $(call MKESCAPE,$(BUILDDIR))/common-uefi-x86-64/BOOTX64.EFI $(MKDIR_P) '$(call SHESCAPE,$(BINDIR))' diff --git a/README.md b/README.md index 54f8e904..d26413e7 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ Host utility binaries are provided for Windows. In order to build Limine, the following programs have to be installed: common UNIX tools (also known as `coreutils`), `GNU make`, `grep`, `sed`, `find`, `awk`, `gzip`, `nasm`, `mtools` -(optional, necessary to build `limine-cd-efi.bin`). +(optional, necessary to build `limine-uefi-cd.bin`). Furthermore, `gcc` or `llvm/clang` must also be installed, alongside the respective binutils. @@ -183,10 +183,10 @@ partitions, formatted with a supported file system. ### BIOS/UEFI hybrid ISO creation In order to create a hybrid ISO with Limine, place the -`limine-cd-efi.bin`, `limine-cd.bin`, `limine.sys`, and `limine.cfg` files +`limine-uefi-cd.bin`, `limine-cd.bin`, `limine.sys`, and `limine.cfg` files into a directory which will serve as the root of the created ISO. (`limine.sys` and `limine.cfg` must either be in the root, `limine`, `boot`, or -`boot/limine` directory; `limine-cd-efi.bin` and `limine-cd.bin` can reside +`boot/limine` directory; `limine-uefi-cd.bin` and `limine-cd.bin` can reside anywhere). After that, create a `/EFI/BOOT` directory and copy the @@ -197,7 +197,7 @@ run: ``` xorriso -as mkisofs -b \ -no-emul-boot -boot-load-size 4 -boot-info-table \ - --efi-boot \ + --efi-boot \ -efi-boot-part --efi-boot-image --protective-msdos-label \ -o image.iso ``` @@ -214,11 +214,11 @@ limine bios-install image.iso For example, if it was copied in `/boot/limine-cd.bin`, it would be `boot/limine-cd.bin`. -`` is the relative path of -`limine-cd-efi.bin` inside the root directory. +`` is the relative path of +`limine-uefi-cd.bin` inside the root directory. For example, if it was copied in -`/boot/limine-cd-efi.bin`, it would be -`boot/limine-cd-efi.bin`. +`/boot/limine-uefi-cd.bin`, it would be +`boot/limine-uefi-cd.bin`. ### BIOS/PXE boot The `limine-bios-pxe.bin` binary is a valid PXE boot image. diff --git a/configure.ac b/configure.ac index a6e0eced..7a9e0290 100644 --- a/configure.ac +++ b/configure.ac @@ -240,24 +240,24 @@ fi AC_SUBST([BUILD_UEFI_RISCV64]) -BUILD_CD_EFI="$BUILD_ALL" +BUILD_UEFI_CD="$BUILD_ALL" AC_ARG_ENABLE([uefi-cd], - [AS_HELP_STRING([--enable-uefi-cd], [enable building limine-cd-efi.bin])], - [BUILD_CD_EFI="$enableval"]) + [AS_HELP_STRING([--enable-uefi-cd], [enable building limine-uefi-cd.bin])], + [BUILD_UEFI_CD="$enableval"]) -if ! test "x$BUILD_CD_EFI" = "xno"; then +if ! test "x$BUILD_UEFI_CD" = "xno"; then AC_CHECK_PROG([MTOOLS_FOUND], [mcopy], [yes]) if ! test "x$MTOOLS_FOUND" = "xyes"; then - if test "x$BUILD_CD_EFI" = "xyes"; then - AC_MSG_ERROR([mtools not found, install mtools to build limine-cd-efi.bin]) + if test "x$BUILD_UEFI_CD" = "xyes"; then + AC_MSG_ERROR([mtools not found, install mtools to build limine-uefi-cd.bin]) fi - AC_MSG_WARN([mtools not found, install mtools to build limine-cd-efi.bin]) - BUILD_CD_EFI="no" + AC_MSG_WARN([mtools not found, install mtools to build limine-uefi-cd.bin]) + BUILD_UEFI_CD="no" fi fi -AC_SUBST([BUILD_CD_EFI]) +AC_SUBST([BUILD_UEFI_CD]) if test "x$NEED_NASM" = "xyes"; then AC_CHECK_PROG([NASM_FOUND], [nasm], [yes]) diff --git a/host/Makefile b/host/Makefile index 0c7fb43d..5bea29aa 100644 --- a/host/Makefile +++ b/host/Makefile @@ -15,7 +15,7 @@ install: all $(INSTALL) -d '$(DESTDIR)$(PREFIX)/share/limine' $(INSTALL) -m 644 limine.sys '$(DESTDIR)$(PREFIX)/share/limine/' $(INSTALL) -m 644 limine-cd.bin '$(DESTDIR)$(PREFIX)/share/limine/' - $(INSTALL) -m 644 limine-cd-efi.bin '$(DESTDIR)$(PREFIX)/share/limine/' + $(INSTALL) -m 644 limine-uefi-cd.bin '$(DESTDIR)$(PREFIX)/share/limine/' $(INSTALL) -m 644 limine-bios-pxe.bin '$(DESTDIR)$(PREFIX)/share/limine/' $(INSTALL) -m 644 BOOTX64.EFI '$(DESTDIR)$(PREFIX)/share/limine/' $(INSTALL) -m 644 BOOTIA32.EFI '$(DESTDIR)$(PREFIX)/share/limine/' diff --git a/test.mk b/test.mk index e13fda41..29fc586e 100644 --- a/test.mk +++ b/test.mk @@ -172,7 +172,7 @@ full-hybrid-test: $(MKDIR_P) test_image/boot sudo cp -rv $(BINDIR)/* test_image/boot/ sudo cp -rv test/* test_image/boot/ - xorriso -as mkisofs -b boot/limine-cd.bin -no-emul-boot -boot-load-size 4 -boot-info-table --efi-boot boot/limine-cd-efi.bin -efi-boot-part --efi-boot-image --protective-msdos-label test_image/ -o test.iso + xorriso -as mkisofs -b boot/limine-cd.bin -no-emul-boot -boot-load-size 4 -boot-info-table --efi-boot boot/limine-uefi-cd.bin -efi-boot-part --efi-boot-image --protective-msdos-label test_image/ -o test.iso $(BINDIR)/limine bios-install test.iso qemu-system-x86_64 -m 512M -M q35 -bios ovmf-x64/OVMF.fd -net none -smp 4 -cdrom test.iso -debugcon stdio qemu-system-x86_64 -m 512M -M q35 -bios ovmf-x64/OVMF.fd -net none -smp 4 -hda test.iso -debugcon stdio