From 0304a4e5b9e4f38843d6dde19e12d1130e2c7458 Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Wed, 22 Jul 2020 17:31:12 -0400 Subject: [PATCH] pi4: remove wget hack needed for the wifi driver This nvram file is now included in firmware-brcm80211 as of 20200421-1 (which is in both unstable and testing). --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1e14008..e9a4738 100644 --- a/Makefile +++ b/Makefile @@ -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