:: commit c05250956798ce169b89c743e1eae5a404edca8b
misc: limine-s2deploy -> limine-deploy
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b84de7f1..56ab3f09 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -40,14 +40,14 @@ jobs:
- name: Build the bootloader
run: make -C build
- - name: Clean limine-s2deploy
- run: rm build/bin/limine-s2deploy
+ - name: Clean limine-deploy
+ run: rm build/bin/limine-deploy
- - name: Build limine-s2deploy-win32
- run: make -C build CC="i686-w64-mingw32-gcc" CFLAGS="-O2 -pipe" limine-s2deploy
+ - name: Build limine-deploy-win32
+ run: make -C build CC="i686-w64-mingw32-gcc" CFLAGS="-O2 -pipe" limine-deploy
- - name: Strip limine-s2deploy-win32
- run: i686-w64-mingw32-strip build/bin/limine-s2deploy.exe
+ - name: Strip limine-deploy-win32
+ run: i686-w64-mingw32-strip build/bin/limine-deploy.exe
- name: Copy LICENSE to bin
run: cp LICENSE.md build/bin/
diff --git a/GNUmakefile.in b/GNUmakefile.in
index f8997c0b..5b9864e5 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -19,7 +19,7 @@ export PATH
override BUILD_CD_EFI := @BUILD_CD_EFI@
override BUILD_PXE := @BUILD_PXE@
override BUILD_CD := @BUILD_CD@
-override BUILD_LIMINE_S2DEPLOY := @BUILD_LIMINE_S2DEPLOY@
+override BUILD_LIMINE_DEPLOY := @BUILD_LIMINE_DEPLOY@
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-s2deploy/hgen.sh' >limine-hdd.h
+ cd '$(call SHESCAPE,$(BINDIR))' && '$(call SHESCAPE,$(SRCDIR))/limine-deploy/hgen.sh' >limine-hdd.h
-.PHONY: limine-s2deploy
-limine-s2deploy:
+.PHONY: limine-deploy
+limine-deploy:
mkdir -p '$(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))/'
+ cp '$(call SHESCAPE,$(SRCDIR))/limine-deploy/Makefile' '$(call SHESCAPE,$(SRCDIR))/limine-deploy/limine-deploy.c' '$(call SHESCAPE,$(SRCDIR))/limine-deploy/.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-s2deploy' '$(DESTDIR)$(PREFIX)/bin/' || true
+ $(INSTALL) -s '$(call SHESCAPE,$(BINDIR))/limine-deploy' '$(DESTDIR)$(PREFIX)/bin/' || true
.PHONY: install
install: install-data
$(INSTALL) -d '$(DESTDIR)$(PREFIX)/bin'
- $(INSTALL) '$(call SHESCAPE,$(BINDIR))/limine-s2deploy' '$(DESTDIR)$(PREFIX)/bin/' || true
+ $(INSTALL) '$(call SHESCAPE,$(BINDIR))/limine-deploy' '$(DESTDIR)$(PREFIX)/bin/' || true
.PHONY: uninstall
uninstall:
- rm -f '$(DESTDIR)$(PREFIX)/bin/limine-s2deploy'
+ rm -f '$(DESTDIR)$(PREFIX)/bin/limine-deploy'
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_S2DEPLOY), no)
- $(MAKE) limine-s2deploy
+ifneq ($(BUILD_LIMINE_DEPLOY), no)
+ $(MAKE) limine-deploy
endif
.PHONY: limine-cd-efi
@@ -268,7 +268,7 @@ echfs-test:
$(MAKE) test-clean
$(MAKE) test.hdd
$(MAKE) limine-bios
- $(MAKE) limine-s2deploy
+ $(MAKE) limine-deploy
$(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-s2deploy test.hdd
+ $(BINDIR)/limine-deploy 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-s2deploy
+ $(MAKE) limine-deploy
$(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-s2deploy
+ $(MAKE) limine-deploy
$(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-s2deploy test.hdd
+ $(BINDIR)/limine-deploy 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-s2deploy
+ $(MAKE) limine-deploy
$(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-s2deploy test.hdd
+ $(BINDIR)/limine-deploy 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-s2deploy
+ $(MAKE) limine-deploy
$(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-s2deploy test.hdd
+ $(BINDIR)/limine-deploy 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-s2deploy
+ $(MAKE) limine-deploy
$(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-s2deploy mbrtest.hdd
+ $(BINDIR)/limine-deploy 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-s2deploy
+ $(MAKE) limine-deploy
$(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-s2deploy test.hdd
+ $(BINDIR)/limine-deploy 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-s2deploy
+ $(MAKE) limine-deploy
$(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-s2deploy test.hdd
+ $(BINDIR)/limine-deploy 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-cd-efi.bin -efi-boot-part --efi-boot-image --protective-msdos-label test_image/ -o test.iso
- $(BINDIR)/limine-s2deploy test.iso
+ $(BINDIR)/limine-deploy 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 da7c33de..81bf168e 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-s2deploy` binaries are provided for Windows.
+`limine-deploy` binaries are provided for Windows.
-In order to rebuild `limine-s2deploy`, simply run `make` in the binary
+In order to rebuild `limine-deploy`, 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-s2deploy` as such:
+run `limine-deploy` as such:
```bash
-limine-s2deploy <path to device/image>
+limine-deploy <path to device/image>
```
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-s2deploy` attempt to embed stage 2 within GPT structures.
+* Letting `limine-deploy` 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-s2deploy` as a second argument; such as:
+to `limine-deploy` as a second argument; such as:
```bash
-limine-s2deploy <path to device/image> <1-based stage 2 partition number>
+limine-deploy <path to device/image> <1-based stage 2 partition number>
```
-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
+In case one wants to let `limine-deploy` embed stage 2 within GPT's structures,
+simply omit the partition number, and invoke `limine-deploy` 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 <relative path of limine-cd.bin> \
*Note: `xorriso` is required.*
-And do not forget to also run `limine-s2deploy` on the generated image:
+And do not forget to also run `limine-deploy` on the generated image:
```
-limine-s2deploy image.iso
+limine-deploy image.iso
```
`<relative path of limine-cd.bin>` is the relative path of
diff --git a/configure.ac b/configure.ac
index 9a196950..a44eb04a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,13 +60,13 @@ fi
AC_SUBST(BUILD_BIOS, [$BUILD_BIOS])
-BUILD_LIMINE_S2DEPLOY="default"
+BUILD_LIMINE_DEPLOY="default"
-AC_ARG_ENABLE([limine-s2deploy],
- AS_HELP_STRING([--disable-limine-s2deploy], [disable building limine-s2deploy]),
- BUILD_LIMINE_S2DEPLOY="$enableval")
+AC_ARG_ENABLE([limine-deploy],
+ AS_HELP_STRING([--disable-limine-deploy], [disable building limine-deploy]),
+ BUILD_LIMINE_DEPLOY="$enableval")
-AC_SUBST(BUILD_LIMINE_S2DEPLOY, [$BUILD_LIMINE_S2DEPLOY])
+AC_SUBST(BUILD_LIMINE_DEPLOY, [$BUILD_LIMINE_DEPLOY])
BUILD_CD="default"
diff --git a/limine-deploy/.gitignore b/limine-deploy/.gitignore
new file mode 100644
index 00000000..792db7b3
--- /dev/null
+++ b/limine-deploy/.gitignore
@@ -0,0 +1,2 @@
+limine-deploy
+limine-deploy.exe
diff --git a/limine-s2deploy/Makefile b/limine-deploy/Makefile
similarity index 75%
rename from limine-s2deploy/Makefile
rename to limine-deploy/Makefile
index d9bf6f20..90b5e0ed 100644
--- a/limine-s2deploy/Makefile
+++ b/limine-deploy/Makefile
@@ -6,7 +6,7 @@ PREFIX ?= /usr/local
CFLAGS ?= -g -O2 -pipe -Wall -Wextra
.PHONY: all
-all: limine-s2deploy
+all: limine-deploy
.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-s2deploy '$(DESTDIR)$(PREFIX)/bin/'
+ $(INSTALL) limine-deploy '$(DESTDIR)$(PREFIX)/bin/'
.PHONY: install-strip
install-strip: install-data
$(INSTALL) -d '$(DESTDIR)$(PREFIX)/bin'
- $(INSTALL) -s limine-s2deploy '$(DESTDIR)$(PREFIX)/bin/'
+ $(INSTALL) -s limine-deploy '$(DESTDIR)$(PREFIX)/bin/'
.PHONY: clean
clean:
- rm -f limine-s2deploy limine-s2deploy.exe
+ rm -f limine-deploy limine-deploy.exe
-limine-s2deploy: limine-s2deploy.c
- $(CC) $(CFLAGS) $(LDFLAGS) -std=c99 limine-s2deploy.c -o $@
+limine-deploy: limine-deploy.c
+ $(CC) $(CFLAGS) $(LDFLAGS) -std=c99 limine-deploy.c -o $@
diff --git a/limine-s2deploy/hgen.sh b/limine-deploy/hgen.sh
similarity index 100%
rename from limine-s2deploy/hgen.sh
rename to limine-deploy/hgen.sh
diff --git a/limine-s2deploy/limine-s2deploy.c b/limine-deploy/limine-deploy.c
similarity index 99%
rename from limine-s2deploy/limine-s2deploy.c
rename to limine-deploy/limine-deploy.c
index 01ce2d2a..22dbace6 100644
--- a/limine-s2deploy/limine-s2deploy.c
+++ b/limine-deploy/limine-deploy.c
@@ -678,7 +678,7 @@ int main(int argc, char *argv[]) {
" the root or /boot directories of one of the partitions\n"
" on the device, or boot will fail!\n");
- fprintf(stderr, "Limine Stage 2 deployed successfully!\n");
+ fprintf(stderr, "Limine deployed successfully!\n");
ok = 0;
diff --git a/limine-s2deploy/.gitignore b/limine-s2deploy/.gitignore
deleted file mode 100644
index 7f208494..00000000
--- a/limine-s2deploy/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-limine-s2deploy
-limine-s2deploy.exe
