Merge branch 'pi4-wifi-firmware' into 'master'

pi4: remove wget hack needed for the wifi driver

See merge request raspi-team/image-specs!23
This commit is contained in:
Gunnar Wolf 2020-08-14 22:50:35 +00:00
commit 30314a7f8e
1 changed files with 1 additions and 2 deletions

View File

@ -40,10 +40,9 @@ raspi_4.yaml: raspi_master.yaml
sed "s#apt-get update#echo 'APT::Default-Release \"stable\";' > /etc/apt/apt.conf\n apt-get update#" | \
sed "s#cmdline.txt#cmdline.txt\n sed -i 's/cma=64M //' /boot/firmware/cmdline.txt\n sed -i 's/cma=\\\$$CMA //' /etc/kernel/postinst.d/z50-raspi-firmware#" | \
sed "s/__LINUX_IMAGE__/linux-image-arm64\/unstable/" | \
sed "s/__EXTRA_PKGS__/- firmware-brcm80211/" | \
sed "s/__EXTRA_PKGS__/- firmware-brcm80211\/unstable/" | \
sed "s/__DTB__/\\/usr\\/lib\\/linux-image-*-arm64\\/broadcom\\/bcm*rpi*.dtb/" |\
sed "s/__OTHER_APT_ENABLE__/deb http:\/\/deb.debian.org\/debian\/ unstable main contrib non-free # raspi 4 needs the latest kernel (5.5 or higher) and raspi-firmware newer than buster's/" |\
sed "s#hostname\"#hostname\"\n wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt -P \"\\\$${ROOT?}/lib/firmware/brcm\"#" |\
sed "s/__HOST__/rpi4/" > $@
%.sha256: %.img.xz