[Buildroot] [git commit] package/rpi-firmware: fix config.txt installation
Yann E. MORIN
yann.morin.1998 at free.fr
Wed Oct 20 16:37:42 UTC 2021
commit: https://git.buildroot.net/buildroot/commit/?id=4fd93fc47fcf5547fc90d4302f58c1052d405e62
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
In commit 689b9ac439ab (package/rpi-firmware: rework boot/config file
handling), a last-minute fixup was made to handle the case where no
config.txt file was provided by the user.
However, the intermediate variable RPI_FIRMWARE_CONFIG_FILE was not used
consistently, and the old PACKAGE_RPI_FIRMWARE_CONFIG_FILE variable was
still used where RPI_FIRMWARE_CONFIG_FILE should have been used instead.
Signed-off-by: Grzegorz Blach <grzegorz at blach.pl>
Reviewed-by: Peter Seiderer <ps.report at gmx.net>
[yann.morin.1998 at free.fr: blame myself for the mess; reword commit log]
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
---
package/rpi-firmware/rpi-firmware.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 8a6a435f63..0929d6af1e 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -28,9 +28,9 @@ define RPI_FIRMWARE_INSTALL_BIN
endef
RPI_FIRMWARE_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE))
-ifneq ($(PACKAGE_RPI_FIRMWARE_CONFIG_FILE),)
+ifneq ($(RPI_FIRMWARE_CONFIG_FILE),)
define RPI_FIRMWARE_INSTALL_CONFIG
- $(INSTALL) -D -m 0644 $(PACKAGE_RPI_FIRMWARE_CONFIG_FILE) \
+ $(INSTALL) -D -m 0644 $(RPI_FIRMWARE_CONFIG_FILE) \
$(BINARIES_DIR)/rpi-firmware/config.txt
endef
endif
More information about the buildroot
mailing list