enable isohybrid images (for BIOS boot)

diff --git a/Makefile b/Makefile
index 887422ca7fe17b56fd69e05b639273eed489cc95..29a2582a04413b8ff5fb59a7e96c85b7d5a58062 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,13 @@ comma_:= ,
 space_:= ${nul_} ${nul_}
 
 .PHONY: clean .FORCE _target
-.PHONY: _bootloader_raspi _bootloader_pc _bootloader_iso _partition_gpt _partition_raspi
-.PHONY: _squash_modules
-.PHONY: _qemu _bootstrap _install _copy _config _squash _isosquash
-.PHONY: _format _mount _sparse _umount _partcopy _mbr _iso_image
+.PHONY: _qemu _bootstrap _install _copy _config 
+.PHONY: _partition_gpt _partition_raspi _sparse _partcopy _mbr
+.PHONY: _format _format_root _format_boot
+.PHONY: _bootloader_raspi _bootloader_pc _bootloader_iso
+.PHONY: _mount _mount_root _mount_boot _efi_mount
+.PHONY: _umount _umount_root _umount_boot _efi_umount
+.PHONY: _squash_modules _squash _isosquash _iso_image
 
 ARCH := amd64
 BOOTSTRAP := http://cdn.debian.net/debian
@@ -36,8 +39,6 @@ endif
 
 ifndef SOURCES
 define SOURCES := 
-deb    http://cdn.debian.net/debian stretch main
-deb    http://cdn.debian.net/debian buster main
 deb    http://cdn.debian.net/debian ${release} main
 endef
 endif
@@ -99,10 +100,12 @@ else ifdef squash
   _squash: _config
 
 else ifdef iso
-  ISO := iso
+  ISO := ${iso}
   ISOROOT := iso_root/
   SYSROOT := sys_root_${release}/
   CFGROOT := cfg_root/
+  BOOT_MB := 2
+  PBOOT := ${ISOROOT}/efi.img
 
   PACKAGES += squashfs-tools
   
@@ -113,8 +116,12 @@ else ifdef iso
   _copy: _install
   _config: _copy _squash_modules
   _isosquash: _config
+#  ${PBOOT}: ${ISOROOT}
+#  _format_boot: ${PBOOT}
+#  _efi_mount: ${PBOOT} _format_boot
+#  _efi_umount: _config
   _bootloader_iso: _config
-  _iso_image: _bootloader_iso _isosquash
+  _iso_image: _bootloader_iso _isosquash # _efi_umount
 
 else ifdef raspi
   VOLUME := ${raspi}
@@ -255,7 +262,7 @@ _squash_modules: ${CFGROOT}
 _squash: ${SQUASH} _squash_modules
 
 _isosquash: ${ISOROOT}/live/live.squashfs
-${ISOROOT}/live/live.squashfs: ${CFGROOT} ${ISOROOT}
+${ISOROOT}/live/live.squashfs: ${CFGROOT} ${ISOROOT} .FORCE
        -rm "$@"
        printf '%s\n' boot |mksquashfs "$${CFGROOT}" "$@" -comp xz -ef /dev/stdin
 
@@ -285,16 +292,21 @@ _partition_gpt: ${VOLUME}
 
 _sparse: ${PBOOT} ${PROOT}
 
-_format: ${PBOOT} ${PROOT}
-       -umount "$${CFGROOT}/boot" "$${CFGROOT}"
-       mkfs.fat -F 32 -n BOOT "$${PBOOT}"
+_format_root: ${PROOT}
+       -umount "$${CFGROOT}/boot" "$${CFGROOT}" "${PROOT}"
        mkfs.ext4 -F -L FSROOT "$${PROOT}"
 
-_iso_image: ${ISOROOT}
-       xorriso -as mkisofs -o "$${ISO}" -b grub.bin -c boot.cat \
-               -no-emul-boot -boot-load-size 4 -boot-info-table \
-               -eltorito-alt-boot -e efi.img -no-emul-boot \
+_format_boot: ${PBOOT}
+       -umount "$${CFGROOT}/boot" "${PBOOT}"
+       mkfs.fat -F 32 -n BOOT "$${PBOOT}"
+
+_format: _format_root _format_boot
+
+_iso_image: ${ISOROOT} # _efi_iso _efi_umount
+       xorriso -as mkisofs -o "$${ISO}" -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \
+               -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table \
                "$${ISOROOT}"
+               # -eltorito-alt-boot -e efi.img -no-emul-boot -isohybrid-gpt-basdat \
 
 .PHONY: _syslinux_efi32 _syslinux_efi64 _syslinux_bios
 .PHONY: _grub_efi32 _grub_efi64
@@ -347,14 +359,29 @@ _bootloader_pc: ${CFGROOT} _grub_efi32 _grub_efi64 _syslinux_bios #_syslinux_efi
        printf "menuentry 'Rescue' --id 'rescue' {\n linux '/%s' root=LABEL=FSROOT init=/bin/sh\n initrd '/%s'\n}\n" \
                "$$k" "$$i" >>"$${CFGROOT}/boot/grub.cfg"
 
