All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/4] package/qoriq-cadence-dp-firmware: fix license info
@ 2022-08-15 16:56 Francois Perrad
  2022-08-15 16:56 ` [Buildroot] [PATCH 2/4] package/pkg-utils.mk: move FREESCALE_IMX_EXTRACT_HELPER Francois Perrad
                   ` (4 more replies)
  0 siblings, 5 replies; 9+ messages in thread
From: Francois Perrad @ 2022-08-15 16:56 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 .../qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash  | 2 ++
 .../qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash
index d302d9278..88ac3db97 100644
--- a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash
+++ b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash
@@ -1,3 +1,5 @@
 # Locally calculated
 sha256  5871c5717be32f14a59624d5699d405e8ce9ae2e9c9ef86fd16e13d264a40e58  firmware-cadence-lsdk1909.bin
 sha256  d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561  COPYING
+sha256  9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7  EULA
+sha256  53e3eb0b2bd81c171fa04c17514e20b39b7bb1fe1224c593f7717f615fb9d52b  EULA.txt
diff --git a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk
index 23643d24e..7d701c4ac 100644
--- a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk
+++ b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk
@@ -7,8 +7,8 @@
 QORIQ_CADENCE_DP_FIRMWARE_VERSION = lsdk1909
 QORIQ_CADENCE_DP_FIRMWARE_SITE = http://www.nxp.com/lgfiles/sdk/$(QORIQ_CADENCE_DP_FIRMWARE_VERSION)
 QORIQ_CADENCE_DP_FIRMWARE_SOURCE = firmware-cadence-$(QORIQ_CADENCE_DP_FIRMWARE_VERSION).bin
-QORIQ_CADENCE_DP_FIRMWARE_LICENSE = NXP-Binary-EULA
-QORIQ_CADENCE_DP_FIRMWARE_LICENSE_FILES = COPYING
+QORIQ_CADENCE_DP_FIRMWARE_LICENSE = NXP Semiconductor Software License Agreement
+QORIQ_CADENCE_DP_FIRMWARE_LICENSE_FILES = COPYING EULA EULA.txt
 QORIQ_CADENCE_DP_FIRMWARE_REDISTRIBUTE = NO
 QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES = YES
 QORIQ_CADENCE_DP_FIRMWARE_INSTALL_TARGET = NO
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [Buildroot] [PATCH 2/4] package/pkg-utils.mk: move FREESCALE_IMX_EXTRACT_HELPER
  2022-08-15 16:56 [Buildroot] [PATCH 1/4] package/qoriq-cadence-dp-firmware: fix license info Francois Perrad
@ 2022-08-15 16:56 ` Francois Perrad
  2022-08-15 19:01   ` Yann E. MORIN
  2022-08-15 16:56 ` [Buildroot] [PATCH 3/4] package/freescale-imx: rename FREESCALE_IMX_EXTRACT_HELPER to NXP_EXTRACT_HELPER Francois Perrad
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 9+ messages in thread
From: Francois Perrad @ 2022-08-15 16:56 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/freescale-imx/freescale-imx.mk | 25 -------------------------
 package/pkg-utils.mk                   | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
index 84a1725cc..5f32a098a 100644
--- a/package/freescale-imx/freescale-imx.mk
+++ b/package/freescale-imx/freescale-imx.mk
@@ -6,29 +6,4 @@
 
 FREESCALE_IMX_SITE = http://www.nxp.com/lgfiles/NMG/MAD/YOCTO
 
-# Helper for self-extracting binaries distributed by Freescale.
-#
-# The --force option makes sure it doesn't fail if the source
-# directory already exists. The --auto-accept skips the license check,
-# as it is not needed in Buildroot because we have legal-info. Since
-# there's a EULA in the binary file, we extract it in this macro, and
-# it should therefore be added to the LICENSE_FILES variable of
-# packages using this macro. Also, remember to set REDISTRIBUTE to
-# "NO". Indeed, this is a legal minefield: the EULA specifies that the
-# Board Support Package includes software and hardware (sic!) for
-# which a separate license is needed...
-#
-# $(1): full path to the archive file
-#
-define FREESCALE_IMX_EXTRACT_HELPER
-	awk 'BEGIN      { start = 0; } \
-	     /^EOEULA/  { start = 0; } \
-	                { if (start) print; } \
-	     /<<EOEULA/ { start = 1; }' \
-	    $(1) > $(@D)/EULA
-	cd $(@D) && sh $(1) --force --auto-accept
-	find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \;
-	rmdir $(@D)/$(basename $(notdir $(1)))
-endef
-
 include $(sort $(wildcard package/freescale-imx/*/*.mk))
diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index 6ece27baa..57f4af04c 100644
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -275,3 +275,28 @@ legal-deps = \
         $(filter-out $(if $(1:host-%=),host-%),\
             $(call non-virtual-deps,\
                 $($(call UPPERCASE,$(1))_FINAL_RECURSIVE_DEPENDENCIES))),$(p) [$($(call UPPERCASE,$(p))_LICENSE)])
+
+# Helper for self-extracting binaries distributed by Freescale.
+#
+# The --force option makes sure it doesn't fail if the source
+# directory already exists. The --auto-accept skips the license check,
+# as it is not needed in Buildroot because we have legal-info. Since
+# there's a EULA in the binary file, we extract it in this macro, and
+# it should therefore be added to the LICENSE_FILES variable of
+# packages using this macro. Also, remember to set REDISTRIBUTE to
+# "NO". Indeed, this is a legal minefield: the EULA specifies that the
+# Board Support Package includes software and hardware (sic!) for
+# which a separate license is needed...
+#
+# $(1): full path to the archive file
+#
+define FREESCALE_IMX_EXTRACT_HELPER
+	awk 'BEGIN      { start = 0; } \
+	     /^EOEULA/  { start = 0; } \
+	                { if (start) print; } \
+	     /<<EOEULA/ { start = 1; }' \
+	    $(1) > $(@D)/EULA
+	cd $(@D) && sh $(1) --force --auto-accept
+	find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \;
+	rmdir $(@D)/$(basename $(notdir $(1)))
+endef
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [Buildroot] [PATCH 3/4] package/freescale-imx: rename FREESCALE_IMX_EXTRACT_HELPER to NXP_EXTRACT_HELPER
  2022-08-15 16:56 [Buildroot] [PATCH 1/4] package/qoriq-cadence-dp-firmware: fix license info Francois Perrad
  2022-08-15 16:56 ` [Buildroot] [PATCH 2/4] package/pkg-utils.mk: move FREESCALE_IMX_EXTRACT_HELPER Francois Perrad
