X-Git-Url: http://git.plutz.net/?p=rpi_small;a=blobdiff_plain;f=Makefile;h=6a35118c906b0f6990c563898a7282a5f61cdf14;hp=9487b5bb229d0658bff923837183f77c1fa6918b;hb=4bb200e9c0d07b49a199f865bd9b0cd66a818a1f;hpb=bed6cddade88f1a7745a2e21eb92a922ab11a110

diff --git a/Makefile b/Makefile
index 9487b5b..6a35118 100644
--- a/Makefile
+++ b/Makefile
@@ -24,17 +24,22 @@ deb	http://raspbian.raspberrypi.org/raspbian stretch main non-free firmware rpi\
 deb	http://archive.raspberrypi.org/debian stretch main\n
 endef
 
-PACKAGES := apt bluez bluez-firmware bluez-tools btrfs-tools busybox-static bzip2 ca-certificates cron debian-archive-keyring deborphan firmware-brcm80211 firmware-linux-free firmware-misc-nonfree gzip htop ifupdown init iputils-ping irqbalance isc-dhcp-client less libraspberrypi-bin libraspberrypi0 make net-tools nmap ntpdate openssh-client openssh-server pi-bluetooth raspberrypi-bootloader raspberrypi-kernel rsync ssh sshfs sudo systemd traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip xserver-xorg-video-fbturbo xserver-xorg nodm xauth x2x xfce4 xvkbd xfce4-terminal blueman
+PACKAGES := apt bluez bluez-firmware bluez-tools btrfs-tools busybox-static bzip2 ca-certificates cron debian-archive-keyring deborphan firmware-brcm80211 firmware-linux-free firmware-misc-nonfree gzip htop ifupdown init iputils-ping irqbalance isc-dhcp-client less libraspberrypi-bin libraspberrypi0 make net-tools nmap ntpdate openssh-client openssh-server pi-bluetooth raspberrypi-bootloader raspberrypi-kernel rsync ssh sshfs sudo systemd traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip
 
 # Do not change, only override in config.mk
 WIFI-SSID = 
 WIFI-PASS = 
 
-include config.mk
-
 config.mk: config.example
 	cp -n "$<" "$@"
 
+.PHONY: imgfile imgmount root_copy norecommends apt_keys
+
+IMGFILE = raspi.img
+
+include config.mk
+include *.mk
+
 raspi_root:
 	btrfs subvolume create "$@" || mkdir "$@"
 	mkdir -p "$@/usr/bin"
@@ -44,16 +49,19 @@ raspi_root:
 		--arch=armhf --variant=minbase \
 		stretch "$@/" "${BOOTSTRAP}"
 
+norecommends: raspi_root/etc/apt/apt.conf.d/10norecommends
 raspi_root/etc/apt/apt.conf.d/10norecommends: raspi_root
 	mkdir -p "$</etc/apt/apt.conf.d/"
 	printf 'APT::Install-Recommends "false";\n' >"$@"
 	chmod 644 "$@"
 
-norecommends: raspi_root/etc/apt/apt.conf.d/10norecommends
+apt_keys:
+	-chroot "$@" apt-key add - <./raspbian-archive-keyring.gpg
+	-chroot "$@" apt-key add - <./raspberrypi-archive-keyring.gpg
+	-chroot "$@" apt-key add - <./debian-archive-stretch-stable.gpg
 
-raspi_root/: raspi_root norecommends .FORCE
+raspi_root/: raspi_root norecommends apt_keys .FORCE
 	printf '${SOURCES}' >$@/etc/apt/sources.list
