bluetooth NAP requirements

[rpi_small] / Makefile

diff --git a/Makefile b/Makefile
index d8f3d9615b11df5d53d3353df3ad3d200159d975..ed769e66dd5d9ae84abfd4d994e1b1f09c87d652 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,28 @@
 .FORCE:
 
-define PARTITIONS =
-label: dos\n\
-unit: sectors\n\
-\n\
-: start=8192, size=114688, type=1, type=c\n\
-: start=122880, type=83\n
-endef
+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
 endef
-BOOTSTRAP := http://raspbian.raspberrypi.org/raspbian
 
-define SOURCES = 
-deb    http://localhost/raspbian stretch main non-free firmware rpi\n
-endef
-BOOTSTRAP := http://localhost/raspbian
+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
 
-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
+config.mk: config.example
+       cp -n "$<" "$@"
 
-raspi_root: /usr/bin/qemu-arm-static
+raspi_root:
        btrfs subvolume create "$@" || mkdir "$@"
        mkdir -p "$@/usr/bin"
        chmod 755 -R "$@/"
-       cp -p "$<" "$@/usr/bin/"
+       cp -p "/usr/bin/qemu-arm-static" "$@/usr/bin/"
        debootstrap --keyring=./raspbian-archive-keyring.gpg \
                --arch=armhf --variant=minbase \
                stretch "$@/" "${BOOTSTRAP}"
@@ -34,34 +31,48 @@ raspi_root/: raspi_root .FORCE
        printf '${SOURCES}' >$@/etc/apt/sources.list
        -chroot "$@" apt-key add - <./raspberrypi-archive-keyring.gpg
        -cp /etc/resolv.conf "$@etc/"
-       # for tree in ${CONFIG}; do for file in apt default timezone; do cp -av "$$tree/etc/$$file" "$@/etc/" || true; done; done
        -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 "$@" 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/
+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"
-       dd bs=1M count=0 seek=1024 of="$@"
-       printf '${PARTITIONS}' |sfdisk "$@"
+       mkdir "$@.mnt"  # fail receipe if dir is nonempty
+       dd bs=1M count=0 seek=1024 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'); \
        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";
-       rsync -av "$<" "$@.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