X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=Makefile;h=fb0db2b294daf13a1dad2592c508f7cd22032343;hb=2181bdf8b56e870fa56fb5cccc1287ef6860250a;hp=8caf61890cdf54ef119be15c5c92acc3196a9556;hpb=036c84e85aff0768e1606d22076492b934d161f4;p=blast

diff --git a/Makefile b/Makefile
index 8caf618..fb0db2b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,14 @@
 DEFAULT: _target
 
 nul_:=
-comma_:=,
-space_:=${nul_} ${nul_}
+comma_:= ,
+space_:= ${nul_} ${nul_}
 
-.PHONY: clean .FORCE
-.PHONY: _config_raspi _partition_raspi
-.PHONY: _qemu _bootstrap _install _copy _config_raspi _config _bootloader _squash
-.PHONY: _target _partition _format _mount _sparse _umount _partcopy _mbr
+.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
 
 ARCH := amd64
 KEYRING := keys/debian-archive-stretch-stable.gpg
@@ -21,114 +22,114 @@ define SOURCES =
 deb	http://cdn.debian.net/debian stretch main
 endef
 
-PACKAGES := ${PACKAGES} apt btrfs-tools busybox-static bzip2 ca-certificates cron debian-archive-keyring deborphan firmware-linux-free gzip htop ifupdown init iputils-ping irqbalance isc-dhcp-client less make net-tools nmap ntpdate openssh-client psmisc rsync sshfs sudo systemd traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip
+PACKAGES := ${PACKAGES} apt busybox-static debian-archive-keyring init systemd
 
+include config.mk
 config.mk:
 	cp "config.example" "$@"
 
-include config.mk
-
 ifdef disk
-VOLUME := ${disk}
-PBOOT := ${disk}1
-PROOT := ${disk}2
-SYSROOT := hdd_mount/
-CFGROOT := hdd_mount/
-
-_target: _mbr _umount _config _install _partition
-
-_partition:
-_format: _partition
-_mount: _format
-_bootstrap: _mount
-_install: _bootstrap _mount
-_config: _install _mount
-_bootloader: _mount
-_umount: _mount _config _bootloader
-_mbr: _umount _bootloader
+  VOLUME := ${disk}
+  PBOOT := ${disk}1
+  PROOT := ${disk}2
+  SYSROOT := hdd_mount/
+  CFGROOT := hdd_mount/
+  
+  _target: _mbr _umount _config _install _partition
+  
+  _partition: _partition_gpt
+  _format: _partition
+  _mount: _format
+  _bootstrap: _mount
+  _install: _bootstrap _mount
+  _config: _install _mount
+  _bootloader: _mount _bootloader_pc
+  _umount: _mount _config _bootloader
+  _mbr: _umount _bootloader
 
 else ifdef image
-VOLUME := ${image}
-PBOOT := part_boot.img
-PROOT := part_root.img
-SYSROOT := sys_root/
-CFGROOT := img_mount/
-
-_target: _mbr _umount _partcopy _config _install
-
-_bootstrap:
-_install: _bootstrap
-_sparse:
-_format: _sparse
-_mount: _format
-_copy: _install _mount
-_config: _copy _mount
-_bootloader: _mount
-_umount: _mount _config _bootloader
-_partition:
-_partcopy: _partition _umount
-_mbr: _partcopy _bootloader
+  VOLUME := ${image}
+  PBOOT := part_boot.img
+  PROOT := part_root.img
+  SYSROOT := sys_root/
+  CFGROOT := img_mount/
+  
+  _target: _mbr _umount _partcopy _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
 
 else ifdef squash
-SQUASH := ${squash}
-SYSROOT := sys_root/
-CFGROOT := cfg_root/
-
-_target: _squash _install _config
-
-_bootstrap:
-_install: _bootstrap
-_copy: _install
-_config: _copy
-_squash: _config
+  SQUASH := ${squash}
+  SYSROOT := sys_root/
+  CFGROOT := cfg_root/
+  
+  _target: _squash _install _config
+  
+  _bootstrap:
+  _install: _bootstrap
+  _copy: _install
+  _config: _copy
+  _squash: _config _squash_modules
 
 else ifdef raspi
-VOLUME := ${raspi}
-PBOOT := rpi_boot.img
-PROOT := rpi_root.img
-SYSROOT := rpi_root/
-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
-endef
+  VOLUME := ${raspi}
+  PBOOT := rpi_boot.img
+  PROOT := rpi_root.img
+  SYSROOT := rpi_root/
+  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
+  endef
+
 PACKAGES := ${PACKAGES} firmware-brcm80211 libraspberrypi-bin libraspberrypi0 pi-bluetooth raspberrypi-bootloader raspberrypi-kernel
 
-_target: _umount _partcopy _config _install
-
-_qemu:
-_bootstrap: _qemu
-_install: _bootstrap
-_sparse:
-_format: _sparse
-_mount: _format
-_copy: _install _mount
-_config_raspi: _copy _mount
-_config: _copy _mount _config_raspi
-_umount: _mount _config
-_partition_raspi:
-_partcopy: _partition_raspi _umount
+  _target: _umount _partcopy _config _install
+  
+  _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
 
 else
-_target:
+  _target:
 	false
 
 endif
 
 include modules/default.mk
 ifdef modules
