X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=Makefile;h=da5d3e44ef0330c777212c3641f3ca6a1f590180;hb=d32c1d496394986056e98c0786828a0307626964;hp=e8c38c41dd4f045957bfafed9e220197829b2fbd;hpb=aa5ee6a381346209a761ca84be7373483ab53d09;p=blast

diff --git a/Makefile b/Makefile
index e8c38c4..da5d3e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
-
 DEFAULT: _target
+
+nul_:=
+comma_:=,
+space_:=${nul_} ${nul_}
+
 .PHONY: clean .FORCE
-.PHONY: _qemu _bootstrap _install _copy _config _syslinux _squash
+.PHONY: _qemu _bootstrap _install _copy _config_raspi _config _bootloader _squash
 .PHONY: _target _partition _format _mount _sparse _umount _partcopy _mbr
 
 ARCH := amd64
@@ -9,8 +13,8 @@ KEYRING := keys/debian-archive-stretch-stable.gpg
 BOOTSTRAP := http://cdn.debian.net/debian
 
 # Partition Table (2M) + Boot Partition (126M)+ Root Partition + Slack Space (1M) = 2048M
-BOOT_MB := 126
-ROOT_MB := 1919
+BOOT_MB := 62
+ROOT_MB := 959
 
 define SOURCES = 
 deb	http://cdn.debian.net/debian stretch main
@@ -18,6 +22,11 @@ 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
 
+config.mk:
+	cp "config.example" "$@"
+
+include config.mk
+
 ifdef disk
 VOLUME := ${disk}
 PBOOT := ${disk}1
@@ -33,9 +42,9 @@ _mount: _format
 _bootstrap: _mount
 _install: _bootstrap _mount
 _config: _install _mount
-_syslinux: _mount
-_umount: _mount _config _syslinux
-_mbr: _umount _syslinux
+_bootloader: _mount
+_umount: _mount _config _bootloader
+_mbr: _umount _bootloader
 
 else ifdef image
 VOLUME := ${image}
@@ -53,11 +62,11 @@ _format: _sparse
 _mount: _format
 _copy: _install _mount
 _config: _copy _mount
-_syslinux: _mount
-_umount: _mount _config _syslinux
+_bootloader: _mount
+_umount: _mount _config _bootloader
 _partition:
 _partcopy: _partition _umount
-_mbr: _partcopy _syslinux
+_mbr: _partcopy _bootloader
 
 else ifdef squash
 SQUASH := ${squash}
@@ -87,7 +96,7 @@ 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-brcm8011 libraspberrypi-bin libraspberrypi0 pi-bluetooth raspberrypi-bootloader raspberrypi-kernel
+PACKAGES := ${PACKAGES} firmware-brcm80211 libraspberrypi-bin libraspberrypi0 pi-bluetooth raspberrypi-bootloader raspberrypi-kernel
 
 _target: _umount _partcopy _config _install
 
@@ -98,7 +107,8 @@ _sparse:
 _format: _sparse
 _mount: _format
 _copy: _install _mount
-_config: _copy _mount
+_config_raspi: _copy _mount
+_config: _copy _mount _config_raspi
 _umount: _mount _config
 _partition:
 _partcopy: _partition _umount
@@ -109,6 +119,11 @@ _target:
 
 endif
 
+include modules/default.mk
+ifdef modules
+include $(addsuffix .mk, $(addprefix modules/, $(subst ${comma_},${space},${modules})))
+endif
+
 ifeq "${ARCH}" "amd64"
 PACKAGES := ${PACKAGES} linux-image-amd64
 else ifeq "${ARCH}" "i386"
@@ -125,18 +140,21 @@ cfg_root/: sys_root/ _install
 	btrfs sub snap "$<" "$@" || mkdir -p "$@"
 	chmod 755 "$@"
 
+rpi_root/:
+	btrfs subvol create "$@" || mkdir -p "$@"
+	chmod 755 "$@"
+
 img_mount/:
-	mkdir -p "$@"
+	mkdir -p -m 755 "$@"
 	chmod 755 "$@"
 
 hdd_mount/:
