From 2b2bb9d6d78404c53bc1ccd31e8094aa1acb2921 Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Sat, 20 Nov 2021 13:51:56 +0100 Subject: [PATCH] Drop extraneous sed-ing of cma= in z50-raspi-firmware hook for Pi 4 (bookworm). Commit 3f9e671fedd54b4a332e5a93e156489600203fad in the boot-consistency branch, which requires an extension to cover the new raspi_4_bookworm build. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5edce42..7806781 100644 --- a/Makefile +++ b/Makefile @@ -158,7 +158,7 @@ raspi_3_bookworm.yaml: raspi_base_bookworm.yaml raspi_4_bookworm.yaml: raspi_base_bookworm.yaml cat raspi_base_bookworm.yaml | sed "s/__ARCH__/arm64/" | \ - sed "s#\(RASPIROOT.*cmdline.txt\)#\1\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#\(RASPIROOT.*cmdline.txt\)#\1\n sed -i 's/cma=64M //' /boot/firmware/cmdline.txt#" | \ 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/" |\