-include $(addsuffix .mk, $(addprefix modules/, $(subst ${comma_},${space},${modules})))
+  include $(addsuffix .mk, $(addprefix modules/, $(subst ${comma_},${space_},${modules})))
 endif
 
 ifeq "${ARCH}" "amd64"
-PACKAGES := ${PACKAGES} linux-image-amd64
+  PACKAGES += linux-image-amd64
 else ifeq "${ARCH}" "i386"
-PACKAGES := ${PACKAGES} linux-image-686
+  PACKAGES += linux-image-686
 endif
 
 export SOURCES SYSROOT CFGROOT VOLUME PBOOT PROOT SQUASH ARCH KEYRING BOOTSTRAP
@@ -178,7 +179,7 @@ ${SYSROOT}/etc/apt/trusted.gpg.d/: ${SYSROOT}
 	cp keys/*.gpg "$@"
 
 _install: ${SYSROOT} _aptkeys _norecommends
-	printf %s "$${SOURCES}" >"$${SYSROOT}/etc/apt/sources.list"
+	printf '%s\n' "$${SOURCES}" >"$${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
@@ -192,13 +193,9 @@ _install: ${SYSROOT} _aptkeys _norecommends
 _copy: ${SYSROOT} ${CFGROOT}
 	cp -au "$${SYSROOT}/." "$${CFGROOT}/"
 
-_config_raspi: ${CFGROOT}/boot/cmdline.txt
-${CFGROOT}/boot/cmdline.txt: ${CFGROOT}
-	printf 'dwc_otg.lpm_enable=0 console=serial0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait quiet' >"$@"
-
 .PHONY: _common_config
 _config: _common_config
-_common_config: ${CFGROOT} cfg_seed/
+_common_config: ${CFGROOT}
 	ln -sf /dev/null "$${CFGROOT}/etc/systemd/network/99-default.link"
 	printf 'LABEL=FSROOT / ext4 auto,nofail,rw 0 0\nLABEL=BOOT /boot vfat auto,nofail,ro 0 0\n' \
 		>"$${CFGROOT}/etc/fstab"
@@ -207,12 +204,16 @@ ${SQUASH}: ${CFGROOT}
 	-rm "$${SQUASH}"
 	mksquashfs "$${CFGROOT}" "$${SQUASH}" -comp xz
 
-_squash: ${SQUASH}
+_squash_modules: ${CFGROOT}
+	printf '%s\n' squashfs nbd >>"${CFGROOT}/etc/initramfs-tools/modules"
+
+_squash: ${SQUASH} _squash_modules
 
 ${VOLUME}: .FORCE
 	! printf '%s\n' "$${VOLUME}" |grep -q '^/dev/'  # abort if volume should be real device
 	dd count=0 of="$${VOLUME}"  # truncate
 	dd bs=1M count=0 seek=$$((3 + ${BOOT_MB} + ${ROOT_MB})) of="$${VOLUME}"
+	chmod g+w "$${VOLUME}"
 
 ${PBOOT}: .FORCE
 	! printf '%s\n' "$${PBOOT}" |grep -q '^/dev/'  # abort if volume should be real device
@@ -228,7 +229,7 @@ _partition_raspi: ${VOLUME}
 	printf 'label: dos\n\n: start=2MiB, size=%iMiB, type=c\n: start=%iMiB, size=%iMiB, type=83\n' \
 		${BOOT_MB} "$$((${BOOT_MB} + 2))" ${ROOT_MB} | sfdisk "$${VOLUME}"
 
-_partition: ${VOLUME}
+_partition_gpt: ${VOLUME}
 	printf 'label: gpt\n\n: start=2MiB, size=%iMiB, type=1, attrs="LegacyBIOSBootable"\n: size=%iMiB, type=20\n' \
 		${BOOT_MB} ${ROOT_MB} | sfdisk "$${VOLUME}"
 
@@ -271,7 +272,12 @@ _grub_efi64: ${CFGROOT}
 	mkdir -p "$${CFGROOT}/boot/EFI/BOOT"
 	grub-mkimage -p / -O x86_64-efi fat part_gpt normal linux all_video >"$${CFGROOT}/boot/EFI/BOOT/BOOTX64.EFI"
 
-_bootloader: ${CFGROOT} _grub_efi32 _grub_efi64 _syslinux_bios #_syslinux_efi32 _syslinux_efi64
+${CFGROOT}/boot/cmdline.txt: ${CFGROOT}
+	printf 'root=/dev/mmcblk0p2 rootfstype=ext4 fsck.repair=yes rootwait' >"$@"
+
+_bootloader_raspi: ${CFGROOT} ${CFGROOT}/boot/cmdline.txt
+
+_bootloader_pc: ${CFGROOT} _grub_efi32 _grub_efi64 _syslinux_bios #_syslinux_efi32 _syslinux_efi64
 	printf 'UI menu.c32\nDEFAULT stretch\nTIMEOUT 30\n' >"$${CFGROOT}/boot/bootmenu.cfg"
 	printf 'set timeout=3\ndefault=stretch\n\n' >"$${CFGROOT}/boot/grub.cfg"
 	k="$$(printf ' %s' "$${CFGROOT}/boot/"vmlinuz-*)"; k="$${k##*/}"; \