non-free must be enabled for updated raspi3-firmware on armel to be pulled in :-Þ

This commit is contained in:
Gunnar Wolf 2020-04-24 11:00:10 -05:00
parent 5add9a4a01
commit aad5a5a489
2 changed files with 4 additions and 4 deletions

View File

@ -10,7 +10,7 @@ raspi_0w.yaml: raspi_master.yaml
sed "s/__LINUX_IMAGE__/linux-image-rpi/" | \ sed "s/__LINUX_IMAGE__/linux-image-rpi/" | \
sed "s/__EXTRA_PKGS__/- firmware-brcm80211/" | \ sed "s/__EXTRA_PKGS__/- firmware-brcm80211/" | \
sed "s/__DTB__/\\/usr\\/lib\\/linux-image-*-rpi\\/bcm*rpi-*.dtb/" |\ 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/" > $@ sed "s/__HOST__/rpi0/" > $@
raspi_2.yaml: raspi_master.yaml raspi_2.yaml: raspi_master.yaml
@ -18,7 +18,7 @@ raspi_2.yaml: raspi_master.yaml
sed "s/__LINUX_IMAGE__/linux-image-armmp/" | \ sed "s/__LINUX_IMAGE__/linux-image-armmp/" | \
grep -v "__EXTRA_PKGS__" | \ grep -v "__EXTRA_PKGS__" | \
sed "s/__DTB__/\\/usr\\/lib\\/linux-image-*-armmp\\/bcm*rpi*.dtb/" |\ sed "s/__DTB__/\\/usr\\/lib\\/linux-image-*-armmp\\/bcm*rpi*.dtb/" |\
sed "s/__SPU_ENABLE__//" |\ sed "s/__OTHER_APT_ENABLE__//" |\
sed "s/__HOST__/rpi2/" > $@ sed "s/__HOST__/rpi2/" > $@
raspi_3.yaml: raspi_master.yaml 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/__LINUX_IMAGE__/linux-image-arm64/" | \
sed "s/__EXTRA_PKGS__/- firmware-brcm80211/" | \ sed "s/__EXTRA_PKGS__/- firmware-brcm80211/" | \
sed "s/__DTB__/\\/usr\\/lib\\/linux-image-*-arm64\\/broadcom\\/bcm*rpi*.dtb/" |\ 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/" > $@ sed "s/__HOST__/rpi3/" > $@
%.sha256: %.img.xz %.sha256: %.img.xz

View File

@ -56,7 +56,7 @@ steps:
# Backports are _not_ enabled by default. # Backports are _not_ enabled by default.
# Enable them by uncommenting the following line: # Enable them by uncommenting the following line:
# deb http://deb.debian.org/debian buster-backports main contrib non-free # deb http://deb.debian.org/debian buster-backports main contrib non-free
__SPU_ENABLE__ __OTHER_APT_ENABLE__
unless: rootfs_unpacked unless: rootfs_unpacked
- chroot: / - chroot: /