From aad5a5a48946fc64fcaa0da8f6d23cc613ce0a27 Mon Sep 17 00:00:00 2001 From: Gunnar Wolf Date: Fri, 24 Apr 2020 11:00:10 -0500 Subject: [PATCH] =?UTF-8?q?non-free=20must=20be=20enabled=20for=20updated?= =?UTF-8?q?=20raspi3-firmware=20on=20armel=20to=20be=20pulled=20in=20:-?= =?UTF-8?q?=C3=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 6 +++--- raspi_master.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8cb1f07..cfc120a 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,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__/deb http:\/\/deb.debian.org\/debian\/ stable-proposed-updates main # Raspberries 0\/1 need raspi3-firmware >= 1.20190215-1+deb10u3/" |\ + sed "s/__OTHER_APT_ENABLE__/deb http:\/\/deb.debian.org\/debian\/ buster-proposed-updates main contrib non-free # Raspberries 0\/1 need raspi3-firmware >= 1.20190215-1+deb10u3/" |\ sed "s/__HOST__/rpi0/" > $@ raspi_2.yaml: raspi_master.yaml @@ -18,7 +18,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/__OTHER_APT_ENABLE__//" |\ sed "s/__HOST__/rpi2/" > $@ raspi_3.yaml: raspi_master.yaml @@ -26,7 +26,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/__OTHER_APT_ENABLE__//" |\ sed "s/__HOST__/rpi3/" > $@ %.sha256: %.img.xz diff --git a/raspi_master.yaml b/raspi_master.yaml index b82666c..e661744 100644 --- a/raspi_master.yaml +++ b/raspi_master.yaml @@ -56,7 +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__ + __OTHER_APT_ENABLE__ unless: rootfs_unpacked - chroot: /