X-Git-Url: http://git.plutz.net/?p=rpi_small;a=blobdiff_plain;f=Makefile;h=ed769e66dd5d9ae84abfd4d994e1b1f09c87d652;hp=2687a8aeebea49f513b8fa80f824677bd0369e82;hb=fbf0b5869a923fc36722bd345208dee5f077ae44;hpb=fba71afea1684a9d83484a8ccbebe8a24bea6da4

diff --git a/Makefile b/Makefile
index 2687a8a..ed769e6 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,11 @@ deb	http://raspbian.raspberrypi.org/raspbian stretch main non-free firmware rpi\
 deb	http://archive.raspberrypi.org/debian stretch main\n
 endef
 
-PACKAGES := apt apt-transport-https bluez bluez-firmware btrfs-tools busybox-static bzip2 ca-certificates cron deborphan firmware-atheros firmware-brcm80211 firmware-libertas firmware-linux-free firmware-misc-nonfree firmware-realtek gzip htop ifupdown init iptables iputils-ping irqbalance isc-dhcp-client less libraspberrypi-bin libraspberrypi0 make net-tools nmap ntpdate openssh-client openssh-server p7zip-full raspberrypi-bootloader raspberrypi-kernel rpi-update rsync ssh sshfs sudo systemd traceroute unace unrar-free unzip vim wget wireless-tools wpasupplicant xz-utils zip
+PACKAGES := apt apt-transport-https bluez bluez-firmware bluez-tools bridge-utils btrfs-tools busybox-static bzip2 ca-certificates cron deborphan dnsmasq firmware-atheros firmware-brcm80211 firmware-libertas firmware-linux-free firmware-misc-nonfree firmware-realtek gzip htop ifupdown init iptables iputils-ping irqbalance isc-dhcp-client less libraspberrypi-bin libraspberrypi0 make net-tools nmap ntpdate openssh-client openssh-server p7zip-full pi-bluetooth rpi-update rsync ssh sshfs sudo systemd traceroute unace unrar-free unzip vim wget wireless-tools wpasupplicant xz-utils zip
+
+# Do not change, only override in config.mk
+WIFI-SSID = 
+WIFI-PASS = 
 
 include config.mk
 
@@ -33,11 +37,26 @@ raspi_root/: raspi_root .FORCE
 	chroot "$@" apt-get --yes install ${PACKAGES}
 	chroot "$@" apt-get --yes --auto-remove purge
 	chroot "$@" apt-get --yes --auto-remove upgrade
-	chroot "$@" rm /usr/local/sbin/invoke-rc.d
+	chroot "$@" rpi-update
+	sync
 	chroot "$@" apt-get clean
+	chroot "$@" rm /usr/local/sbin/invoke-rc.d
 	touch "$@"
 
-raspi.img: raspi_root/ partitions
+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 '$@'
+
+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=1024 of="$@"  # set up sparse file
@@ -46,14 +65,14 @@ raspi.img: raspi_root/ partitions
 	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 "$$lo" && mount -t ext4 "$$lo" "$@.mnt/";
+	mkfs.ext4 -F "$$lo" && mount -t ext4 "$$lo" "$@.mnt/";
 	mkdir "$@.mnt/boot"
 	lo=$$(losetup -f); image='$@'; \
 	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.vfat "$$lo" && mount -t vfat "$$lo" "$@.mnt/boot";
-	cp -a "$<" "$@.mnt/"
+	mkfs.fat -F 32 -n boot "$$lo" && mount -t vfat "$$lo" "$@.mnt/boot";
+	cp -a "raspi_root/." "files/." "$@.mnt/"
 	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