@ 2022-08-15 16:56 ` Francois Perrad
  2022-08-15 19:02   ` Yann E. MORIN
  2022-08-15 16:56 ` [Buildroot] [PATCH 4/4] package/qoriq-cadence-dp-firmware: refactor with NXP_EXTRACT_HELPER Francois Perrad
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 9+ messages in thread
From: Francois Perrad @ 2022-08-15 16:56 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/freescale-imx/firmware-imx/firmware-imx.mk           | 2 +-
 package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk   | 2 +-
 package/freescale-imx/imx-codec/imx-codec.mk                 | 2 +-
 package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk             | 2 +-
 package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk             | 2 +-
 package/freescale-imx/imx-parser/imx-parser.mk               | 2 +-
 package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk     | 2 +-
 package/freescale-imx/imx-seco/imx-seco.mk                   | 2 +-
 package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk | 2 +-
 package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk       | 2 +-
 package/freescale-imx/imx-vpu/imx-vpu.mk                     | 2 +-
 package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk             | 2 +-
 package/freescale-imx/libz160/libz160.mk                     | 2 +-
 package/pkg-utils.mk                                         | 4 ++--
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
index 47c21585a..4884079d5 100644
--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
+++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
@@ -15,7 +15,7 @@ FIRMWARE_IMX_REDISTRIBUTE = NO
 FIRMWARE_IMX_INSTALL_IMAGES = YES
 
 define FIRMWARE_IMX_EXTRACT_CMDS
-	$(call FREESCALE_IMX_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE))
+	$(call NXP_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE))
 endef
 
 #
diff --git a/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk b/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk
index c99c568f7..895fedc2e 100644
--- a/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk
+++ b/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk
@@ -23,7 +23,7 @@ GPU_AMD_BIN_MX51_LICENSE_FILES = EULA
 GPU_AMD_BIN_MX51_REDISTRIBUTE = NO
 
 define GPU_AMD_BIN_MX51_EXTRACT_CMDS
-	$(call FREESCALE_IMX_EXTRACT_HELPER,$(GPU_AMD_BIN_MX51_DL_DIR)/$(GPU_AMD_BIN_MX51_SOURCE))
+	$(call NXP_EXTRACT_HELPER,$(GPU_AMD_BIN_MX51_DL_DIR)/$(GPU_AMD_BIN_MX51_SOURCE))
 endef
 
 # Upstream headers need to be compiled with -D_LINUX. It is more convenient
diff --git a/package/freescale-imx/imx-codec/imx-codec.mk b/package/freescale-imx/imx-codec/imx-codec.mk
index 1ec701d2f..2b7c346a6 100644
--- a/package/freescale-imx/imx-codec/imx-codec.mk
+++ b/package/freescale-imx/imx-codec/imx-codec.mk
@@ -26,7 +26,7 @@ IMX_CODEC_CONF_OPTS += --enable-vpu
 endif
 
 define IMX_CODEC_EXTRACT_CMDS
-	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_CODEC_DL_DIR)/$(IMX_CODEC_SOURCE))
+	$(call NXP_EXTRACT_HELPER,$(IMX_CODEC_DL_DIR)/$(IMX_CODEC_SOURCE))
 endef
 
 # FIXME The Makefile installs both the arm9 and arm11 versions of the
diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
index 0e4078a96..c5df87e61 100644
--- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
+++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
@@ -19,7 +19,7 @@ IMX_GPU_G2D_LICENSE_FILES = EULA COPYING
 IMX_GPU_G2D_REDISTRIBUTE = NO
 
 define IMX_GPU_G2D_EXTRACT_CMDS
-	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_GPU_G2D_DL_DIR)/$(IMX_GPU_G2D_SOURCE))
+	$(call NXP_EXTRACT_HELPER,$(IMX_GPU_G2D_DL_DIR)/$(IMX_GPU_G2D_SOURCE))
 endef
 
 define IMX_GPU_G2D_INSTALL_STAGING_CMDS
diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
index 1d76d79e2..63d5d3c2e 100644
--- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
@@ -44,7 +44,7 @@ IMX_GPU_VIV_DEPENDENCIES += wayland
 endif
 
 define IMX_GPU_VIV_EXTRACT_CMDS
-	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_GPU_VIV_DL_DIR)/$(IMX_GPU_VIV_SOURCE))
+	$(call NXP_EXTRACT_HELPER,$(IMX_GPU_VIV_DL_DIR)/$(IMX_GPU_VIV_SOURCE))
 endef
 
 ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb)
diff --git a/package/freescale-imx/imx-parser/imx-parser.mk b/package/freescale-imx/imx-parser/imx-parser.mk
index fc4376f04..dccb8829d 100644
--- a/package/freescale-imx/imx-parser/imx-parser.mk
+++ b/package/freescale-imx/imx-parser/imx-parser.mk
@@ -24,7 +24,7 @@ IMX_PARSER_CONF_OPTS += --enable-fsw
 endif
 
 define IMX_PARSER_EXTRACT_CMDS
-	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_PARSER_DL_DIR)/$(IMX_PARSER_SOURCE))
+	$(call NXP_EXTRACT_HELPER,$(IMX_PARSER_DL_DIR)/$(IMX_PARSER_SOURCE))
 endef
 
 # The Makefile installs several versions of the libraries, but we only
diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
index bbb731030..6a304c0c8 100644
--- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
+++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
@@ -13,7 +13,7 @@ IMX_SC_FIRMWARE_LICENSE_FILES = EULA COPYING
 IMX_SC_FIRMWARE_REDISTRIBUTE = NO
 
 define IMX_SC_FIRMWARE_EXTRACT_CMDS
-	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_SC_FIRMWARE_DL_DIR)/$(IMX_SC_FIRMWARE_SOURCE))
+	$(call NXP_EXTRACT_HELPER,$(IMX_SC_FIRMWARE_DL_DIR)/$(IMX_SC_FIRMWARE_SOURCE))
 endef
 
 IMX_SC_FIRMWARE_INSTALL_IMAGES = YES
diff --git a/package/freescale-imx/imx-seco/imx-seco.mk b/package/freescale-imx/imx-seco/imx-seco.mk
index 79c9722c4..987f24658 100644
--- a/package/freescale-imx/imx-seco/imx-seco.mk
+++ b/package/freescale-imx/imx-seco/imx-seco.mk
@@ -13,7 +13,7 @@ IMX_SECO_LICENSE_FILES = EULA COPYING
 IMX_SECO_REDISTRIBUTE = NO
 
 define IMX_SECO_EXTRACT_CMDS
-	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_SECO_DL_DIR)/$(IMX_SECO_SOURCE))
+	$(call NXP_EXTRACT_HELPER,$(IMX_SECO_DL_DIR)/$(IMX_SECO_SOURCE))
 endef
 
 IMX_SECO_INSTALL_IMAGES = YES
diff --git a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk
index b07e11667..5f4c6faee 100644
--- a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk
+++ b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk
@@ -14,7 +14,7 @@ IMX_VPU_HANTRO_VC_LICENSE_FILES = EULA COPYING
 IMX_VPU_HANTRO_VC_REDISTRIBUTE = NO
 
 define IMX_VPU_HANTRO_VC_EXTRACT_CMDS
-	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPU_HANTRO_VC_DL_DIR)/$(IMX_VPU_HANTRO_VC_SOURCE))
+	$(call NXP_EXTRACT_HELPER,$(IMX_VPU_HANTRO_VC_DL_DIR)/$(IMX_VPU_HANTRO_VC_SOURCE))
 endef
 
 define IMX_VPU_HANTRO_VC_INSTALL_TARGET_CMDS
diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
index 360591b44..9d34c7add 100644
--- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
+++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
@@ -23,7 +23,7 @@ IMX_VPU_HANTRO_LICENSE_FILES = EULA COPYING
 IMX_VPU_HANTRO_REDISTRIBUTE = NO
 
 define IMX_VPU_HANTRO_EXTRACT_CMDS
-	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPU_HANTRO_DL_DIR)/$(IMX_VPU_HANTRO_SOURCE))
+	$(call NXP_EXTRACT_HELPER,$(IMX_VPU_HANTRO_DL_DIR)/$(IMX_VPU_HANTRO_SOURCE))
 endef
 
 define IMX_VPU_HANTRO_BUILD_CMDS
diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk
index 14a1a7a9f..cae3d88b6 100644
--- a/package/freescale-imx/imx-vpu/imx-vpu.mk
+++ b/package/freescale-imx/imx-vpu/imx-vpu.mk
@@ -21,7 +21,7 @@ IMX_VPU_LICENSE_FILES = EULA COPYING
 IMX_VPU_REDISTRIBUTE = NO
 
 define IMX_VPU_EXTRACT_CMDS
-	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPU_DL_DIR)/$(IMX_VPU_SOURCE))
+	$(call NXP_EXTRACT_HELPER,$(IMX_VPU_DL_DIR)/$(IMX_VPU_SOURCE))
 endef
 
 define IMX_VPU_BUILD_CMDS
diff --git a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk
index 4f8916540..4bee1cf64 100644
--- a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk
+++ b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk
@@ -22,7 +22,7 @@ IMX_VPUWRAP_LICENSE_FILES = EULA COPYING
 IMX_VPUWRAP_REDISTRIBUTE = NO
 
 define IMX_VPUWRAP_EXTRACT_CMDS
-	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPUWRAP_DL_DIR)/$(IMX_VPUWRAP_SOURCE))
+	$(call NXP_EXTRACT_HELPER,$(IMX_VPUWRAP_DL_DIR)/$(IMX_VPUWRAP_SOURCE))
 endef
 
 $(eval $(autotools-package))
diff --git a/package/freescale-imx/libz160/libz160.mk b/package/freescale-imx/libz160/libz160.mk
index 5b1feeb44..a15b5f6b6 100644
--- a/package/freescale-imx/libz160/libz160.mk
+++ b/package/freescale-imx/libz160/libz160.mk
@@ -15,7 +15,7 @@ LIBZ160_LICENSE_FILES = EULA
 LIBZ160_REDISTRIBUTE = NO
 
 define LIBZ160_EXTRACT_CMDS
-	$(call FREESCALE_IMX_EXTRACT_HELPER,$(LIBZ160_DL_DIR)/$(LIBZ160_SOURCE))
+	$(call NXP_EXTRACT_HELPER,$(LIBZ160_DL_DIR)/$(LIBZ160_SOURCE))
 endef
 
 define LIBZ160_INSTALL_STAGING_CMDS
diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index 57f4af04c..32a5c8c95 100644
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -276,7 +276,7 @@ legal-deps = \
             $(call non-virtual-deps,\
                 $($(call UPPERCASE,$(1))_FINAL_RECURSIVE_DEPENDENCIES))),$(p) [$($(call UPPERCASE,$(p))_LICENSE)])
 
-# Helper for self-extracting binaries distributed by Freescale.
+# Helper for self-extracting binaries distributed by NXP.
 #
 # The --force option makes sure it doesn't fail if the source
 # directory already exists. The --auto-accept skips the license check,
@@ -290,7 +290,7 @@ legal-deps = \
 #
 # $(1): full path to the archive file
 #
-define FREESCALE_IMX_EXTRACT_HELPER
+define NXP_EXTRACT_HELPER
 	awk 'BEGIN      { start = 0; } \
 	     /^EOEULA/  { start = 0; } \
 	                { if (start) print; } \
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [Buildroot] [PATCH 4/4] package/qoriq-cadence-dp-firmware: refactor with NXP_EXTRACT_HELPER
  2022-08-15 16:56 [Buildroot] [PATCH 1/4] package/qoriq-cadence-dp-firmware: fix license info Francois Perrad
  2022-08-15 16:56 ` [Buildroot] [PATCH 2/4] package/pkg-utils.mk: move FREESCALE_IMX_EXTRACT_HELPER Francois Perrad
  2022-08-15 16:56 ` [Buildroot] [PATCH 3/4] package/freescale-imx: rename FREESCALE_IMX_EXTRACT_HELPER to NXP_EXTRACT_HELPER Francois Perrad
@ 2022-08-15 16:56 ` Francois Perrad
  2022-08-15 19:02   ` Yann E. MORIN
  2022-08-15 18:46 ` [Buildroot] [PATCH 1/4] package/qoriq-cadence-dp-firmware: fix license info Yann E. MORIN
  2022-09-16 14:11 ` Peter Korsgaard
  4 siblings, 1 reply; 9+ messages in thread
From: Francois Perrad @ 2022-08-15 16:56 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 .../qoriq-cadence-dp-firmware.mk              | 27 +------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk
index 7d701c4ac..8cc2200a1 100644
--- a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk
+++ b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk
@@ -13,33 +13,8 @@ QORIQ_CADENCE_DP_FIRMWARE_REDISTRIBUTE = NO
 QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES = YES
 QORIQ_CADENCE_DP_FIRMWARE_INSTALL_TARGET = NO
 
-# Helper for self-extracting binaries distributed by NXP.
-#
-# The --force option makes sure it doesn't fail if the source
-# directory already exists. The --auto-accept skips the license check,
-# as it is not needed in Buildroot because we have legal-info. Since
-# there's a EULA in the binary file, we extract it in this macro, and
-# it should therefore be added to the LICENSE_FILES variable of
-# packages using this macro. Also, remember to set REDISTRIBUTE to
-# "NO". Indeed, this is a legal minefield: the EULA specifies that the
-# Board Support Package includes software and hardware (sic!) for
-# which a separate license is needed...
-#
-# $(1): full path to the archive file
-#
-define QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_HELPER
-	awk 'BEGIN      { start = 0; } \
-	     /^EOEULA/  { start = 0; } \
-	                { if (start) print; } \
-	     /<<EOEULA/ { start = 1; }' \
-	    $(1) > $(@D)/EULA
-	cd $(@D) && sh $(1) --force --auto-accept
-	find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \;
-	rmdir $(@D)/$(basename $(notdir $(1)))
-endef
-
 define QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_CMDS
-	$(call QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_HELPER,$(QORIQ_CADENCE_DP_FIRMWARE_DL_DIR)/$(QORIQ_CADENCE_DP_FIRMWARE_SOURCE))
+	$(call NXP_EXTRACT_HELPER,$(QORIQ_CADENCE_DP_FIRMWARE_DL_DIR)/$(QORIQ_CADENCE_DP_FIRMWARE_SOURCE))
 endef
 
 define QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES_CMDS
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [Buildroot] [PATCH 1/4] package/qoriq-cadence-dp-firmware: fix license info
  2022-08-15 16:56 [Buildroot] [PATCH 1/4] package/qoriq-cadence-dp-firmware: fix license info Francois Perrad
                   ` (2 preceding siblings ...)
  2022-08-15 16:56 ` [Buildroot] [PATCH 4/4] package/qoriq-cadence-dp-firmware: refactor with NXP_EXTRACT_HELPER Francois Perrad
@ 2022-08-15 18:46 ` Yann E. MORIN
  2022-09-16 14:11 ` Peter Korsgaard
  4 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2022-08-15 18:46 UTC (permalink / raw)
  To: Francois Perrad; +Cc: buildroot

François, All,

On 2022-08-15 18:56 +0200, Francois Perrad spake thusly:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  .../qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash  | 2 ++
>  .../qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk    | 4 ++--
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash
> index d302d9278..88ac3db97 100644
> --- a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash
> +++ b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash
> @@ -1,3 +1,5 @@
>  # Locally calculated
>  sha256  5871c5717be32f14a59624d5699d405e8ce9ae2e9c9ef86fd16e13d264a40e58  firmware-cadence-lsdk1909.bin
>  sha256  d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561  COPYING
> +sha256  9665930f69c0b6f4a4c055d7fe2b8ee563e771efbc83892abb1955e61492cdf7  EULA
> +sha256  53e3eb0b2bd81c171fa04c17514e20b39b7bb1fe1224c593f7717f615fb9d52b  EULA.txt
> diff --git a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk
> index 23643d24e..7d701c4ac 100644
> --- a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk
> +++ b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk
> @@ -7,8 +7,8 @@
>  QORIQ_CADENCE_DP_FIRMWARE_VERSION = lsdk1909
>  QORIQ_CADENCE_DP_FIRMWARE_SITE = http://www.nxp.com/lgfiles/sdk/$(QORIQ_CADENCE_DP_FIRMWARE_VERSION)
>  QORIQ_CADENCE_DP_FIRMWARE_SOURCE = firmware-cadence-$(QORIQ_CADENCE_DP_FIRMWARE_VERSION).bin
> -QORIQ_CADENCE_DP_FIRMWARE_LICENSE = NXP-Binary-EULA
> -QORIQ_CADENCE_DP_FIRMWARE_LICENSE_FILES = COPYING
> +QORIQ_CADENCE_DP_FIRMWARE_LICENSE = NXP Semiconductor Software License Agreement
> +QORIQ_CADENCE_DP_FIRMWARE_LICENSE_FILES = COPYING EULA EULA.txt
>  QORIQ_CADENCE_DP_FIRMWARE_REDISTRIBUTE = NO
>  QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES = YES
>  QORIQ_CADENCE_DP_FIRMWARE_INSTALL_TARGET = NO
> -- 
> 2.34.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [Buildroot] [PATCH 2/4] package/pkg-utils.mk: move FREESCALE_IMX_EXTRACT_HELPER
  2022-08-15 16:56 ` [Buildroot] [PATCH 2/4] package/pkg-utils.mk: move FREESCALE_IMX_EXTRACT_HELPER Francois Perrad
