put some of the configuration in separate files

diff --git a/.gitignore b/.gitignore
index daa938410b730eab9b1d9c62984ae8271c719f6c..28f18a8a43f988681e2d29280baa717eadcc3d6a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .*.swp
 raspi_root/
 raspi.img
+config.mk

diff --git a/Makefile b/Makefile
index d8f3d9615b11df5d53d3353df3ad3d200159d975..2687a8aeebea49f513b8fa80f824677bd0369e82 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,24 @@
 .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 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
 
-raspi_root: /usr/bin/qemu-arm-static
+include config.mk
+
+config.mk: config.example
+       cp -n "$<" "$@"
+
+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,7 +27,6 @@ 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
@@ -45,11 +37,11 @@ raspi_root/: raspi_root .FORCE
        chroot "$@" apt-get clean
        touch "$@"
 
-raspi.img: raspi_root/
+raspi.img: raspi_root/ partitions
        -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'); \
@@ -61,7 +53,7 @@ raspi.img: raspi_root/
        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/"
+       cp -a "$<" "$@.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

diff --git a/config.example b/config.example
new file mode 100644 (file)
index 0000000..b38bde1
--- /dev/null
+++ b/config.example
@@ -0,0 +1,10 @@
+# Name this file config.mk to override options from the main Makefile
+
+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
+
+# PACKAGES := ${PACKAGES} foo bar ... additional packages

diff --git a/partitions b/partitions
new file mode 100644 (file)
index 0000000..cde042d
--- /dev/null
+++ b/partitions
@@ -0,0 +1,5 @@
+label: dos
+unit: sectors
+
+: start=8192, size=114688, type=1, type=c
+: start=122880, type=83