X-Git-Url: http://git.plutz.net/?p=blast;a=blobdiff_plain;f=Makefile;h=8da2961171dc795d65fbe15b80f4517561a26eba;hp=ef1af7579aee04593836fcffe5ce3f9d67275e77;hb=HEAD;hpb=fbf5b8ce302dc8dcd12861f9ec820a7a4ca99a5b

diff --git a/Makefile b/Makefile
index ef1af75..7af8ad8 100644
--- a/Makefile
+++ b/Makefile
@@ -5,29 +5,46 @@ comma_:= ,
 space_:= ${nul_} ${nul_}
 
 .PHONY: clean .FORCE _target
-.PHONY: _bootloader_raspi _bootloader_pc _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 
+.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
-KEYRING := keys/debian-archive-stretch-stable.gpg
-BOOTSTRAP := http://cdn.debian.net/debian
+BOOTSTRAP := http://deb.debian.org/debian
+PACKAGES := ${PACKAGES} apt busybox-static debian-archive-keyring init systemd
 
 # Partition Table (2M) + Boot Partition (126M)+ Root Partition + Slack Space (1M) = 2048M
 BOOT_MB := 62
 ROOT_MB := 959
 
-define SOURCES = 
-deb	http://cdn.debian.net/debian stretch main
-endef
-
-PACKAGES := ${PACKAGES} apt busybox-static debian-archive-keyring init systemd
+fstype := ext4
 
-include config.mk
 config.mk:
 	cp "config.example" "$@"
 
+ifndef config
+  include config.mk
+else
+  include ${config}
+endif
+
+ifndef release
+  release := bullseye
+endif
+
+KEYRING := keys/debian-archive-${release}-automatic.gpg
+
+ifndef SOURCES
+  define SOURCES := 
+  deb	http://deb.debian.org/debian	${release}	main
+  deb	https://deb.debian.org/debian-security/	${release}/updates	main
+  endef
+endif
+
 ifdef disk
   VOLUME := ${disk}
   PBOOT := ${disk}1
@@ -35,43 +52,57 @@ 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}
   PBOOT := part_boot.img
   PROOT := part_root.img
-  SYSROOT := sys_root/
+  SYSROOT := sys_root_${release}_${ARCH}/
   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 subvol
+  SYSROOT := sys_root_${release}_${ARCH}/
+  CFGROOT := cfg_root/
+
+  _target: _install _config ${subvol}
+  
+  _bootstrap:
+  _install: _bootstrap
+  _copy: _install
+  _config: _copy
+
+  ${subvol}: _config
+	btrfs sub snap "${CFGROOT}" "$@"
 
 else ifdef squash
   SQUASH := ${squash}
-  SYSROOT := sys_root/
+  SYSROOT := sys_root_${release}_${ARCH}/
   CFGROOT := cfg_root/
 
   PACKAGES += squashfs-tools nbd-client
@@ -84,38 +115,59 @@ else ifdef squash
   _config: _copy _squash_modules
   _squash: _config
 
+else ifdef iso
+  ISO := ${iso}
+  ISOROOT := iso_root/
+  SYSROOT := sys_root_${release}_${ARCH}/
+  CFGROOT := cfg_root/
+  BOOT_MB := 2
+  PBOOT := ${ISOROOT}/efi.img
+
+  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 # _efi_umount
+
 else ifdef raspi
+  ARCH := armhf
+
   VOLUME := ${raspi}
   PBOOT := rpi_boot.img
   PROOT := rpi_root.img
-  SYSROOT := rpi_root/
+  SYSROOT := sys_root_${release}_${ARCH}/
   CFGROOT := img_mount/
   
-  ARCH := armhf
   KEYRING := keys/raspbian-archive-keyring.gpg
   BOOTSTRAP := http://raspbian.raspberrypi.org/raspbian
 
-  define SOURCES =
-  deb	http://raspbian.raspberrypi.org/raspbian stretch main non-free firmware rpi
-  deb	http://archive.raspberrypi.org/debian stretch main
+  define SOURCES :=
+  deb	http://raspbian.raspberrypi.org/raspbian ${release} main non-free firmware rpi
+  deb	http://archive.raspberrypi.org/debian ${release} main
   endef
 