@ 2022-08-15 19:01   ` Yann E. MORIN
  0 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2022-08-15 19:01 UTC (permalink / raw)
  To: Francois Perrad; +Cc: buildroot

François, All,

On 2022-08-15 18:56 +0200, Francois Perrad spake thusly:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

This comit log was bit too short, so I extended it with a rationale for
the move.

Applied to next, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/freescale-imx/freescale-imx.mk | 25 -------------------------
>  package/pkg-utils.mk                   | 25 +++++++++++++++++++++++++
>  2 files changed, 25 insertions(+), 25 deletions(-)
> 
> diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
> index 84a1725cc..5f32a098a 100644
> --- a/package/freescale-imx/freescale-imx.mk
> +++ b/package/freescale-imx/freescale-imx.mk
> @@ -6,29 +6,4 @@
>  
>  FREESCALE_IMX_SITE = http://www.nxp.com/lgfiles/NMG/MAD/YOCTO
>  
> -# Helper for self-extracting binaries distributed by Freescale.
> -#
> -# The --force option makes sure it doesn't fail if the source
> -# directory already exists. The --auto-accept skips the license check,
> -# as it is not needed in Buildroot because we have legal-info. Since
> -# there's a EULA in the binary file, we extract it in this macro, and
> -# it should therefore be added to the LICENSE_FILES variable of
> -# packages using this macro. Also, remember to set REDISTRIBUTE to
> -# "NO". Indeed, this is a legal minefield: the EULA specifies that the
> -# Board Support Package includes software and hardware (sic!) for
> -# which a separate license is needed...
> -#
> -# $(1): full path to the archive file
> -#
> -define FREESCALE_IMX_EXTRACT_HELPER
> -	awk 'BEGIN      { start = 0; } \
> -	     /^EOEULA/  { start = 0; } \
> -	                { if (start) print; } \
> -	     /<<EOEULA/ { start = 1; }' \
> -	    $(1) > $(@D)/EULA
> -	cd $(@D) && sh $(1) --force --auto-accept
> -	find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \;
> -	rmdir $(@D)/$(basename $(notdir $(1)))
> -endef
> -
>  include $(sort $(wildcard package/freescale-imx/*/*.mk))
> diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
> index 6ece27baa..57f4af04c 100644
> --- a/package/pkg-utils.mk
> +++ b/package/pkg-utils.mk
> @@ -275,3 +275,28 @@ legal-deps = \
>          $(filter-out $(if $(1:host-%=),host-%),\
>              $(call non-virtual-deps,\
>                  $($(call UPPERCASE,$(1))_FINAL_RECURSIVE_DEPENDENCIES))),$(p) [$($(call UPPERCASE,$(p))_LICENSE)])
> +
> +# Helper for self-extracting binaries distributed by Freescale.
> +#
> +# The --force option makes sure it doesn't fail if the source
> +# directory already exists. The --auto-accept skips the license check,
> +# as it is not needed in Buildroot because we have legal-info. Since
> +# there's a EULA in the binary file, we extract it in this macro, and
> +# it should therefore be added to the LICENSE_FILES variable of
> +# packages using this macro. Also, remember to set REDISTRIBUTE to
> +# "NO". Indeed, this is a legal minefield: the EULA specifies that the
> +# Board Support Package includes software and hardware (sic!) for
> +# which a separate license is needed...
> +#
> +# $(1): full path to the archive file
> +#
> +define FREESCALE_IMX_EXTRACT_HELPER
> +	awk 'BEGIN      { start = 0; } \
> +	     /^EOEULA/  { start = 0; } \
> +	                { if (start) print; } \
> +	     /<<EOEULA/ { start = 1; }' \
> +	    $(1) > $(@D)/EULA
> +	cd $(@D) && sh $(1) --force --auto-accept
> +	find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \;
> +	rmdir $(@D)/$(basename $(notdir $(1)))
> +endef
> -- 
> 2.34.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [Buildroot] [PATCH 3/4] package/freescale-imx: rename FREESCALE_IMX_EXTRACT_HELPER to NXP_EXTRACT_HELPER
  2022-08-15 16:56 ` [Buildroot] [PATCH 3/4] package/freescale-imx: rename FREESCALE_IMX_EXTRACT_HELPER to NXP_EXTRACT_HELPER Francois Perrad
