X-Git-Url: http://git.plutz.net/?p=rpi_small;a=blobdiff_plain;f=Makefile;h=8e8fe91252f56b41c60c6894b772fbe16849e840;hp=74ef7220a7b94006fa130bd63ca27fb8a9939b46;hb=462f5b00c78def3eef69550b76e7e56f706e6f80;hpb=63f5365f3c59d3a757a3184e254fecc936a1fd56

diff --git a/Makefile b/Makefile
index 74ef722..8e8fe91 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ 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 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 openbsd-inetd 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 = 
@@ -37,8 +37,10 @@ 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 || [ -f "$@/boot/bootcode.bin" ]
+	sync
 	chroot "$@" apt-get clean
+	chroot "$@" rm /usr/local/sbin/invoke-rc.d
 	touch "$@"
 
 id_rsa.pub:
@@ -46,6 +48,7 @@ id_rsa.pub:
 
 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/