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

diff --git a/Makefile b/Makefile
index ed769e6..5616e00 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,20 @@
+#  Generator for Oktopus boot media
+#  Copyright (C) 2018 Hochschule für Technik und Wirtschaft Berlin
+#                written by Paul Hänsch <oktopus@plutz.net>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU Affero General Public License for more details.
+#
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 .FORCE:
 
 BOOTSTRAP = http://raspbian.raspberrypi.org/raspbian
@@ -7,7 +24,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 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
+PACKAGES := apt bluez bluez-firmware bluez-tools bridge-utils btrfs-tools busybox-static bzip2 ca-certificates cron deborphan dnsmasq firmware-brcm80211 firmware-linux-free firmware-misc-nonfree 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 pi-bluetooth rpi-update 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 = 
@@ -37,7 +54,8 @@ 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 "$@" rpi-update
+	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
@@ -56,10 +74,13 @@ files/root/.ssh/authorized_keys: id_rsa.pub
 	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
+include gummikraken.mk
+include teesock.mk
+
+raspi.img: raspi_root/ files/ partitions files/root/.ssh/authorized_keys files/etc/network/interfaces.d/wifi files/srv/gummikraken/ files/usr/local/bin/teesock
 	-rmdir "$@.mnt"
 	mkdir "$@.mnt"  # fail receipe if dir is nonempty
-	dd bs=1M count=0 seek=1024 of="$@"  # set up sparse file
+	dd bs=1M count=0 seek=1792 of="$@"  # set up sparse file
 	sfdisk "$@" <partitions
 	lo=$$(losetup -f); image='$@'; \
 	start=$$(sfdisk --dump "$$image" |sed -rn 's;^.*start= *([0-9]+),.*type=83;\1;p'); \