From 3cdd8af08ddafb735f20fdbb0c622d08beadb6c8 Mon Sep 17 00:00:00 2001
From: Gunnar Wolf <gwolf@gwolf.org>
Date: Fri, 10 Apr 2020 00:22:30 -0500
Subject: [PATCH] Enable stable-proposed-updates for building images for RPi
 0/1 families

---
 Makefile          | 3 +++
 raspi_master.yaml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index 3cb8e3e..d870d44 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ raspi_0w.yaml: raspi_master.yaml
 	sed "s/__LINUX_IMAGE__/linux-image-rpi/" | \
 	sed "s/__EXTRA_PKGS__/- firmware-brcm80211/" | \
 	sed "s/__DTB__/\\/usr\\/lib\\/linux-image-*-rpi\\/bcm*rpi-*.dtb/" |\
+	sed "s/__SPU_ENABLE__/echo 'deb http:\/\/deb.debian.org\/debian\/ stable-proposed-updates main' >> \/etc\/apt\/sources.list # Raspberries 0\/1 need raspi3-firmware >=  1.20190215-1+deb10u3/" |\
 	sed "s/__HOST__/rpi0/" > $@
 
 raspi_2.yaml: raspi_master.yaml
@@ -13,6 +14,7 @@ raspi_2.yaml: raspi_master.yaml
 	sed "s/__LINUX_IMAGE__/linux-image-armmp/" | \
 	grep -v "__EXTRA_PKGS__" | \
 	sed "s/__DTB__/\\/usr\\/lib\\/linux-image-*-armmp\\/bcm*rpi*.dtb/" |\
+	sed "s/__SPU_ENABLE__//" |\
 	sed "s/__HOST__/rpi2/" > $@
 
 raspi_3.yaml: raspi_master.yaml
@@ -20,6 +22,7 @@ raspi_3.yaml: raspi_master.yaml
 	sed "s/__LINUX_IMAGE__/linux-image-arm64/" | \
 	sed "s/__EXTRA_PKGS__/- firmware-brcm80211/" | \
 	sed "s/__DTB__/\\/usr\\/lib\\/linux-image-*-arm64\\/broadcom\\/bcm*rpi*.dtb/" |\
+	sed "s/__SPU_ENABLE__//" |\
 	sed "s/__HOST__/rpi3/" > $@
 
 raspi_0w.img : IMAGE=raspi_0w
diff --git a/raspi_master.yaml b/raspi_master.yaml
index 26fc36c..b82666c 100644
--- a/raspi_master.yaml
+++ b/raspi_master.yaml
@@ -56,6 +56,7 @@ steps:
       # Backports are _not_ enabled by default.
       # Enable them by uncommenting the following line:
       # deb http://deb.debian.org/debian buster-backports main contrib non-free
+      __SPU_ENABLE__
     unless: rootfs_unpacked
 
   - chroot: /