-	-chroot "$@" apt-key add - <./*.gpg
 	-cp /etc/resolv.conf "$@etc/"
 	-chroot "$@" sh -c 'apt-mark showmanual |xargs apt-mark auto'
 	-chroot "$@" apt-get update
@@ -61,9 +69,6 @@ raspi_root/: raspi_root norecommends .FORCE
 	chroot "$@" apt-get --yes install ${PACKAGES}
 	chroot "$@" apt-get --yes --auto-remove purge
 	chroot "$@" apt-get --yes --auto-remove upgrade
-	# chroot "$@" rpi-update || [ -f "$@/boot/bootcode.bin" ]
-	# -[ -d "$@/boot.bak/" ] && rm -r "$@/boot.bak/"
-	sync
 	chroot "$@" apt-get clean
 	chroot "$@" rm /usr/local/sbin/invoke-rc.d
 	touch "$@"
@@ -81,27 +86,32 @@ files/root/.ssh/authorized_keys: id_rsa.pub
 	chmod 700 files/root/ files/root/.ssh/
 	chmod 600 '$@'
 
-include *.mk
+imgfile: raspi_root/  # do not set up image file before chroot
+imgfile: partitions
+	dd bs=1M count=0 seek=1280 of="${IMGFILE}"  # set up sparse file
+	sfdisk "${IMGFILE}" <partitions
 
-raspi.img: raspi_root/ files/ partitions files/root/.ssh/authorized_keys files/etc/network/interfaces.d/wifi
-	-rmdir "$@.mnt"
-	mkdir "$@.mnt"  # fail receipe if dir is nonempty
-	dd bs=1M count=0 seek=1280 of="$@"  # set up sparse file
-	sfdisk "$@" <partitions
-	lo=$$(losetup -f); image='$@'; \
+imgmount: imgfile
+	-rmdir "$@"
+	mkdir "$@"  # fail receipe if dir is nonempty
+	lo=$$(losetup -f); image='${IMGFILE}'; \
 	start=$$(sfdisk --dump "$$image" |sed -rn 's;^.*start= *([0-9]+),.*type=83;\1;p'); \
 	size=$$(sfdisk --dump "$$image" |sed -rn 's;^.*size= *([0-9]+),.*type=83;\1;p'); \
 	losetup -o $$((start * 512)) --sizelimit $$((size * 512)) "$${lo}" "$$image" && \
-	mkfs.ext4 -F "$$lo" && mount -t ext4 "$$lo" "$@.mnt/";
-	mkdir "$@.mnt/boot"
-	lo=$$(losetup -f); image='$@'; \
+	mkfs.ext4 -F "$$lo" && mount -t ext4 "$$lo" "$@/";
+	mkdir "$@/boot"
+	lo=$$(losetup -f); image='${IMGFILE}'; \
 	start=$$(sfdisk --dump "$$image" |sed -rn 's;^.*start= *([0-9]+),.*type=c;\1;p'); \
 	size=$$(sfdisk --dump "$$image" |sed -rn 's;^.*size= *([0-9]+),.*type=c;\1;p'); \
 	losetup -o $$((start * 512)) --sizelimit $$((size * 512)) "$${lo}" "$$image" && \
-	mkfs.fat -F 32 -n boot "$$lo" && mount -t vfat "$$lo" "$@.mnt/boot";
-	cp -a "raspi_root/." "files/." "$@.mnt/"
-	-chroot "$@.mnt/" /root/postbuild.sh
-	umount "$@.mnt/boot/" "$@.mnt/"
-	losetup -a |sed -rn '/$@/{s;^([^:]+):.*$$;\1;p;q}' |xargs losetup -d
-	losetup -a |sed -rn '/$@/{s;^([^:]+):.*$$;\1;p;q}' |xargs losetup -d
-	rmdir "$@.mnt/"
+	mkfs.fat -F 32 -n boot "$$lo" && mount -t vfat "$$lo" "$@/boot";
+
+root_copy: files/root/.ssh/authorized_keys files/etc/network/interfaces.d/wifi
+root_copy: imgmount raspi_root/ files/
+	cp -a "raspi_root/." "files/." "$</"
+
+${IMGFILE}: imgmount root_copy
+	umount "$</boot/" "$</"
+	losetup -a |sed -En '/${IMGFILE}/{s;^([^:]+):.*$$;\1;p;q}' |xargs losetup -d
+	losetup -a |sed -En '/${IMGFILE}/{s;^([^:]+):.*$$;\1;p;q}' |xargs losetup -d
+	rmdir "$</"