From 65b5a7f66faa369e6e908bef00d1f473b4e378f5 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Mon, 21 Mar 2022 00:56:02 +0100 Subject: [PATCH] misc: limine-install -> limine-s2deploy --- .github/workflows/release.yml | 40 +++++++------- GNUmakefile.in | 52 +++++++++---------- README.md | 22 ++++---- configure.ac | 10 ++-- limine-install/.gitignore | 2 - limine-s2deploy/.gitignore | 2 + {limine-install => limine-s2deploy}/Makefile | 12 ++--- {limine-install => limine-s2deploy}/hgen.sh | 0 .../limine-s2deploy.c | 0 9 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 limine-install/.gitignore create mode 100644 limine-s2deploy/.gitignore rename {limine-install => limine-s2deploy}/Makefile (75%) rename {limine-install => limine-s2deploy}/hgen.sh (100%) rename limine-install/limine-install.c => limine-s2deploy/limine-s2deploy.c (100%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b8d43ff5..47480d87 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,35 +40,35 @@ jobs: - name: Build the bootloader run: make -C build - - name: Clean limine-install - run: rm build/bin/limine-install + - name: Clean limine-s2deploy + run: rm build/bin/limine-s2deploy - - name: Build limine-install-linux-x86_64 - run: make -C build CFLAGS="-O2 -pipe -static" limine-install + - name: Build limine-s2deploy-linux-x86_64 + run: make -C build CFLAGS="-O2 -pipe -static" limine-s2deploy - - name: Strip limine-install-linux-x86_64 - run: strip build/bin/limine-install + - name: Strip limine-s2deploy-linux-x86_64 + run: strip build/bin/limine-s2deploy - - name: Rename limine-install-linux-x86_64 - run: mv build/bin/limine-install build/bin/limine-install-linux-x86_64 + - name: Rename limine-s2deploy-linux-x86_64 + run: mv build/bin/limine-s2deploy build/bin/limine-s2deploy-linux-x86_64 - - name: Build limine-install-linux-x86_32 - run: make -C build CC="gcc -m32" CFLAGS="-O2 -pipe -static" limine-install + - name: Build limine-s2deploy-linux-x86_32 + run: make -C build CC="gcc -m32" CFLAGS="-O2 -pipe -static" limine-s2deploy - - name: Strip limine-install-linux-x86_32 - run: strip build/bin/limine-install + - name: Strip limine-s2deploy-linux-x86_32 + run: strip build/bin/limine-s2deploy - - name: Rename limine-install-linux-x86_32 - run: mv build/bin/limine-install build/bin/limine-install-linux-x86_32 + - name: Rename limine-s2deploy-linux-x86_32 + run: mv build/bin/limine-s2deploy build/bin/limine-s2deploy-linux-x86_32 - - name: Build limine-install-win32 - run: make -C build CC="i686-w64-mingw32-gcc" CFLAGS="-O2 -pipe" limine-install + - name: Build limine-s2deploy-win32 + run: make -C build CC="i686-w64-mingw32-gcc" CFLAGS="-O2 -pipe" limine-s2deploy - - name: Strip limine-install-win32 - run: i686-w64-mingw32-strip build/bin/limine-install.exe + - name: Strip limine-s2deploy-win32 + run: i686-w64-mingw32-strip build/bin/limine-s2deploy.exe - - name: Rename limine-install-win32 - run: mv build/bin/limine-install.exe build/bin/limine-install-win32.exe + - name: Rename limine-s2deploy-win32 + run: mv build/bin/limine-s2deploy.exe build/bin/limine-s2deploy-win32.exe - name: Copy LICENSE to bin run: cp LICENSE.md build/bin/ diff --git a/GNUmakefile.in b/GNUmakefile.in index a16f0fe1..bd4c2e10 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -19,7 +19,7 @@ export PATH override BUILD_ELTORITO_EFI := @BUILD_ELTORITO_EFI@ override BUILD_PXE := @BUILD_PXE@ override BUILD_CD := @BUILD_CD@ -override BUILD_LIMINE_INSTALL := @BUILD_LIMINE_INSTALL@ +override BUILD_LIMINE_S2DEPLOY := @BUILD_LIMINE_S2DEPLOY@ WERROR ?= @WERROR@ export WERROR @@ -82,12 +82,12 @@ all: @BUILD_UEFI@ @BUILD_BIOS@ limine-hdd.h: $(call MKESCAPE,$(BINDIR))/limine-hdd.h $(call MKESCAPE,$(BINDIR))/limine-hdd.h: $(call MKESCAPE,$(BINDIR))/limine-hdd.bin - cd '$(call SHESCAPE,$(BINDIR))' && '$(call SHESCAPE,$(SRCDIR))/limine-install/hgen.sh' >limine-hdd.h + cd '$(call SHESCAPE,$(BINDIR))' && '$(call SHESCAPE,$(SRCDIR))/limine-s2deploy/hgen.sh' >limine-hdd.h -.PHONY: limine-install -limine-install: +.PHONY: limine-s2deploy +limine-s2deploy: mkdir -p '$(call SHESCAPE,$(BINDIR))' - cp '$(call SHESCAPE,$(SRCDIR))/limine-install/Makefile' '$(call SHESCAPE,$(SRCDIR))/limine-install/limine-install.c' '$(call SHESCAPE,$(SRCDIR))/limine-install/.gitignore' '$(call SHESCAPE,$(BINDIR))/' + cp '$(call SHESCAPE,$(SRCDIR))/limine-s2deploy/Makefile' '$(call SHESCAPE,$(SRCDIR))/limine-s2deploy/limine-s2deploy.c' '$(call SHESCAPE,$(SRCDIR))/limine-s2deploy/.gitignore' '$(call SHESCAPE,$(BINDIR))/' $(MAKE) limine-hdd.h $(MAKE) -C '$(call SHESCAPE,$(BINDIR))' @@ -109,16 +109,16 @@ install-data: .PHONY: install-strip install-strip: install-data $(INSTALL) -d '$(DESTDIR)$(PREFIX)/bin' - $(INSTALL) -s '$(call SHESCAPE,$(BINDIR))/limine-install' '$(DESTDIR)$(PREFIX)/bin/' || true + $(INSTALL) -s '$(call SHESCAPE,$(BINDIR))/limine-s2deploy' '$(DESTDIR)$(PREFIX)/bin/' || true .PHONY: install install: install-data $(INSTALL) -d '$(DESTDIR)$(PREFIX)/bin' - $(INSTALL) '$(call SHESCAPE,$(BINDIR))/limine-install' '$(DESTDIR)$(PREFIX)/bin/' || true + $(INSTALL) '$(call SHESCAPE,$(BINDIR))/limine-s2deploy' '$(DESTDIR)$(PREFIX)/bin/' || true .PHONY: uninstall uninstall: - rm -f '$(DESTDIR)$(PREFIX)/bin/limine-install' + rm -f '$(DESTDIR)$(PREFIX)/bin/limine-s2deploy' rm -f '$(DESTDIR)$(PREFIX)/share/limine' $(call MKESCAPE,$(BUILDDIR))/stage1.stamp: $(STAGE1_FILES) $(call MKESCAPE,$(BUILDDIR))/decompressor-build/decompressor.bin $(call MKESCAPE,$(BUILDDIR))/common-bios/stage2.bin.gz @@ -136,8 +136,8 @@ endif .PHONY: limine-bios limine-bios: common-bios decompressor $(MAKE) '$(call SHESCAPE,$(BUILDDIR))/stage1.stamp' -ifneq ($(BUILD_LIMINE_INSTALL), no) - $(MAKE) limine-install +ifneq ($(BUILD_LIMINE_S2DEPLOY), no) + $(MAKE) limine-s2deploy endif .PHONY: limine-eltorito-efi @@ -268,7 +268,7 @@ echfs-test: $(MAKE) test-clean $(MAKE) test.hdd $(MAKE) limine-bios - $(MAKE) limine-install + $(MAKE) limine-s2deploy $(MAKE) -C test echfs-utils -g -p0 test.hdd quick-format 512 > part_guid sed "s/@GUID@/`cat part_guid`/g" < test/limine.cfg > limine.cfg.tmp @@ -277,14 +277,14 @@ echfs-test: echfs-utils -g -p0 test.hdd import test/test.elf boot/test.elf echfs-utils -g -p0 test.hdd import test/bg.bmp boot/bg.bmp echfs-utils -g -p0 test.hdd import $(BINDIR)/limine.sys boot/limine.sys - $(BINDIR)/limine-install test.hdd + $(BINDIR)/limine-s2deploy test.hdd qemu-system-x86_64 -net none -smp 4 -hda test.hdd -debugcon stdio .PHONY: fwcfg-common fwcfg-test fwcfg-simple-test fwcfg-common: $(MAKE) test-clean $(MAKE) limine-bios - $(MAKE) limine-install + $(MAKE) limine-s2deploy $(MAKE) -C test rm -rf test_image/ mkdir -p test_image/boot @@ -309,7 +309,7 @@ ext2-test: $(MAKE) test-clean $(MAKE) test.hdd $(MAKE) limine-bios - $(MAKE) limine-install + $(MAKE) limine-s2deploy $(MAKE) -C test rm -rf test_image/ mkdir test_image @@ -324,7 +324,7 @@ ext2-test: sudo umount test_image/ sudo losetup -d `cat loopback_dev` rm -rf test_image loopback_dev - $(BINDIR)/limine-install test.hdd + $(BINDIR)/limine-s2deploy test.hdd qemu-system-x86_64 -net none -smp 4 -hda test.hdd -debugcon stdio .PHONY: fat12-test @@ -332,7 +332,7 @@ fat12-test: $(MAKE) test-clean $(MAKE) test.hdd $(MAKE) limine-bios - $(MAKE) limine-install + $(MAKE) limine-s2deploy $(MAKE) -C test rm -rf test_image/ mkdir test_image @@ -347,7 +347,7 @@ fat12-test: sudo umount test_image/ sudo losetup -d `cat loopback_dev` rm -rf test_image loopback_dev - $(BINDIR)/limine-install test.hdd + $(BINDIR)/limine-s2deploy test.hdd qemu-system-x86_64 -net none -smp 4 -hda test.hdd -debugcon stdio .PHONY: fat16-test @@ -355,7 +355,7 @@ fat16-test: $(MAKE) test-clean $(MAKE) test.hdd $(MAKE) limine-bios - $(MAKE) limine-install + $(MAKE) limine-s2deploy $(MAKE) -C test rm -rf test_image/ mkdir test_image @@ -370,7 +370,7 @@ fat16-test: sudo umount test_image/ sudo losetup -d `cat loopback_dev` rm -rf test_image loopback_dev - $(BINDIR)/limine-install test.hdd + $(BINDIR)/limine-s2deploy test.hdd qemu-system-x86_64 -net none -smp 4 -hda test.hdd -debugcon stdio .PHONY: legacy-fat16-test @@ -379,7 +379,7 @@ legacy-fat16-test: $(MAKE) mbrtest.hdd fdisk -l mbrtest.hdd $(MAKE) limine-bios - $(MAKE) limine-install + $(MAKE) limine-s2deploy $(MAKE) -C test rm -rf test_image/ mkdir test_image @@ -394,7 +394,7 @@ legacy-fat16-test: sudo umount test_image/ sudo losetup -d `cat loopback_dev` rm -rf test_image loopback_dev - $(BINDIR)/limine-install mbrtest.hdd + $(BINDIR)/limine-s2deploy mbrtest.hdd qemu-system-i386 -cpu pentium2 -m 16M -M isapc -net none -hda mbrtest.hdd -debugcon stdio .PHONY: fat32-test @@ -402,7 +402,7 @@ fat32-test: $(MAKE) test-clean $(MAKE) test.hdd $(MAKE) limine-bios - $(MAKE) limine-install + $(MAKE) limine-s2deploy $(MAKE) -C test rm -rf test_image/ mkdir test_image @@ -417,7 +417,7 @@ fat32-test: sudo umount test_image/ sudo losetup -d `cat loopback_dev` rm -rf test_image loopback_dev - $(BINDIR)/limine-install test.hdd + $(BINDIR)/limine-s2deploy test.hdd qemu-system-x86_64 -net none -smp 4 -hda test.hdd -debugcon stdio .PHONY: iso9660-test @@ -438,7 +438,7 @@ ntfs-test: $(MAKE) test-clean $(MAKE) test.hdd $(MAKE) limine-bios - $(MAKE) limine-install + $(MAKE) limine-s2deploy $(MAKE) -C test rm -rf test_image/ mkdir test_image @@ -453,7 +453,7 @@ ntfs-test: sudo umount test_image/ sudo losetup -d `cat loopback_dev` rm -rf test_image loopback_dev - $(BINDIR)/limine-install test.hdd + $(BINDIR)/limine-s2deploy test.hdd qemu-system-x86_64 -net none -smp 4 -hda test.hdd -debugcon stdio .PHONY: full-hybrid-test @@ -468,7 +468,7 @@ full-hybrid-test: 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-eltorito-efi.bin -efi-boot-part --efi-boot-image --protective-msdos-label test_image/ -o test.iso - $(BINDIR)/limine-install test.iso + $(BINDIR)/limine-s2deploy 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 qemu-system-x86_64 -m 512M -M q35 -bios ovmf-ia32/OVMF.fd -net none -smp 4 -cdrom test.iso -debugcon stdio diff --git a/README.md b/README.md index 82a18ba1..8cad574b 100644 --- a/README.md +++ b/README.md @@ -61,9 +61,9 @@ fetching the `latest-binary` branch: git clone https://github.com/limine-bootloader/limine.git --branch=latest-binary --depth=1 ``` -`limine-install` binaries are provided for Linux and Windows. +`limine-s2deploy` binaries are provided for Linux and Windows. -In case one wants to rebuild `limine-install`, simply run `make` in the binary +In case one wants to rebuild `limine-s2deploy`, simply run `make` in the binary release directory. ## Building the bootloader @@ -146,10 +146,10 @@ with a supported file system (the ESP partition is recommended). ### BIOS/MBR In order to install Limine on a MBR device (which can just be a raw image file), -run `limine-install` as such: +run `limine-s2deploy` as such: ```bash -limine-install +limine-s2deploy ``` The boot device must to contain the `limine.sys` and `limine.cfg` files in @@ -160,18 +160,18 @@ with a supported file system. If using a GPT formatted device, there are 2 options one can follow for installation: * Specifying a dedicated stage 2 partition. -* Letting `limine-install` attempt to embed stage 2 within GPT structures. +* Letting `limine-s2deploy` attempt to embed stage 2 within GPT structures. In case one wants to specify a stage 2 partition, create a partition on the GPT device of at least 32KiB in size, and pass the 1-based number of the partition -to `limine-install` as a second argument; such as: +to `limine-s2deploy` as a second argument; such as: ```bash -limine-install <1-based stage 2 partition number> +limine-s2deploy <1-based stage 2 partition number> ``` -In case one wants to let `limine-install` embed stage 2 within GPT's structures, -simply omit the partition number, and invoke `limine-install` the same as one +In case one wants to let `limine-s2deploy` embed stage 2 within GPT's structures, +simply omit the partition number, and invoke `limine-s2deploy` the same as one would do for an MBR partitioned device. The boot device must to contain the `limine.sys` and `limine.cfg` files in @@ -198,9 +198,9 @@ xorriso -as mkisofs -b \ *Note: `xorriso` is required.* -And do not forget to also run `limine-install` on the generated image: +And do not forget to also run `limine-s2deploy` on the generated image: ``` -limine-install image.iso +limine-s2deploy image.iso ``` `` is the relative path of diff --git a/configure.ac b/configure.ac index 9e44c983..3f861743 100644 --- a/configure.ac +++ b/configure.ac @@ -60,13 +60,13 @@ fi AC_SUBST(BUILD_BIOS, [$BUILD_BIOS]) -BUILD_LIMINE_INSTALL="default" +BUILD_LIMINE_S2DEPLOY="default" -AC_ARG_ENABLE([limine-install], - AS_HELP_STRING([--disable-limine-install], [disable building limine-install]), - BUILD_LIMINE_INSTALL="$enableval") +AC_ARG_ENABLE([limine-s2deploy], + AS_HELP_STRING([--disable-limine-s2deploy], [disable building limine-s2deploy]), + BUILD_LIMINE_S2DEPLOY="$enableval") -AC_SUBST(BUILD_LIMINE_INSTALL, [$BUILD_LIMINE_INSTALL]) +AC_SUBST(BUILD_LIMINE_S2DEPLOY, [$BUILD_LIMINE_S2DEPLOY]) BUILD_CD="default" diff --git a/limine-install/.gitignore b/limine-install/.gitignore deleted file mode 100644 index 4dc80084..00000000 --- a/limine-install/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -limine-install -limine-install.exe diff --git a/limine-s2deploy/.gitignore b/limine-s2deploy/.gitignore new file mode 100644 index 00000000..7f208494 --- /dev/null +++ b/limine-s2deploy/.gitignore @@ -0,0 +1,2 @@ +limine-s2deploy +limine-s2deploy.exe diff --git a/limine-install/Makefile b/limine-s2deploy/Makefile similarity index 75% rename from limine-install/Makefile rename to limine-s2deploy/Makefile index 442e9cc1..4b0d4493 100644 --- a/limine-install/Makefile +++ b/limine-s2deploy/Makefile @@ -6,7 +6,7 @@ PREFIX ?= /usr/local CFLAGS ?= -g -O2 -pipe -Wall -Wextra .PHONY: all -all: limine-install +all: limine-s2deploy .PHONY: install-data install-data: all @@ -22,16 +22,16 @@ install-data: all .PHONY: install install: install-data $(INSTALL) -d '$(DESTDIR)$(PREFIX)/bin' - $(INSTALL) limine-install '$(DESTDIR)$(PREFIX)/bin/' + $(INSTALL) limine-s2deploy '$(DESTDIR)$(PREFIX)/bin/' .PHONY: install-strip install-strip: install-data $(INSTALL) -d '$(DESTDIR)$(PREFIX)/bin' - $(INSTALL) -s limine-install '$(DESTDIR)$(PREFIX)/bin/' + $(INSTALL) -s limine-s2deploy '$(DESTDIR)$(PREFIX)/bin/' .PHONY: clean clean: - rm -f limine-install limine-install.exe + rm -f limine-s2deploy limine-s2deploy.exe -limine-install: limine-install.c - $(CC) $(CFLAGS) $(LDFLAGS) -std=c99 limine-install.c -o $@ +limine-s2deploy: limine-s2deploy.c + $(CC) $(CFLAGS) $(LDFLAGS) -std=c99 limine-s2deploy.c -o $@ diff --git a/limine-install/hgen.sh b/limine-s2deploy/hgen.sh similarity index 100% rename from limine-install/hgen.sh rename to limine-s2deploy/hgen.sh diff --git a/limine-install/limine-install.c b/limine-s2deploy/limine-s2deploy.c similarity index 100% rename from limine-install/limine-install.c rename to limine-s2deploy/limine-s2deploy.c