Browse Source

package/freescale-imx: rename FREESCALE_IMX_EXTRACT_HELPER to NXP_EXTRACT_HELPER

The Freescale extract helper was introduced before Freescale was part
of NXP. Nowadays, we also have NXP packages, and they do use the same
archiving format.

Rename the helper under the now more generic NXP name, so that it is
more logical to also use it for NXP packages. We do not retain the old
Freescale-based name, because we should no longer add Freescale-named
packages; they would most probably be introduced under the NXP name.

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
[yann.morin.1998@free.fr:
  - provide the rationale in the commit log
  - keep referring to Freescale in comment
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Francois Perrad 3 years ago
parent
commit
721d3c6e80

+ 1 - 1
package/freescale-imx/firmware-imx/firmware-imx.mk

@@ -15,7 +15,7 @@ FIRMWARE_IMX_REDISTRIBUTE = NO
 FIRMWARE_IMX_INSTALL_IMAGES = YES
 FIRMWARE_IMX_INSTALL_IMAGES = YES
 
 
 define FIRMWARE_IMX_EXTRACT_CMDS
 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
 endef
 
 
 #
 #

+ 1 - 1
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
 GPU_AMD_BIN_MX51_REDISTRIBUTE = NO
 
 
 define GPU_AMD_BIN_MX51_EXTRACT_CMDS
 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
 endef
 
 
 # Upstream headers need to be compiled with -D_LINUX. It is more convenient
 # Upstream headers need to be compiled with -D_LINUX. It is more convenient

+ 1 - 1
package/freescale-imx/imx-codec/imx-codec.mk

@@ -26,7 +26,7 @@ IMX_CODEC_CONF_OPTS += --enable-vpu
 endif
 endif
 
 
 define IMX_CODEC_EXTRACT_CMDS
 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
 endef
 
 
 # FIXME The Makefile installs both the arm9 and arm11 versions of the
 # FIXME The Makefile installs both the arm9 and arm11 versions of the

+ 1 - 1
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
 IMX_GPU_G2D_REDISTRIBUTE = NO
 
 
 define IMX_GPU_G2D_EXTRACT_CMDS
 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
 endef
 
 
 define IMX_GPU_G2D_INSTALL_STAGING_CMDS
 define IMX_GPU_G2D_INSTALL_STAGING_CMDS

+ 1 - 1
package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk

@@ -44,7 +44,7 @@ IMX_GPU_VIV_DEPENDENCIES += wayland
 endif
 endif
 
 
 define IMX_GPU_VIV_EXTRACT_CMDS
 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
 endef
 
 
 ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb)
 ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb)

+ 1 - 1
package/freescale-imx/imx-parser/imx-parser.mk

@@ -24,7 +24,7 @@ IMX_PARSER_CONF_OPTS += --enable-fsw
 endif
 endif
 
 
 define IMX_PARSER_EXTRACT_CMDS
 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
 endef
 
 
 # The Makefile installs several versions of the libraries, but we only
 # The Makefile installs several versions of the libraries, but we only

+ 1 - 1
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
 IMX_SC_FIRMWARE_REDISTRIBUTE = NO
 
 
 define IMX_SC_FIRMWARE_EXTRACT_CMDS
 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
 endef
 
 
 IMX_SC_FIRMWARE_INSTALL_IMAGES = YES
 IMX_SC_FIRMWARE_INSTALL_IMAGES = YES

+ 1 - 1
package/freescale-imx/imx-seco/imx-seco.mk

@@ -13,7 +13,7 @@ IMX_SECO_LICENSE_FILES = EULA COPYING
 IMX_SECO_REDISTRIBUTE = NO
 IMX_SECO_REDISTRIBUTE = NO
 
 
 define IMX_SECO_EXTRACT_CMDS
 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
 endef
 
 
 IMX_SECO_INSTALL_IMAGES = YES
 IMX_SECO_INSTALL_IMAGES = YES

+ 1 - 1
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
 IMX_VPU_HANTRO_VC_REDISTRIBUTE = NO
 
 
 define IMX_VPU_HANTRO_VC_EXTRACT_CMDS
 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
 endef
 
 
 define IMX_VPU_HANTRO_VC_INSTALL_TARGET_CMDS
 define IMX_VPU_HANTRO_VC_INSTALL_TARGET_CMDS

+ 1 - 1
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
 IMX_VPU_HANTRO_REDISTRIBUTE = NO
 
 
 define IMX_VPU_HANTRO_EXTRACT_CMDS
 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
 endef
 
 
 define IMX_VPU_HANTRO_BUILD_CMDS
 define IMX_VPU_HANTRO_BUILD_CMDS

+ 1 - 1
package/freescale-imx/imx-vpu/imx-vpu.mk

@@ -21,7 +21,7 @@ IMX_VPU_LICENSE_FILES = EULA COPYING
 IMX_VPU_REDISTRIBUTE = NO
 IMX_VPU_REDISTRIBUTE = NO
 
 
 define IMX_VPU_EXTRACT_CMDS
 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
 endef
 
 
 define IMX_VPU_BUILD_CMDS
 define IMX_VPU_BUILD_CMDS

+ 1 - 1
package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk

@@ -22,7 +22,7 @@ IMX_VPUWRAP_LICENSE_FILES = EULA COPYING
 IMX_VPUWRAP_REDISTRIBUTE = NO
 IMX_VPUWRAP_REDISTRIBUTE = NO
 
 
 define IMX_VPUWRAP_EXTRACT_CMDS
 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
 endef
 
 
 $(eval $(autotools-package))
 $(eval $(autotools-package))

+ 1 - 1
package/freescale-imx/libz160/libz160.mk

@@ -15,7 +15,7 @@ LIBZ160_LICENSE_FILES = EULA
 LIBZ160_REDISTRIBUTE = NO
 LIBZ160_REDISTRIBUTE = NO
 
 
 define LIBZ160_EXTRACT_CMDS
 define LIBZ160_EXTRACT_CMDS
-	$(call FREESCALE_IMX_EXTRACT_HELPER,$(LIBZ160_DL_DIR)/$(LIBZ160_SOURCE))
+	$(call NXP_EXTRACT_HELPER,$(LIBZ160_DL_DIR)/$(LIBZ160_SOURCE))
 endef
 endef
 
 
 define LIBZ160_INSTALL_STAGING_CMDS
 define LIBZ160_INSTALL_STAGING_CMDS

+ 3 - 2
package/pkg-utils.mk

@@ -276,7 +276,8 @@ legal-deps = \
             $(call non-virtual-deps,\
             $(call non-virtual-deps,\
                 $($(call UPPERCASE,$(1))_FINAL_RECURSIVE_DEPENDENCIES))),$(p) [$($(call UPPERCASE,$(p))_LICENSE)])
                 $($(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, and
+# formerlly Freescale.
 #
 #
 # The --force option makes sure it doesn't fail if the source
 # The --force option makes sure it doesn't fail if the source
 # directory already exists. The --auto-accept skips the license check,
 # directory already exists. The --auto-accept skips the license check,
@@ -290,7 +291,7 @@ legal-deps = \
 #
 #
 # $(1): full path to the archive file
 # $(1): full path to the archive file
 #
 #
-define FREESCALE_IMX_EXTRACT_HELPER
+define NXP_EXTRACT_HELPER
 	awk 'BEGIN      { start = 0; } \
 	awk 'BEGIN      { start = 0; } \
 	     /^EOEULA/  { start = 0; } \
 	     /^EOEULA/  { start = 0; } \
 	                { if (start) print; } \
 	                { if (start) print; } \