X-Git-Url: http://git.plutz.net/?p=bootimage;a=blobdiff_plain;f=Makefile;h=8879c09a942ac481e23aaf002b21301f9ca01037;hp=0d6dd2593f44797f34036d86ed30f317d574080f;hb=9ff678e0eabd42da88178d2bdc91d394bb0f8a1e;hpb=5e193ba54893b74e515ece3917eec96ba73348b0

diff --git a/Makefile b/Makefile
index 0d6dd25..8879c09 100644
--- a/Makefile
+++ b/Makefile
@@ -35,34 +35,45 @@ stretch_%_root/: stretch_%_root/bin/sh ${CONFIG} permissions .FORCE
 	touch "$@"
 
 stretch_%_config/: stretch_%_root/ ${CONFIG} permissions .FORCE
-	btrfs subvolume delete "$@" || rm -r "$@" || true
+	if [ -d "$@" ]; then btrfs subvolume delete "$@" || rm -r "$@"; else true; fi
 	btrfs subvolume snapshot "$<" "$@" || cp -rlv "$<" "$@"
 	cp -av $(addsuffix /*, ${CONFIG}) "$@"
 	-chroot "$@" locale-gen
 	-chroot "$@" update-locale
-	chroot "$@" useradd -M -p "$$(printf %s\\n '${PASS}' |mkpasswd -m sha-256 -s)" '${USER}'
-	for g in ${GROUPS}; do chroot "$@" adduser '${USER}' "$$g"; done
+	-chroot "$@" useradd -M -p "$$(printf %s\\n '${PASS}' |mkpasswd -m sha-256 -s)" '${USER}'
+	-for g in ${GROUPS}; do chroot "$@" adduser '${USER}' "$$g"; done
 	touch "$@"
 
 stretch_%.squashfs: stretch_%_config/
 	rm "$@" || true
 	mksquashfs "$<" "$@" -comp xz
 
+vmlinuz: stretch_*_root/
+	ln -fs '$<$@' ./
+
+initrd.img: stretch_*_root/
+	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