diff mbox series

package/rpi-firmware: Fix config.txt installation

Message ID 20211020120327.5768-1-grzegorz@blach.pl
State Accepted
Headers show
Series package/rpi-firmware: Fix config.txt installation | expand

Commit Message

Grzegorz Blach Oct. 20, 2021, 12:03 p.m. UTC
Variable PACKAGE_RPI_FIRMWARE_CONFIG_FILE is always undefined,
so RPI_FIRMWARE_CONFIG_FILE should be used instead.

Signed-off-by: Grzegorz Blach <grzegorz@blach.pl>
---
 package/rpi-firmware/rpi-firmware.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Peter Seiderer Oct. 20, 2021, 4:30 p.m. UTC | #1
Hello Grzegorz,

On Wed, 20 Oct 2021 14:03:24 +0200, Grzegorz Blach <grzegorz@blach.pl> wrote:

> Variable PACKAGE_RPI_FIRMWARE_CONFIG_FILE is always undefined,
> so RPI_FIRMWARE_CONFIG_FILE should be used instead.
>
> Signed-off-by: Grzegorz Blach <grzegorz@blach.pl>
> ---
>  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

Thanks for spotting (and fixing) this...

Reviewed-by: Peter Seiderer <ps.report@gmx.net>

Regards,
Peter
Yann E. MORIN Oct. 20, 2021, 4:39 p.m. UTC | #2
Grzegorz, All,

On 2021-10-20 14:03 +0200, Grzegorz Blach spake thusly:
> Variable PACKAGE_RPI_FIRMWARE_CONFIG_FILE is always undefined,
> so RPI_FIRMWARE_CONFIG_FILE should be used instead.
> 
> Signed-off-by: Grzegorz Blach <grzegorz@blach.pl>

Applied to master, after rewriting the commit log to blame myself with
the last-minute change. Thanks!

Regards,
Yann E. MORIN.

> ---
>  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
> -- 
> 2.27.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
diff mbox series

Patch

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