-	mkdir -p "$@"
-	chmod 755 "$@"
+	mkdir -p -m 755 "$@"
 
 _qemu: ${SYSROOT}/usr/bin/qemu-arm-static
 ${SYSROOT}/usr/bin/qemu-arm-static: /usr/bin/qemu-arm-static ${SYSROOT}
-	mkdir -p "$${SYSROOT}"/usr/bin
-	chmod 755 "$${SYSROOT}/usr" "$${SYSROOT}/usr/bin"
+	mkdir -p -m 755 "$${SYSROOT}"/usr/bin
+	chmod 755 "$${SYSROOT}"/usr
 	cp -p "$<" "$@"
 
 _bootstrap: ${SYSROOT}/bin/sh
@@ -150,12 +168,12 @@ _aptkeys: ${SYSROOT}/etc/apt/trusted.gpg.d/
 _norecommends: ${SYSROOT}/etc/apt/apt.conf.d/10norecommends
 
 ${SYSROOT}/etc/apt/apt.conf.d/10norecommends: ${SYSROOT}
-	mkdir -p "$(dir $@)"
+	mkdir -p -m 755 "$(dir $@)"
 	printf 'APT::Install-Recommends "false";\n' >"$@"
 	chmod 644 "$@"
 
 ${SYSROOT}/etc/apt/trusted.gpg.d/: ${SYSROOT}