-  PACKAGES += firmware-brcm80211 libraspberrypi-bin libraspberrypi0 pi-bluetooth raspberrypi-bootloader raspberrypi-kernel
+  PACKAGES += firmware-brcm80211 libraspberrypi-bin libraspberrypi0 pi-bluetooth raspberrypi-bootloader raspberrypi-kernel initramfs-tools
 
-  _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: _copy _config _bootloader_raspi
 
 else
   _target:
@@ -128,26 +180,29 @@ ifdef modules
   include $(addsuffix .mk, $(addprefix modules/, $(subst ${comma_},${space_},${modules})))
 endif
 
-ifeq "${ARCH}" "amd64"
+ifeq "$(findstring linux-image, ${PACKAGES})" "linux-image"
+else ifeq "${ARCH}" "amd64"
   PACKAGES += linux-image-amd64
 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/:
+sys_root_${release}_${ARCH}/:
 	btrfs subvol create "$@" || mkdir "$@"
 	chmod 755 "$@"
 
-cfg_root/: sys_root/ _install
+cfg_root/: sys_root_${release}_${ARCH}/ _install
 	-btrfs sub del "$@" || rm -r "$@"
 	btrfs sub snap "$<" "$@" || mkdir "$@"
 	chmod 755 "$@"
 
-rpi_root/:
+${ISOROOT}:
+	-btrfs sub del "$@" || rm -r "$@"
 	btrfs subvol create "$@" || mkdir "$@"
-	chmod 755 "$@"
+	mkdir "$@/live"
+	chmod 755 "$@" "$@/live"
 
 img_mount/:
 	mkdir -p -m 755 "$@"
@@ -166,7 +221,9 @@ _bootstrap: ${SYSROOT}/bin/sh
 ${SYSROOT}/bin/sh: | ${SYSROOT}
 	debootstrap --variant=minbase --arch="$${ARCH}" \
 		--keyring="$${KEYRING}" \
-		stretch "$${SYSROOT}" "$${BOOTSTRAP}"
+		"${release}" "$${SYSROOT}" "$${BOOTSTRAP}"
+	printf 'APT::Default-Release "%s";' "${release}" >"$${SYSROOT}/etc/apt/apt.conf.d/10release"
+
 
 .PHONY: _aptkeys _norecommends
 _aptkeys: ${SYSROOT}/etc/apt/trusted.gpg.d/
@@ -174,32 +231,41 @@ _norecommends: ${SYSROOT}/etc/apt/apt.conf.d/10norecommends
 
 ${SYSROOT}/etc/apt/apt.conf.d/10norecommends: ${SYSROOT}
 	mkdir -p -m 755 "$(dir $@)"
-	printf 'APT::Install-Recommends "false";\n' >"$@"
+	printf 'APT::%s "false";\n' "Install-Recommends" "Keep-Recommends" "Install-Suggests" "Keep-Suggests" >"$@"
 	chmod 644 "$@"
 