@ 2022-08-15 19:02   ` Yann E. MORIN
  0 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2022-08-15 19:02 UTC (permalink / raw)
  To: Francois Perrad; +Cc: buildroot

On 2022-08-15 18:56 +0200, Francois Perrad spake thusly:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

This comit log was bit too short, so I extended it with a rationale for
the renaming.

Applied to next, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/freescale-imx/firmware-imx/firmware-imx.mk           | 2 +-
>  package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk   | 2 +-
>  package/freescale-imx/imx-codec/imx-codec.mk                 | 2 +-
>  package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk             | 2 +-
>  package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk             | 2 +-
>  package/freescale-imx/imx-parser/imx-parser.mk               | 2 +-
>  package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk     | 2 +-
>  package/freescale-imx/imx-seco/imx-seco.mk                   | 2 +-
>  package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk | 2 +-
>  package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk       | 2 +-
>  package/freescale-imx/imx-vpu/imx-vpu.mk                     | 2 +-
>  package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk             | 2 +-
>  package/freescale-imx/libz160/libz160.mk                     | 2 +-
>  package/pkg-utils.mk                                         | 4 ++--
>  14 files changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
> index 47c21585a..4884079d5 100644
> --- a/package/freescale-imx/firmware-imx/firmware-imx.mk
> +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
> @@ -15,7 +15,7 @@ FIRMWARE_IMX_REDISTRIBUTE = NO
>  FIRMWARE_IMX_INSTALL_IMAGES = YES
>  
>  define FIRMWARE_IMX_EXTRACT_CMDS
> -	$(call FREESCALE_IMX_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE))
> +	$(call NXP_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE))
>  endef
>  
>  #
> diff --git a/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk b/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk
> index c99c568f7..895fedc2e 100644
> --- a/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk
> +++ b/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk
> @@ -23,7 +23,7 @@ GPU_AMD_BIN_MX51_LICENSE_FILES = EULA
>  GPU_AMD_BIN_MX51_REDISTRIBUTE = NO
>  
>  define GPU_AMD_BIN_MX51_EXTRACT_CMDS
> -	$(call FREESCALE_IMX_EXTRACT_HELPER,$(GPU_AMD_BIN_MX51_DL_DIR)/$(GPU_AMD_BIN_MX51_SOURCE))
> +	$(call NXP_EXTRACT_HELPER,$(GPU_AMD_BIN_MX51_DL_DIR)/$(GPU_AMD_BIN_MX51_SOURCE))
>  endef
>  
>  # Upstream headers need to be compiled with -D_LINUX. It is more convenient
> diff --git a/package/freescale-imx/imx-codec/imx-codec.mk b/package/freescale-imx/imx-codec/imx-codec.mk
> index 1ec701d2f..2b7c346a6 100644
> --- a/package/freescale-imx/imx-codec/imx-codec.mk
> +++ b/package/freescale-imx/imx-codec/imx-codec.mk
> @@ -26,7 +26,7 @@ IMX_CODEC_CONF_OPTS += --enable-vpu
>  endif
>  
>  define IMX_CODEC_EXTRACT_CMDS
> -	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_CODEC_DL_DIR)/$(IMX_CODEC_SOURCE))
> +	$(call NXP_EXTRACT_HELPER,$(IMX_CODEC_DL_DIR)/$(IMX_CODEC_SOURCE))
>  endef
>  
>  # FIXME The Makefile installs both the arm9 and arm11 versions of the
> diff --git a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
> index 0e4078a96..c5df87e61 100644
> --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
> +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
> @@ -19,7 +19,7 @@ IMX_GPU_G2D_LICENSE_FILES = EULA COPYING
>  IMX_GPU_G2D_REDISTRIBUTE = NO
>  
>  define IMX_GPU_G2D_EXTRACT_CMDS
> -	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_GPU_G2D_DL_DIR)/$(IMX_GPU_G2D_SOURCE))
> +	$(call NXP_EXTRACT_HELPER,$(IMX_GPU_G2D_DL_DIR)/$(IMX_GPU_G2D_SOURCE))
>  endef
>  
>  define IMX_GPU_G2D_INSTALL_STAGING_CMDS
> diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
> index 1d76d79e2..63d5d3c2e 100644
> --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
> +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
> @@ -44,7 +44,7 @@ IMX_GPU_VIV_DEPENDENCIES += wayland
>  endif
>  
>  define IMX_GPU_VIV_EXTRACT_CMDS
> -	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_GPU_VIV_DL_DIR)/$(IMX_GPU_VIV_SOURCE))
> +	$(call NXP_EXTRACT_HELPER,$(IMX_GPU_VIV_DL_DIR)/$(IMX_GPU_VIV_SOURCE))
>  endef
>  
>  ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb)
> diff --git a/package/freescale-imx/imx-parser/imx-parser.mk b/package/freescale-imx/imx-parser/imx-parser.mk
> index fc4376f04..dccb8829d 100644
> --- a/package/freescale-imx/imx-parser/imx-parser.mk
> +++ b/package/freescale-imx/imx-parser/imx-parser.mk
> @@ -24,7 +24,7 @@ IMX_PARSER_CONF_OPTS += --enable-fsw
>  endif
>  
>  define IMX_PARSER_EXTRACT_CMDS
> -	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_PARSER_DL_DIR)/$(IMX_PARSER_SOURCE))
> +	$(call NXP_EXTRACT_HELPER,$(IMX_PARSER_DL_DIR)/$(IMX_PARSER_SOURCE))
>  endef
>  
>  # The Makefile installs several versions of the libraries, but we only
> diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
> index bbb731030..6a304c0c8 100644
> --- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
> +++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk
> @@ -13,7 +13,7 @@ IMX_SC_FIRMWARE_LICENSE_FILES = EULA COPYING
>  IMX_SC_FIRMWARE_REDISTRIBUTE = NO
>  
>  define IMX_SC_FIRMWARE_EXTRACT_CMDS
> -	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_SC_FIRMWARE_DL_DIR)/$(IMX_SC_FIRMWARE_SOURCE))
> +	$(call NXP_EXTRACT_HELPER,$(IMX_SC_FIRMWARE_DL_DIR)/$(IMX_SC_FIRMWARE_SOURCE))
>  endef
>  
>  IMX_SC_FIRMWARE_INSTALL_IMAGES = YES
> diff --git a/package/freescale-imx/imx-seco/imx-seco.mk b/package/freescale-imx/imx-seco/imx-seco.mk
> index 79c9722c4..987f24658 100644
> --- a/package/freescale-imx/imx-seco/imx-seco.mk
> +++ b/package/freescale-imx/imx-seco/imx-seco.mk
> @@ -13,7 +13,7 @@ IMX_SECO_LICENSE_FILES = EULA COPYING
>  IMX_SECO_REDISTRIBUTE = NO
>  
>  define IMX_SECO_EXTRACT_CMDS
> -	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_SECO_DL_DIR)/$(IMX_SECO_SOURCE))
> +	$(call NXP_EXTRACT_HELPER,$(IMX_SECO_DL_DIR)/$(IMX_SECO_SOURCE))
>  endef
>  
>  IMX_SECO_INSTALL_IMAGES = YES
> diff --git a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk
> index b07e11667..5f4c6faee 100644
> --- a/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk
> +++ b/package/freescale-imx/imx-vpu-hantro-vc/imx-vpu-hantro-vc.mk
> @@ -14,7 +14,7 @@ IMX_VPU_HANTRO_VC_LICENSE_FILES = EULA COPYING
>  IMX_VPU_HANTRO_VC_REDISTRIBUTE = NO
>  
>  define IMX_VPU_HANTRO_VC_EXTRACT_CMDS
> -	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPU_HANTRO_VC_DL_DIR)/$(IMX_VPU_HANTRO_VC_SOURCE))
> +	$(call NXP_EXTRACT_HELPER,$(IMX_VPU_HANTRO_VC_DL_DIR)/$(IMX_VPU_HANTRO_VC_SOURCE))
>  endef
>  
>  define IMX_VPU_HANTRO_VC_INSTALL_TARGET_CMDS
> diff --git a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
> index 360591b44..9d34c7add 100644
> --- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
> +++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
> @@ -23,7 +23,7 @@ IMX_VPU_HANTRO_LICENSE_FILES = EULA COPYING
>  IMX_VPU_HANTRO_REDISTRIBUTE = NO
>  
>  define IMX_VPU_HANTRO_EXTRACT_CMDS
> -	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPU_HANTRO_DL_DIR)/$(IMX_VPU_HANTRO_SOURCE))
> +	$(call NXP_EXTRACT_HELPER,$(IMX_VPU_HANTRO_DL_DIR)/$(IMX_VPU_HANTRO_SOURCE))
>  endef
>  
>  define IMX_VPU_HANTRO_BUILD_CMDS
> diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk
> index 14a1a7a9f..cae3d88b6 100644
> --- a/package/freescale-imx/imx-vpu/imx-vpu.mk
> +++ b/package/freescale-imx/imx-vpu/imx-vpu.mk
> @@ -21,7 +21,7 @@ IMX_VPU_LICENSE_FILES = EULA COPYING
>  IMX_VPU_REDISTRIBUTE = NO
>  
>  define IMX_VPU_EXTRACT_CMDS
> -	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPU_DL_DIR)/$(IMX_VPU_SOURCE))
> +	$(call NXP_EXTRACT_HELPER,$(IMX_VPU_DL_DIR)/$(IMX_VPU_SOURCE))
>  endef
>  
>  define IMX_VPU_BUILD_CMDS
> diff --git a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk
> index 4f8916540..4bee1cf64 100644
> --- a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk
> +++ b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk
> @@ -22,7 +22,7 @@ IMX_VPUWRAP_LICENSE_FILES = EULA COPYING
>  IMX_VPUWRAP_REDISTRIBUTE = NO
>  
>  define IMX_VPUWRAP_EXTRACT_CMDS
> -	$(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPUWRAP_DL_DIR)/$(IMX_VPUWRAP_SOURCE))
> +	$(call NXP_EXTRACT_HELPER,$(IMX_VPUWRAP_DL_DIR)/$(IMX_VPUWRAP_SOURCE))
>  endef
>  
>  $(eval $(autotools-package))
> diff --git a/package/freescale-imx/libz160/libz160.mk b/package/freescale-imx/libz160/libz160.mk
> index 5b1feeb44..a15b5f6b6 100644
> --- a/package/freescale-imx/libz160/libz160.mk
> +++ b/package/freescale-imx/libz160/libz160.mk
> @@ -15,7 +15,7 @@ LIBZ160_LICENSE_FILES = EULA
>  LIBZ160_REDISTRIBUTE = NO
>  
>  define LIBZ160_EXTRACT_CMDS
> -	$(call FREESCALE_IMX_EXTRACT_HELPER,$(LIBZ160_DL_DIR)/$(LIBZ160_SOURCE))
> +	$(call NXP_EXTRACT_HELPER,$(LIBZ160_DL_DIR)/$(LIBZ160_SOURCE))
>  endef
>  
>  define LIBZ160_INSTALL_STAGING_CMDS
> diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
> index 57f4af04c..32a5c8c95 100644
> --- a/package/pkg-utils.mk
> +++ b/package/pkg-utils.mk
> @@ -276,7 +276,7 @@ legal-deps = \
>              $(call non-virtual-deps,\
>                  $($(call UPPERCASE,$(1))_FINAL_RECURSIVE_DEPENDENCIES))),$(p) [$($(call UPPERCASE,$(p))_LICENSE)])
>  
> -# Helper for self-extracting binaries distributed by Freescale.
> +# Helper for self-extracting binaries distributed by NXP.
>  #
>  # The --force option makes sure it doesn't fail if the source
>  # directory already exists. The --auto-accept skips the license check,
> @@ -290,7 +290,7 @@ legal-deps = \
>  #
>  # $(1): full path to the archive file
>  #
> -define FREESCALE_IMX_EXTRACT_HELPER
> +define NXP_EXTRACT_HELPER
>  	awk 'BEGIN      { start = 0; } \
>  	     /^EOEULA/  { start = 0; } \
>  	                { if (start) print; } \
> -- 
> 2.34.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [Buildroot] [PATCH 4/4] package/qoriq-cadence-dp-firmware: refactor with NXP_EXTRACT_HELPER
  2022-08-15 16:56 ` [Buildroot] [PATCH 4/4] package/qoriq-cadence-dp-firmware: refactor with NXP_EXTRACT_HELPER Francois Perrad