-	mkdir -p "$@"
+	mkdir -p -m 755 "$@"
 	cp keys/*.gpg "$@"
 
 _install: ${SYSROOT} _aptkeys _norecommends
@@ -173,10 +191,16 @@ _install: ${SYSROOT} _aptkeys _norecommends
 _copy: ${SYSROOT} ${CFGROOT}
 	cp -au "$${SYSROOT}/." "$${CFGROOT}/"
 
-.PHONY: _main_config
-_config: _main_config
-_main_config: ${CFGROOT} cfg_seed/
-	cp -au cfg_seed/. "$${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/
+	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"
 
 ${SQUASH}: ${CFGROOT}
 	-rm "$${SQUASH}"
@@ -186,14 +210,17 @@ _squash: ${SQUASH}
 
 ${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}"
 
 ${PBOOT}: .FORCE
 	! printf '%s\n' "$${PBOOT}" |grep -q '^/dev/'  # abort if volume should be real device
+	dd count=0 of="$${PBOOT}"  # truncate
 	dd bs=1M count=0 seek=${BOOT_MB} of="$${PBOOT}"
 
 ${PROOT}: .FORCE
 	! printf '%s\n' "$${PROOT}" |grep -q '^/dev/'  # abort if volume should be real device
+	dd count=0 of="$${PROOT}"  # truncate
 	dd bs=1M count=0 seek=${ROOT_MB} of="$${PROOT}"
 
 _partition: ${VOLUME}
@@ -208,12 +235,15 @@ _format: ${PBOOT} ${PROOT}
 	mkfs.ext4 -F -L FSROOT "$${PROOT}"
 
 .PHONY: _syslinux_efi32 _syslinux_efi64 _syslinux_bios
+.PHONY: _grub_efi32 _grub_efi64
+
 _syslinux_efi32: ${CFGROOT}
 	mkdir -p "$${CFGROOT}/boot/EFI/BOOT"
 	cp /usr/lib/SYSLINUX.EFI/efi32/syslinux.efi "$${CFGROOT}/boot/EFI/BOOT/BOOTIA32.EFI"
 	mkdir -p "$${CFGROOT}/boot/efi32"
 	cp $(addprefix /usr/lib/syslinux/modules/efi32/, ldlinux.e32 menu.c32 libutil.c32) "$${CFGROOT}"/boot/efi32/
 	cp /usr/lib/syslinux/modules/efi32/ldlinux.e32 "$${CFGROOT}/boot/EFI/BOOT/"  # workaround
+	printf 'PATH /efi32\nINCLUDE /bootmenu.cfg\nMENU TITLE Syslinux EFI-32\n' >"$${CFGROOT}/boot/syslia32.cfg"
 
 _syslinux_efi64: ${CFGROOT}
 	mkdir -p "$${CFGROOT}/boot/EFI/BOOT"
@@ -221,21 +251,46 @@ _syslinux_efi64: ${CFGROOT}
 	mkdir -p "$${CFGROOT}/boot/efi64"
 	cp $(addprefix /usr/lib/syslinux/modules/efi64/, ldlinux.e64 menu.c32 libutil.c32) "$${CFGROOT}"/boot/efi64/
 	cp /usr/lib/syslinux/modules/efi64/ldlinux.e64 "$${CFGROOT}/boot/EFI/BOOT/"  # workaround
-
+	printf 'PATH /efi64\nINCLUDE /bootmenu.cfg\nMENU TITLE Syslinux EFI-64\n' >"$${CFGROOT}/boot/syslx64.cfg"
 
 _syslinux_bios: ${CFGROOT}
 	mkdir -p "$${CFGROOT}/boot/bios"
 	cp $(addprefix /usr/lib/syslinux/modules/bios/,  menu.c32 libutil.c32) "$${CFGROOT}"/boot/bios/
+	printf 'PATH bios\nINCLUDE bootmenu.cfg\nMENU TITLE Syslinux BIOS\n' >"$${CFGROOT}/boot/syslinux.cfg"
 
-_syslinux: ${CFGROOT} _syslinux_efi32 _syslinux_efi64 _syslinux_bios
-	cp -L "$${CFGROOT}/vmlinuz" "$${CFGROOT}/initrd.img" "$${CFGROOT}/boot/"
-	cp -ru cfg_syslinux/. "$${CFGROOT}/"
-	# cp "$${CFGROOT}/boot/syslx64.cfg" "$${CFGROOT}/boot/EFI/BOOT/syslinux.cfg"  # workaround
+_grub_efi32: ${CFGROOT}
+	mkdir -p "$${CFGROOT}/boot/EFI/BOOT"
+	grub-mkimage -p / -O i386-efi   fat part_gpt normal linux all_video >"$${CFGROOT}/boot/EFI/BOOT/BOOTIA32.EFI"
 
-_mbr: ${VOLUME}
+_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
+	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##*/}"; \
+	i="$$(printf ' %s' "$${CFGROOT}/boot/"initrd.img-*)";  i="$${i##*/}"; \
+	printf '\nLABEL stretch\n MENU LABEL Debian Stretch\n KERNEL /%s\n INITRD /%s\n APPEND root=LABEL=FSROOT\n' \
+		"$$k" "$$i" >>"$${CFGROOT}/boot/bootmenu.cfg"; \
+	printf '\nLABEL rescue\n MENU LABEL Rescue\n KERNEL /%s\n INITRD /%s\n APPEND root=LABEL=FSROOT init=/bin/sh\n' \
+		"$$k" "$$i" >>"$${CFGROOT}/boot/bootmenu.cfg"; \
+	printf "menuentry 'Debian Stretch' --id 'stretch' {\n linux '/%s' root=LABEL=FSROOT\n initrd '/%s'\n}\n" \
+		"$$k" "$$i" >>"$${CFGROOT}/boot/grub.cfg"; \
+	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"
+
+.PHONY: _syslinux_mbr _grub_mbr
+
+_syslinux_mbr: ${VOLUME}
 	syslinux -t 2097152 -i "$${VOLUME}"
 	dd conv=notrunc if=/usr/lib/syslinux/mbr/gptmbr.bin of="$${VOLUME}"
 
+_grub_mbr: ${VOLUME}
+	# grub-mkimage -p / -O i386-pc fat part_gpt normal linux all_video |dd conv=notrunc of="$${VOLUME}"
+
+_mbr: _syslinux_mbr # _grub_mbr
+
 _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}"
@@ -243,10 +298,8 @@ _partcopy: ${VOLUME} ${PROOT} ${PBOOT}
 _mount: ${PBOOT} ${PROOT} ${CFG_ROOT}
 	mount -t ext4 "$${PROOT}" "$${CFGROOT}"
 	chmod 755 "$${CFGROOT}"
-	mkdir -p "$${CFGROOT}/boot"
-	chmod 755 "$${CFGROOT}/boot"
+	mkdir -p -m 755 "$${CFGROOT}/boot"
 	mount -t vfat "$${PBOOT}" "$${CFGROOT}/boot"
-	chmod 755 "$${CFGROOT}/boot"
 
 _umount: ${CFGROOT}
 	-umount "$${CFGROOT}/boot"