-${SYSROOT}/etc/apt/trusted.gpg.d/: ${SYSROOT}
+${SYSROOT}/etc/apt/trusted.gpg.d/: ${SYSROOT} _bootstrap
 	mkdir -p -m 755 "$@"
 	cp keys/*.gpg "$@"
+	chmod 644 "$@"/*.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}" apt-get --yes install ${PACKAGES}
+	chroot "$${SYSROOT}" ln -sf /bin/true /usr/sbin/udevadm
+	mountpoint "$${SYSROOT}/proc" || mount -o bind /proc "$${SYSROOT}/proc"
+	chroot "$${SYSROOT}" apt-get --yes -t "${release}" install ${PACKAGES}
+	mkdir -p -m 755 "$${SYSROOT}/var/lib/deborphan/"
+	chroot "$${SYSROOT}" sh -c 'printf "%s\\n" ${PACKAGES} >/var/lib/deborphan/keep'
+	-chroot "$${SYSROOT}" sh -c 'apt-get --yes purge $$(deborphan -an |sed "s;^.* ;;g")'
 	chroot "$${SYSROOT}" apt-get --yes --auto-remove purge
 	-chroot "$${SYSROOT}" apt-get --yes --auto-remove upgrade
+	-umount "$${SYSROOT}/proc"
 	chroot "$${SYSROOT}" apt-get clean
 	chroot "$${SYSROOT}" rm /usr/local/sbin/invoke-rc.d
+	chroot "$${SYSROOT}" rm /usr/sbin/udevadm
 
 _copy: ${SYSROOT} ${CFGROOT}
+	sync
 	cp -au "$${SYSROOT}/." "$${CFGROOT}/"
 
 _config: ${CFGROOT}
 	ln -sf /dev/null "$${CFGROOT}/etc/systemd/network/99-default.link"
 	printf '\nsession	optional	pam_mkhomedir.so umask=0027\n' >>"$${CFGROOT}/etc/pam.d/common-session"
-	printf 'LABEL=FSROOT / ext4 auto,nofail,rw 0 0\nLABEL=BOOT /boot vfat auto,nofail,ro 0 0\n' \
+	printf 'LABEL=FSROOT / ${fstype} auto,nofail,rw 0 0\nLABEL=BOOT /boot vfat auto,nofail,ro 0 0\n' \
 		>"$${CFGROOT}/etc/fstab"
 	chroot "$${CFGROOT}" update-initramfs -u
 
@@ -212,6 +278,12 @@ _squash_modules: ${CFGROOT}
 
 _squash: ${SQUASH} _squash_modules
 
+_isosquash: ${ISOROOT}/live/live.squashfs
+${ISOROOT}/live/live.squashfs: ${CFGROOT} ${ISOROOT} .FORCE
+	-rm "$@"
+	{ cd "$${CFGROOT}"; 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
@@ -238,10 +310,24 @@ _partition_gpt: ${VOLUME}
 
 _sparse: ${PBOOT} ${PROOT}
 
-_format: ${PBOOT} ${PROOT}
-	-umount "$${CFGROOT}/boot" "$${CFGROOT}"
+ifeq "${fstype}" "ext4"
+  fsflag:=-F
+else
+  fsflag:=-f
+endif
+
+_format_root: ${PROOT}
+	-umount "$${CFGROOT}/boot" "$${CFGROOT}" "${PROOT}"
+	mkfs.${fstype} ${fsflag} -L FSROOT "$${PROOT}"
+
+_format_boot: ${PBOOT}
+	-umount "$${CFGROOT}/boot" "${PBOOT}"
 	mkfs.fat -F 32 -n BOOT "$${PBOOT}"
-	mkfs.ext4 -F -L FSROOT "$${PROOT}"
+
+_format: _format_root _format_boot
+
+_iso_image: ${ISOROOT}
+	grub-mkrescue --compress=xz -o "$${ISO}" "$${ISOROOT}"
 
 .PHONY: _syslinux_efi32 _syslinux_efi64 _syslinux_bios
 .PHONY: _grub_efi32 _grub_efi64
@@ -276,7 +362,7 @@ _grub_efi64: ${CFGROOT}
 	grub-mkimage -p / -O x86_64-efi fat part_gpt normal linux all_video >"$${CFGROOT}/boot/EFI/BOOT/BOOTX64.EFI"
 
 ${CFGROOT}/boot/cmdline.txt: ${CFGROOT}
-	printf 'root=/dev/mmcblk0p2 rootfstype=ext4 fsck.repair=yes rootwait' >"$@"
+	printf 'root=/dev/mmcblk0p2 rootfstype=${fstype} fsck.repair=yes rootwait net.ifnames=0' >"$@"
 
 _bootloader_raspi: ${CFGROOT} ${CFGROOT}/boot/cmdline.txt
 
@@ -294,6 +380,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}
+	mkdir -p "$${ISOROOT}/boot/grub/"
+	cp -L "$${CFGROOT}/vmlinuz" "$${CFGROOT}/initrd.img" "$${ISOROOT}"
+	printf '%s\n' "insmod all_video" "set gfxmode=auto" "load_video" "insmod gfxterm" \
+		>"$${ISOROOT}/boot/grub/grub.cfg"
+	printf '%s\n' "set timeout=10" "default=${release}" \
+		"menuentry 'Debian ${release}' --id '${release}' {" \
+		"linux '/vmlinuz' boot=live" "initrd '/initrd.img'" "}" \
+		>>"$${ISOROOT}/boot/grub/grub.cfg"
+	-[ -f "$${ISOROOT}/install/initrd.gz" -a -f "$${ISOROOT}/install/linux" ] && \
+	printf '%s\n' "menuentry 'Install Debian' --id 'install' {" \
+		"linux '/install/linux'" "initrd '/install/initrd.gz'" "}" \
+		>>"$${ISOROOT}/boot/grub/grub.cfg"
+
+_efi_mount: ${PBOOT}
+	-umount "efi/"
+	mkdir -p -m 755 "efi/"
+	mount -t vfat -o loop "$${PBOOT}" "efi/"
+
+_efi_umount: _efi_mount
+	sync
+	umount efi/ && rmdir efi/
+
 .PHONY: _syslinux_mbr _grub_mbr
 
 _syslinux_mbr: ${VOLUME}
@@ -309,16 +418,42 @@ _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 -t ext4 "$${PROOT}" "$${CFGROOT}"
+_mount_root: ${PROOT} ${CFGROOT}
+	mountpoint "$${CFGROOT}" \
+	|| mount -t ${fstype} "$${PROOT}" "$${CFGROOT}"
 	chmod 755 "$${CFGROOT}"
+
+_mount_boot: ${PBOOT}
 	mkdir -p -m 755 "$${CFGROOT}/boot"
-	mount -t vfat "$${PBOOT}" "$${CFGROOT}/boot"
+	mountpoint "$${CFGROOT}/boot" \
+	|| mount -t vfat "$${PBOOT}" "$${CFGROOT}/boot"
+
+ifdef disk
+  _mount_boot: _mount_root
+endif
 
-_umount: ${CFGROOT}
+_mount: _mount_root _mount_boot
+
+_img_mount: ${CFGROOT}
+	mountpoint "$${CFGROOT}" \
+	|| mount -o loop,offset="$$((${BOOT_MB} + 2))"M,sizelimit=${ROOT_MB}M \
+		 -t ${fstype} "$${VOLUME}" "$${CFGROOT}"
+	chmod 755 "$${CFGROOT}"
+	mkdir -p -m 755 "$${CFGROOT}/boot"
+	mountpoint "$${CFGROOT}/boot" \
+	|| mount -o loop,offset=2M,sizelimit=${BOOT_MB}M \
+		 -t vfat "$${VOLUME}" "$${CFGROOT}/boot"
+
+_umount_boot: ${CFGROOT} _config
+	sync
 	-umount "$${CFGROOT}/boot"
+
+_umount_root: _umount_boot _config
+	sync
 	umount "$${CFGROOT}" && rmdir "$${CFGROOT}"
 
+_umount: _umount_boot _umount_root
+
 clean:
 	[ "$${SYSROOT#/}" ] && [ "$${CFGROOT#/}" ] || false  # (abort receipe)
 	-umount img_mount/boot
@@ -327,12 +462,13 @@ clean:
 	-umount hdd_mount/boot
 	-umount hdd_mount
 	-rmdir hdd_mount
-	if [ -d "sys_root/" ]; then btrfs sub del "sys_root/" || echo rm -r "sys_root/"; fi
-	if [ -d "cfg_root/" ]; then btrfs sub del "cfg_root/" || echo rm -r "cfg_root/"; fi
-	if [ -d "rpi_root/" ]; then btrfs sub del "rpi_root/" || echo rm -r "rpi_root/"; 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}_${ARCH}/" ]; then btrfs sub del "sys_root_${release}_${ARCH}/" || rm -r "sys_root_${release}_${ARCH}/"; 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}"