@ 2022-08-15 19:02   ` Yann E. MORIN
  0 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2022-08-15 19:02 UTC (permalink / raw)
  To: Francois Perrad; +Cc: buildroot

On 2022-08-15 18:56 +0200, Francois Perrad spake thusly:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Applied to next, thanks.

Regards,
Yann E. MORIN.

> ---
>  .../qoriq-cadence-dp-firmware.mk              | 27 +------------------
>  1 file changed, 1 insertion(+), 26 deletions(-)
> 
> diff --git a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk
> index 7d701c4ac..8cc2200a1 100644
> --- a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk
> +++ b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk
> @@ -13,33 +13,8 @@ QORIQ_CADENCE_DP_FIRMWARE_REDISTRIBUTE = NO
>  QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES = YES
>  QORIQ_CADENCE_DP_FIRMWARE_INSTALL_TARGET = NO
>  
> -# Helper for self-extracting binaries distributed by NXP.
> -#
> -# The --force option makes sure it doesn't fail if the source
> -# directory already exists. The --auto-accept skips the license check,
> -# as it is not needed in Buildroot because we have legal-info. Since
> -# there's a EULA in the binary file, we extract it in this macro, and
> -# it should therefore be added to the LICENSE_FILES variable of
> -# packages using this macro. Also, remember to set REDISTRIBUTE to
> -# "NO". Indeed, this is a legal minefield: the EULA specifies that the
> -# Board Support Package includes software and hardware (sic!) for
> -# which a separate license is needed...
> -#
> -# $(1): full path to the archive file
> -#
> -define QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_HELPER
> -	awk 'BEGIN      { start = 0; } \
> -	     /^EOEULA/  { start = 0; } \
> -	                { if (start) print; } \
> -	     /<<EOEULA/ { start = 1; }' \
> -	    $(1) > $(@D)/EULA
> -	cd $(@D) && sh $(1) --force --auto-accept
> -	find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \;
> -	rmdir $(@D)/$(basename $(notdir $(1)))
> -endef
> -
>  define QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_CMDS
> -	$(call QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_HELPER,$(QORIQ_CADENCE_DP_FIRMWARE_DL_DIR)/$(QORIQ_CADENCE_DP_FIRMWARE_SOURCE))
> +	$(call NXP_EXTRACT_HELPER,$(QORIQ_CADENCE_DP_FIRMWARE_DL_DIR)/$(QORIQ_CADENCE_DP_FIRMWARE_SOURCE))
>  endef
>  
>  define QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES_CMDS
> -- 
> 2.34.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [Buildroot] [PATCH 1/4] package/qoriq-cadence-dp-firmware: fix license info
  2022-08-15 16:56 [Buildroot] [PATCH 1/4] package/qoriq-cadence-dp-firmware: fix license info Francois Perrad
                   ` (3 preceding siblings ...)
  2022-08-15 18:46 ` [Buildroot] [PATCH 1/4] package/qoriq-cadence-dp-firmware: fix license info Yann E. MORIN
@ 2022-09-16 14:11 ` Peter Korsgaard
  4 siblings, 0 replies; 9+ messages in thread
