From 5315a152cc4087cb6269a60eb413cc91d21b95b4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Paul=20H=C3=A4nsch?= <paul@plutz.net>
Date: Tue, 26 Jun 2018 23:09:08 +0200
Subject: [PATCH] EFI / BIOS dual configuration

---
 Makefile     | 21 +++++++++++++--------
 bootmenu.cfg | 16 ++++++++++++++++
 syslia32.cfg |  3 +++
 syslinux.cfg | 19 +++----------------
 syslx64.cfg  |  3 +++
 5 files changed, 38 insertions(+), 24 deletions(-)
 create mode 100644 bootmenu.cfg
 create mode 100644 syslia32.cfg
 create mode 100644 syslx64.cfg

diff --git a/Makefile b/Makefile
index 1e5afbb..493495c 100644
--- a/Makefile
+++ b/Makefile
@@ -49,26 +49,31 @@ stretch_%.squashfs: stretch_%_config/
 	mksquashfs "$<" "$@" -comp xz
 
 vmlinuz: stretch_*_root/
-	ln -s '$<$@' ./
+	ln -fs '$<$@' ./
 
 initrd.img: stretch_*_root/
-	ln -s '$<$@' ./
+	ln -fs '$<$@' ./
 
 /dev/sd%: partitions .FORCE
 	sfdisk ${@} <partitions
 	dd of=${@} if=/usr/lib/syslinux/mbr/gptmbr.bin
 
-/dev/sd%1: /dev/sd% vmlinuz initrd.img syslinux.cfg .FORCE
+/dev/sd%1: /dev/sd% vmlinuz initrd.img syslinux.cfg syslia32.cfg syslx64.cfg bootmenu.cfg .FORCE
 	mkdir -p mount
 	mkfs.vfat -n SQUASHBOOT ${@}
 	syslinux -i ${@}
 	mount -t vfat ${@} mount
-	mkdir -p mount/EFI/BOOT
+	mkdir -p $(addprefix mount/, EFI/BOOT efi32 efi64 bios)
 	cp /usr/lib/SYSLINUX.EFI/efi32/syslinux.efi mount/EFI/BOOT/BOOTIA32.EFI
-	cp $(addprefix /usr/lib/syslinux/modules/efi32/, ldlinux.e32 menu.c32 libutil.c32) mount/EFI/BOOT/
-	cp -L vmlinuz initrd.img syslinux.cfg mount/EFI/BOOT/
-	cp $(addprefix /usr/lib/syslinux/modules/bios/, menu.c32 libutil.c32) mount/
-	cp -L vmlinuz initrd.img *.squashfs syslinux.cfg Makefile partitions mount/
+	cp /usr/lib/SYSLINUX.EFI/efi64/syslinux.efi mount/EFI/BOOT/BOOTX64.EFI
+	cp $(addprefix /usr/lib/syslinux/modules/efi32/, ldlinux.e32 menu.c32 libutil.c32) mount/efi32/
+	cp $(addprefix /usr/lib/syslinux/modules/efi64/, ldlinux.e64 menu.c32 libutil.c32) mount/efi64/
+	cp $(addprefix /usr/lib/syslinux/modules/bios/, menu.c32 libutil.c32) mount/bios/
+	cp -L vmlinuz initrd.img *.squashfs Makefile partitions mount/
+	cp syslia32.cfg syslx64.cfg syslinux.cfg bootmenu.cfg mount/
+	# Temporary workaround, Uncomment for syslinux 6.04+
+	cp $(addprefix /usr/lib/syslinux/modules/, efi32/ldlinux.e32 efi64/ldlinux.e64) mount/EFI/BOOT/
+	cp syslx64.cfg mount/EFI/BOOT/syslinux.cfg
 	umount mount/
 	sync
 
diff --git a/bootmenu.cfg b/bootmenu.cfg
new file mode 100644
index 0000000..3a53d93
--- /dev/null
+++ b/bootmenu.cfg
@@ -0,0 +1,16 @@
+UI menu.c32
+
+DEFAULT stretch_squash
+TIMEOUT 30
+
+LABEL stretch_squash
+  MENU LABEL Debian Stretch
+  KERNEL /vmlinuz
+  INITRD /initrd.img
+  APPEND boot=live live-media-path=/ quiet
+
+LABEL stretch_rescue
+  MENU LABEL Debian Stretch Rescue
+  KERNEL vmlinuz
+  INITRD initrd.img
+  APPEND boot=live live-media-path=/ init=/bin/sh
diff --git a/syslia32.cfg b/syslia32.cfg
new file mode 100644
index 0000000..84e692e
--- /dev/null
+++ b/syslia32.cfg
@@ -0,0 +1,3 @@
+PATH /efi32
+INCLUDE /bootmenu.cfg
+MENU TITLE Syslinux EFI-32
diff --git a/syslinux.cfg b/syslinux.cfg
index 67486a4..b6397a5 100644
--- a/syslinux.cfg
+++ b/syslinux.cfg
@@ -1,16 +1,3 @@
-UI menu.c32
-
-DEFAULT stretch_squash
-TIMEOUT 30
-
-LABEL stretch_squash
-  MENU LABEL Debian Stretch
-  KERNEL vmlinuz
-  INITRD initrd.img
-  APPEND boot=live live-media-path=/ quiet
-
-LABEL stretch_rescue
-  MENU LABEL Debian Stretch Rescue
-  KERNEL vmlinuz
-  INITRD initrd.img
-  APPEND boot=live live-media-path=/ init=/bin/sh
+PATH bios
+INCLUDE bootmenu.cfg
+MENU TITLE Syslinux BIOS
diff --git a/syslx64.cfg b/syslx64.cfg
new file mode 100644
index 0000000..88f0ad3
--- /dev/null
+++ b/syslx64.cfg
@@ -0,0 +1,3 @@
+PATH /efi64
+INCLUDE /bootmenu.cfg
+MENU TITLE Syslinux EFI-64
-- 
2.39.2