X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=Makefile;h=887422ca7fe17b56fd69e05b639273eed489cc95;hb=4f4c945b3de79650cb76286967b182c79b1d1294;hp=c3309a2912ebc71823a073a498b1a8ba26d78c7d;hpb=23d0b46966959d04e3d99010b22a24e36b73d6a7;p=blast

diff --git a/Makefile b/Makefile
index c3309a2..887422c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,12 @@ comma_:= ,
 space_:= ${nul_} ${nul_}
 
 .PHONY: clean .FORCE _target
-.PHONY: _bootloader_raspi _bootloader_pc _partition_gpt _partition_raspi
+.PHONY: _bootloader_raspi _bootloader_pc _bootloader_iso _partition_gpt _partition_raspi
 .PHONY: _squash_modules
-.PHONY: _qemu _bootstrap _install _copy _config _bootloader _squash
-.PHONY: _partition _format _mount _sparse _umount _partcopy _mbr
+.PHONY: _qemu _bootstrap _install _copy _config _squash _isosquash
+.PHONY: _format _mount _sparse _umount _partcopy _mbr _iso_image
 
 ARCH := amd64
-KEYRING := keys/debian-archive-stretch-stable.gpg
 BOOTSTRAP := http://cdn.debian.net/debian
 PACKAGES := ${PACKAGES} apt busybox-static debian-archive-keyring init systemd
 
@@ -28,13 +27,20 @@ else
   include ${config}
 endif
 
-ifndef release
+ifdef release
+  KEYRING := keys/debian-archive-${release}-stable.gpg
+else
   release := stretch
+  KEYRING := keys/debian-archive-stretch-stable.gpg
 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
 
 ifdef disk
   VOLUME := ${disk}
@@ -43,17 +49,17 @@ ifdef disk
   SYSROOT := hdd_mount/
   CFGROOT := hdd_mount/
   
-  _target: _mbr _umount _config _install _partition
+  _target: _mbr _umount _config _install _partition_gpt
   
-  _partition: _partition_gpt
-  _format: _partition
+  _partition_gpt:
+  _format: _partition_gpt
   _mount: _format
   _bootstrap: _mount
   _install: _bootstrap _mount
   _config: _install _mount
-  _bootloader: _mount _bootloader_pc
-  _umount: _mount _config _bootloader
-  _mbr: _umount _bootloader
+  _bootloader_pc: _mount
+  _umount: _mount _config _bootloader_pc
+  _mbr: _umount _bootloader_pc
 
 else ifdef image
   VOLUME := ${image}
@@ -62,20 +68,20 @@ else ifdef image
   SYSROOT := sys_root_${release}/
   CFGROOT := img_mount/
   
-  _target: _mbr _umount _partcopy _config _install
+  _target: _mbr _umount _config _install
   
   _bootstrap:
   _install: _bootstrap
   _sparse:
   _format: _sparse
-  _mount: _format
-  _copy: _install _mount
-  _config: _copy _mount
-  _bootloader: _mount _bootloader_pc
-  _umount: _mount _config _bootloader
-  _partition: _partition_gpt
-  _partcopy: _partition _umount
-  _mbr: _partcopy _bootloader
+  _partition_gpt: _sparse
+  _partcopy: _partition_gpt _format
+  _img_mount: _partcopy
+  _copy: _install _img_mount
+  _config: _copy _img_mount
+  _bootloader_pc: _img_mount
+  _umount: _img_mount _config _bootloader_pc
+  _mbr: _partcopy _bootloader_pc
 
 else ifdef squash
   SQUASH := ${squash}
@@ -92,6 +98,24 @@ else ifdef squash
   _config: _copy _squash_modules
   _squash: _config
 
+else ifdef iso
+  ISO := iso
+  ISOROOT := iso_root/
+  SYSROOT := sys_root_${release}/
+  CFGROOT := cfg_root/
+
+  PACKAGES += squashfs-tools
+  
+  _target: _iso_image _install _config
+  
+  _bootstrap:
+  _install: _bootstrap
+  _copy: _install
+  _config: _copy _squash_modules
+  _isosquash: _config
+  _bootloader_iso: _config
+  _iso_image: _bootloader_iso _isosquash
+
 else ifdef raspi
   VOLUME := ${raspi}
   PBOOT := rpi_boot.img
@@ -110,20 +134,20 @@ else ifdef raspi
 
   PACKAGES += firmware-brcm80211 libraspberrypi-bin libraspberrypi0 pi-bluetooth raspberrypi-bootloader raspberrypi-kernel
 
-  _target: _umount _partcopy _config _install
+  _target: _umount _config
   
   _qemu:
   _bootstrap: _qemu
   _install: _bootstrap
   _sparse:
   _format: _sparse
-  _mount: _format
-  _copy: _install _mount
-  _config: _copy _mount
-  _bootloader: _mount _bootloader_raspi
-  _umount: _mount _config _bootloader
-  _partition: _partition_raspi
-  _partcopy: _partition _umount
+  _partition_raspi: _sparse
+  _partcopy: _partition_raspi _format
+  _img_mount: _partcopy
+  _copy: _install _img_mount
+  _config: _copy _img_mount
+  _bootloader_raspi: _img_mount
+  _umount: _img_mount _config _bootloader_raspi
 
 else
   _target:
@@ -142,20 +166,26 @@ else ifeq "${ARCH}" "i386"
   PACKAGES += linux-image-686
 endif
 
-export SOURCES SYSROOT CFGROOT VOLUME PBOOT PROOT SQUASH ARCH KEYRING BOOTSTRAP
+export SOURCES SYSROOT CFGROOT VOLUME PBOOT PROOT SQUASH ARCH KEYRING BOOTSTRAP ISOROOT ISO
 
 sys_root_${release}/:
 	btrfs subvol create "$@" || mkdir "$@"
 	chmod 755 "$@"
 
+rpi_root_${release}/:
+	btrfs subvol create "$@" || mkdir "$@"
+	chmod 755 "$@"
+
 cfg_root/: sys_root_${release}/ _install
 	-btrfs sub del "$@" || rm -r "$@"
 	btrfs sub snap "$<" "$@" || mkdir "$@"
 	chmod 755 "$@"
 
-rpi_root_${release}/:
+${ISOROOT}:
+	-btrfs sub del "$@" || rm -r "$@"
 	btrfs subvol create "$@" || mkdir "$@"
-	chmod 755 "$@"
+	mkdir "$@/live"
+	chmod 755 "$@" "$@/live"
 
 img_mount/:
 	mkdir -p -m 755 "$@"
@@ -187,21 +217,23 @@ ${SYSROOT}/etc/apt/apt.conf.d/10norecommends: ${SYSROOT}
 	printf 'APT::Install-Recommends "false";\n' >"$@"
 	chmod 644 "$@"
 
-${SYSROOT}/etc/apt/trusted.gpg.d/: ${SYSROOT}
+${SYSROOT}/etc/apt/trusted.gpg.d/: ${SYSROOT} _bootstrap
 	mkdir -p -m 755 "$@"
 	cp keys/*.gpg "$@"
 
 _install: ${SYSROOT} _aptkeys _norecommends
-	printf '%s\n' "$${SOURCES}" >"$${SYSROOT}/etc/apt/sources.list"
+	printf '%s\n' "$${SOURCES}" |sort -u >"$${SYSROOT}/etc/apt/sources.list"
 	-cp /etc/resolv.conf "$${SYSROOT}/etc/"
 	-chroot "$${SYSROOT}" sh -c 'apt-mark showmanual |xargs apt-mark auto'
 	-chroot "$${SYSROOT}" apt-get update
 	chroot "$${SYSROOT}" ln -sf /bin/true /usr/local/sbin/invoke-rc.d
+	chroot "$${SYSROOT}" ln -sf /bin/true /usr/sbin/udevadm
 	chroot "$${SYSROOT}" apt-get --yes install ${PACKAGES}
 	chroot "$${SYSROOT}" apt-get --yes --auto-remove purge
 	-chroot "$${SYSROOT}" apt-get --yes --auto-remove upgrade
 	chroot "$${SYSROOT}" apt-get clean
 	chroot "$${SYSROOT}" rm /usr/local/sbin/invoke-rc.d
+	chroot "$${SYSROOT}" rm /usr/sbin/udevadm
 
 _copy: ${SYSROOT} ${CFGROOT}
 	cp -au "$${SYSROOT}/." "$${CFGROOT}/"
@@ -222,6 +254,11 @@ _squash_modules: ${CFGROOT}
 
 _squash: ${SQUASH} _squash_modules
 
+_isosquash: ${ISOROOT}/live/live.squashfs
+${ISOROOT}/live/live.squashfs: ${CFGROOT} ${ISOROOT}
+	-rm "$@"
+	printf '%s\n' boot |mksquashfs "$${CFGROOT}" "$@" -comp xz -ef /dev/stdin
+
 ${VOLUME}: .FORCE
 	! printf '%s\n' "$${VOLUME}" |grep -q '^/dev/'  # abort if volume should be real device
 	dd count=0 of="$${VOLUME}"  # truncate
@@ -253,6 +290,12 @@ _format: ${PBOOT} ${PROOT}
 	mkfs.fat -F 32 -n BOOT "$${PBOOT}"
 	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 \
+		"$${ISOROOT}"
+
 .PHONY: _syslinux_efi32 _syslinux_efi64 _syslinux_bios
 .PHONY: _grub_efi32 _grub_efi64
 
@@ -304,6 +347,15 @@ _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"
+	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"
+
 .PHONY: _syslinux_mbr _grub_mbr
 
 _syslinux_mbr: ${VOLUME}
@@ -325,6 +377,14 @@ _mount: ${PBOOT} ${PROOT} ${CFG_ROOT}
 	mkdir -p -m 755 "$${CFGROOT}/boot"
 	mount -t vfat "$${PBOOT}" "$${CFGROOT}/boot"
 
+_img_mount:
+	mount -o loop,offset="$$((${BOOT_MB} + 2))"M,sizelimit=${ROOT_MB}M \
+	  -t ext4 "$${VOLUME}" "$${CFGROOT}"
+	chmod 755 "$${CFGROOT}"
+	mkdir -p -m 755 "$${CFGROOT}/boot"
+	mount -o loop,offset=2M,sizelimit=${BOOT_MB}M \
+	  -t vfat "$${VOLUME}" "$${CFGROOT}/boot"
+
 _umount: ${CFGROOT}
 	-umount "$${CFGROOT}/boot"
 	umount "$${CFGROOT}" && rmdir "$${CFGROOT}"