-_bootloader_iso: ${CFGROOT} ${ISOROOT} _grub_efi32 _grub_efi64
-       grub-mkimage -p / -O i386-pc-eltorito biosdisk iso9660 normal linux all_video >"$${ISOROOT}/grub.bin"
-       grub-glue-efi -3 "$${CFGROOT}/boot/EFI/BOOT/BOOTIA32.EFI" -6 "$${CFGROOT}/boot/EFI/BOOT/BOOTX64.EFI" >"$${ISOROOT}/efi.img"
+_bootloader_iso: ${CFGROOT} ${ISOROOT}
+       # grub-mkimage -p / -O i386-pc-eltorito biosdisk iso9660 normal linux all_video >"$${ISOROOT}/grub.bin"
        cp -L "$${CFGROOT}/vmlinuz" "$${CFGROOT}/initrd.img" "$${ISOROOT}"
-       printf '%s\n' "set timeout=10" "default=buster" \
-               "menuentry 'Debian Buster' --id 'buster' {" \
-               "linux '/vmlinuz' boot=live" "initrd '/initrd.img'" "}" \
-               >"$${ISOROOT}/grub.cfg"
+       cp /usr/lib/ISOLINUX/isolinux.bin $(addprefix /usr/lib/syslinux/modules/bios/, ldlinux.c32 menu.c32 libutil.c32) "$${ISOROOT}"
+       # printf '%s\n' "set timeout=10" "default=buster" \
+       #       "menuentry 'Debian Buster' --id 'buster' {" \
+       #       "linux '/vmlinuz' boot=live" "initrd '/initrd.img'" "}" \
+       #       >"$${ISOROOT}/grub.cfg"
+       printf '%s\n' "UI menu.c32" "DEFAULT buster" "TIMEOUT 100" \
+               "LABEL buster" "  MENU LABEL Debian Buster 64bit" \
+               "  KERNEL /vmlinuz" "  APPEND initrd=/initrd.img boot=live" \
+               >"$${ISOROOT}/syslinux.cfg"
+
+_efi_mount: ${PBOOT}
+       -umount "efi/"
+       mkdir -p -m 755 "efi/"
+       mount -t vfat -o loop "$${PBOOT}" "efi/"
+
+_efi_umount: _efi_mount
+       umount efi/ && rmdir efi/
+
+_efi_iso: _efi_mount _grub_efi32 _grub_efi64
+       cp -r "$${CFGROOT}/boot/EFI/." "efi/EFI/"
 
 .PHONY: _syslinux_mbr _grub_mbr
 
@@ -371,12 +398,20 @@ _partcopy: ${VOLUME} ${PROOT} ${PBOOT}
        dd conv=notrunc,sparse bs=1M seek=2 if="$${PBOOT}" of="$${VOLUME}"
        dd conv=notrunc,sparse bs=1M seek=$$((2 + ${BOOT_MB})) if="$${PROOT}" of="$${VOLUME}"
 
-_mount: ${PBOOT} ${PROOT} ${CFG_ROOT}
+_mount_root: ${PROOT} ${CFGROOT}
        mount -t ext4 "$${PROOT}" "$${CFGROOT}"
        chmod 755 "$${CFGROOT}"
+
+_mount_boot: ${PBOOT}
        mkdir -p -m 755 "$${CFGROOT}/boot"
        mount -t vfat "$${PBOOT}" "$${CFGROOT}/boot"
 
+ifdef disk
+  _mount_boot: _mount_root
+endif
+
+_mount: _mount_root _mount_boot
+
 _img_mount:
        mount -o loop,offset="$$((${BOOT_MB} + 2))"M,sizelimit=${ROOT_MB}M \
          -t ext4 "$${VOLUME}" "$${CFGROOT}"
@@ -385,10 +420,14 @@ _img_mount:
        mount -o loop,offset=2M,sizelimit=${BOOT_MB}M \
          -t vfat "$${VOLUME}" "$${CFGROOT}/boot"
 
-_umount: ${CFGROOT}
+_umount_boot: ${CFGROOT}
        -umount "$${CFGROOT}/boot"
+
+_umount_root: _umount_boot
        umount "$${CFGROOT}" && rmdir "$${CFGROOT}"
 
+_umount: _umount_boot _umount_root
+
 clean:
        [ "$${SYSROOT#/}" ] && [ "$${CFGROOT#/}" ] || false  # (abort receipe)
        -umount img_mount/boot
@@ -397,12 +436,14 @@ clean:
        -umount hdd_mount/boot
        -umount hdd_mount
        -rmdir hdd_mount
-       if [ -d "sys_root_${release}/" ]; then btrfs sub del "sys_root_${release}/" || echo rm -r "sys_root_${release}/"; fi
-       if [ -d "cfg_root/" ]; then btrfs sub del "cfg_root/" || echo rm -r "cfg_root/"; fi
-       if [ -d "rpi_root_${release}/" ]; then btrfs sub del "rpi_root_${release}/" || echo rm -r "rpi_root_${release}/"; fi
+       if [ -d "cfg_root/" ]; then btrfs sub del "cfg_root/" || rm -r "cfg_root/"; fi
+       if [ -d "iso_root/" ]; then btrfs sub del "iso_root/" || rm -r "iso_root/"; fi
+       if [ -d "sys_root_${release}/" ]; then btrfs sub del "sys_root_${release}/" || rm -r "sys_root_${release}/"; fi
+       if [ -d "rpi_root_${release}/" ]; then btrfs sub del "rpi_root_${release}/" || rm -r "rpi_root_${release}/"; fi
        -rm part_boot.img
        -rm part_root.img
        -rm rpi_boot.img
        -rm rpi_root.img
        -[ -f "$${SQUASH}" ] && rm "$${SQUASH}"
        -[ -f "$${VOLUME}" ] && rm "$${VOLUME}"
+       -[ -f "$${ISO}" ] && rm "$${ISO}"