From: Peter Korsgaard @ 2022-09-16 14:11 UTC (permalink / raw)
  To: Francois Perrad; +Cc: buildroot

>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:

 > Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Committed to 2022.05.x and 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2022-09-16 14:12 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-15 16:56 [Buildroot] [PATCH 1/4] package/qoriq-cadence-dp-firmware: fix license info Francois Perrad
2022-08-15 16:56 ` [Buildroot] [PATCH 2/4] package/pkg-utils.mk: move FREESCALE_IMX_EXTRACT_HELPER Francois Perrad
2022-08-15 19:01   ` Yann E. MORIN
2022-08-15 16:56 ` [Buildroot] [PATCH 3/4] package/freescale-imx: rename FREESCALE_IMX_EXTRACT_HELPER to NXP_EXTRACT_HELPER Francois Perrad
2022-08-15 19:02   ` Yann E. MORIN
2022-08-15 16:56 ` [Buildroot] [PATCH 4/4] package/qoriq-cadence-dp-firmware: refactor with NXP_EXTRACT_HELPER Francois Perrad
2022-08-15 19:02   ` Yann E. MORIN
2022-08-15 18:46 ` [Buildroot] [PATCH 1/4] package/qoriq-cadence-dp-firmware: fix license info Yann E. MORIN
2022-09-16 14:11 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.