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

diff --git a/Makefile b/Makefile
index 6a35118..58c32d9 100644
--- a/Makefile
+++ b/Makefile
@@ -20,25 +20,22 @@
 BOOTSTRAP = http://raspbian.raspberrypi.org/raspbian
 
 define SOURCES = 
-deb	http://raspbian.raspberrypi.org/raspbian stretch main non-free firmware rpi\n\
-deb	http://archive.raspberrypi.org/debian stretch main\n
+deb	http://raspbian.raspberrypi.org/raspbian stretch main non-free firmware rpi
+deb	http://archive.raspberrypi.org/debian stretch main
 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
+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 psmisc 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 = 
+IMGFILE = raspi.img
 
 config.mk: config.example
 	cp -n "$<" "$@"
+include config.mk
 
-.PHONY: imgfile imgmount root_copy norecommends apt_keys
-
-IMGFILE = raspi.img
+.PHONY: imgfile imgmount root_copy norecommends apt_keys wifi_cfg ssh_key busybox
 
-include config.mk
-include *.mk
+export SOURCES
+export WIFI_CFG
 
 raspi_root:
 	btrfs subvolume create "$@" || mkdir "$@"
@@ -55,37 +52,24 @@ raspi_root/etc/apt/apt.conf.d/10norecommends: raspi_root
 	printf 'APT::Install-Recommends "false";\n' >"$@"
 	chmod 644 "$@"
 
-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
+apt_keys: raspi_root
+	-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 apt_keys .FORCE
-	printf '${SOURCES}' >$@/etc/apt/sources.list
+	printf %s "$$SOURCES" >$@/etc/apt/sources.list
 	-cp /etc/resolv.conf "$@etc/"
 	-chroot "$@" sh -c 'apt-mark showmanual |xargs apt-mark auto'
 	-chroot "$@" apt-get update
 	chroot "$@" ln -sf /bin/true /usr/local/sbin/invoke-rc.d
 	chroot "$@" apt-get --yes install ${PACKAGES}
 	chroot "$@" apt-get --yes --auto-remove purge
-	chroot "$@" apt-get --yes --auto-remove upgrade
+	-chroot "$@" apt-get --yes --auto-remove upgrade
 	chroot "$@" apt-get clean
 	chroot "$@" rm /usr/local/sbin/invoke-rc.d
 	touch "$@"
 
-id_rsa.pub:
-	ssh-keygen -b 2048 -t rsa -N '' -f id_rsa
-
-files/etc/network/interfaces.d/wifi: wifi.tmpl
-	sed 's;#WIFI-SSID#;${WIFI-SSID};; s;#WIFI-PASS#;${WIFI-PASS};;' <'$<' >'$@'
-	chmod 644 '$@'
-
-files/root/.ssh/authorized_keys: id_rsa.pub
-	mkdir -p files/root/.ssh/
-	cat '$<' >>'$@'
-	chmod 700 files/root/ files/root/.ssh/
-	chmod 600 '$@'
-
 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
@@ -106,11 +90,28 @@ imgmount: imgfile
 	losetup -o $$((start * 512)) --sizelimit $$((size * 512)) "$${lo}" "$$image" && \
 	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
+id_rsa.pub:
+	ssh-keygen -b 2048 -t rsa -N '' -f id_rsa
+
+ssh_key: imgmount root_copy id_rsa.pub
+	mkdir -p "$</root/.ssh/"
+	cat id_rsa.pub >>"$</root/.ssh/authorized_keys"
+	chmod 700 "$</root" "$</root/.ssh"
+	chmod 600 "$</root/.ssh/authorized_keys"
+
+wifi_cfg: imgmount root_copy
+	printf '%s\n' "$$WIFI_CFG" >"$</etc/network/interfaces.d/wifi"
+	chmod 644 "$</etc/network/interfaces.d/wifi"
+	chroot "$<" systemctl disable systemd-networkd-wait-online.service
+
+busybox: imgmount root_copy
+	mkdir -p -m 755 "$</opt/busybox"
+	chroot "$<" busybox --install -s /opt/busybox
+
+${IMGFILE}: imgmount root_copy wifi_cfg ssh_key busybox
 	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