* [Buildroot] [PATCH v2 1/9] freescale-imx: Add helper to extract self-extractible binaries
2014-11-19 21:30 [Buildroot] [PATCH v2 0/9] Better handling of freescale self-extractible binaries Jérôme Pouiller
@ 2014-11-19 21:30 ` Jérôme Pouiller
2014-11-27 18:13 ` Yann E. MORIN
2014-11-19 21:30 ` [Buildroot] [PATCH v2 2/9] firmware-imx: Use self-extractible helper Jérôme Pouiller
` (8 subsequent siblings)
9 siblings, 1 reply; 18+ messages in thread
From: Jérôme Pouiller @ 2014-11-19 21:30 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
package/freescale-imx/freescale-imx.mk | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
index c52fc11..ba5a786 100644
--- a/package/freescale-imx/freescale-imx.mk
+++ b/package/freescale-imx/freescale-imx.mk
@@ -7,4 +7,25 @@
FREESCALE_IMX_VERSION = 3.10.17-1.0.0
FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO
+# Helper for self-extracting binaries distributed by Freescale.
+# The --force makes sure it doesn't fail if the source dir already exists.
+# The --auto-accept skips the license check - not needed for us
+# because we have legal-info
+# Since there's a EULA in the bin file, extract it
+# If you use this macro, don't forget to add "EULA" to LICENSE_FILES and 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...
+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 $(1)) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \;
+ rmdir $(@D)/$(basename $(1))
+endef
+
+
include $(sort $(wildcard package/freescale-imx/*/*.mk))
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Buildroot] [PATCH v2 1/9] freescale-imx: Add helper to extract self-extractible binaries
2014-11-19 21:30 ` [Buildroot] [PATCH v2 1/9] freescale-imx: Add helper to extract " Jérôme Pouiller
@ 2014-11-27 18:13 ` Yann E. MORIN
0 siblings, 0 replies; 18+ messages in thread
From: Yann E. MORIN @ 2014-11-27 18:13 UTC (permalink / raw)
To: buildroot
J?r?me, All,
On 2014-11-19 22:30 +0100, J?r?me Pouiller spake thusly:
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
> ---
> package/freescale-imx/freescale-imx.mk | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
> index c52fc11..ba5a786 100644
> --- a/package/freescale-imx/freescale-imx.mk
> +++ b/package/freescale-imx/freescale-imx.mk
> @@ -7,4 +7,25 @@
> FREESCALE_IMX_VERSION = 3.10.17-1.0.0
> FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO
>
> +# Helper for self-extracting binaries distributed by Freescale.
> +# The --force makes sure it doesn't fail if the source dir already exists.
> +# The --auto-accept skips the license check - not needed for us
> +# because we have legal-info
> +# Since there's a EULA in the bin file, extract it
> +# If you use this macro, don't forget to add "EULA" to LICENSE_FILES and 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...
It would have been great to add to the comment the expected argument:
# $(1): full path to the archive file
Otherwise:
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> +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 $(1)) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \;
> + rmdir $(@D)/$(basename $(1))
> +endef
> +
> +
> include $(sort $(wildcard package/freescale-imx/*/*.mk))
> --
> 1.9.1
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v2 2/9] firmware-imx: Use self-extractible helper
2014-11-19 21:30 [Buildroot] [PATCH v2 0/9] Better handling of freescale self-extractible binaries Jérôme Pouiller
2014-11-19 21:30 ` [Buildroot] [PATCH v2 1/9] freescale-imx: Add helper to extract " Jérôme Pouiller
@ 2014-11-19 21:30 ` Jérôme Pouiller
2014-11-27 18:15 ` Yann E. MORIN
2014-11-19 21:30 ` [Buildroot] [PATCH v2 3/9] imx-vpu: " Jérôme Pouiller
` (7 subsequent siblings)
9 siblings, 1 reply; 18+ messages in thread
From: Jérôme Pouiller @ 2014-11-19 21:30 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
package/freescale-imx/firmware-imx/firmware-imx.mk | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
index d26b31c..629149e 100644
--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
+++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
@@ -7,27 +7,19 @@
FIRMWARE_IMX_VERSION = $(FREESCALE_IMX_VERSION)
FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE)
FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin
+
+# See freescale-imx.mk
FIRMWARE_IMX_LICENSE = Freescale Semiconductor Software License Agreement, \
Atheros license (ath6k)
-FIRMWARE_IMX_LICENSE_FILES = licenses/vpu/EULA licenses/ath6k/AR6102/License.txt
-# 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...
+FIRMWARE_IMX_LICENSE_FILES = EULA licenses/vpu/EULA licenses/ath6k/AR6102/License.txt
FIRMWARE_IMX_REDISTRIBUTE = NO
FIRMWARE_IMX_BLOBS = ath6k sdma vpu
-# The archive is a shell-self-extractor of a bzipped tar. It happens
-# to extract in the correct directory (firmware-imx-x.y.z)
-# The --force makes sure it doesn't fail if the source dir already exists.
-# The --auto-accept skips the license check - not needed for us
-# because we have legal-info.
define FIRMWARE_IMX_EXTRACT_CMDS
- cd $(BUILD_DIR); \
- sh $(DL_DIR)/$(FIRMWARE_IMX_SOURCE) --force --auto-accept
+ $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(FIRMWARE_IMX_SOURCE))
endef
-
define FIRMWARE_IMX_INSTALL_TARGET_CMDS
mkdir -p $(TARGET_DIR)/lib/firmware
for blobdir in $(FIRMWARE_IMX_BLOBS); do \
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Buildroot] [PATCH v2 2/9] firmware-imx: Use self-extractible helper
2014-11-19 21:30 ` [Buildroot] [PATCH v2 2/9] firmware-imx: Use self-extractible helper Jérôme Pouiller
@ 2014-11-27 18:15 ` Yann E. MORIN
0 siblings, 0 replies; 18+ messages in thread
From: Yann E. MORIN @ 2014-11-27 18:15 UTC (permalink / raw)
To: buildroot
J?r?me, All,
On 2014-11-19 22:30 +0100, J?r?me Pouiller spake thusly:
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/freescale-imx/firmware-imx/firmware-imx.mk | 16 ++++------------
> 1 file changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
> index d26b31c..629149e 100644
> --- a/package/freescale-imx/firmware-imx/firmware-imx.mk
> +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
> @@ -7,27 +7,19 @@
> FIRMWARE_IMX_VERSION = $(FREESCALE_IMX_VERSION)
> FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE)
> FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin
> +
> +# See freescale-imx.mk
> FIRMWARE_IMX_LICENSE = Freescale Semiconductor Software License Agreement, \
> Atheros license (ath6k)
> -FIRMWARE_IMX_LICENSE_FILES = licenses/vpu/EULA licenses/ath6k/AR6102/License.txt
> -# 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...
> +FIRMWARE_IMX_LICENSE_FILES = EULA licenses/vpu/EULA licenses/ath6k/AR6102/License.txt
> FIRMWARE_IMX_REDISTRIBUTE = NO
>
> FIRMWARE_IMX_BLOBS = ath6k sdma vpu
>
> -# The archive is a shell-self-extractor of a bzipped tar. It happens
> -# to extract in the correct directory (firmware-imx-x.y.z)
> -# The --force makes sure it doesn't fail if the source dir already exists.
> -# The --auto-accept skips the license check - not needed for us
> -# because we have legal-info.
> define FIRMWARE_IMX_EXTRACT_CMDS
> - cd $(BUILD_DIR); \
> - sh $(DL_DIR)/$(FIRMWARE_IMX_SOURCE) --force --auto-accept
> + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(FIRMWARE_IMX_SOURCE))
> endef
>
> -
> define FIRMWARE_IMX_INSTALL_TARGET_CMDS
> mkdir -p $(TARGET_DIR)/lib/firmware
> for blobdir in $(FIRMWARE_IMX_BLOBS); do \
> --
> 1.9.1
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v2 3/9] imx-vpu: Use self-extractible helper
2014-11-19 21:30 [Buildroot] [PATCH v2 0/9] Better handling of freescale self-extractible binaries Jérôme Pouiller
2014-11-19 21:30 ` [Buildroot] [PATCH v2 1/9] freescale-imx: Add helper to extract " Jérôme Pouiller
2014-11-19 21:30 ` [Buildroot] [PATCH v2 2/9] firmware-imx: Use self-extractible helper Jérôme Pouiller
@ 2014-11-19 21:30 ` Jérôme Pouiller
2014-11-27 18:16 ` Yann E. MORIN
2014-11-19 21:30 ` [Buildroot] [PATCH v2 4/9] libfslcodec: " Jérôme Pouiller
` (6 subsequent siblings)
9 siblings, 1 reply; 18+ messages in thread
From: Jérôme Pouiller @ 2014-11-19 21:30 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
package/freescale-imx/imx-vpu/imx-vpu.mk | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk
index e0292ed..110287b 100644
--- a/package/freescale-imx/imx-vpu/imx-vpu.mk
+++ b/package/freescale-imx/imx-vpu/imx-vpu.mk
@@ -6,8 +6,6 @@
IMX_VPU_VERSION = $(FREESCALE_IMX_VERSION)
IMX_VPU_SITE = $(FREESCALE_IMX_SITE)
-IMX_VPU_LICENSE = Freescale License
-IMX_VPU_LICENSE_FILES = EULA vpu/EULA.txt
IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin
IMX_VPU_INSTALL_STAGING = YES
@@ -21,21 +19,13 @@ IMX_VPU_MAKE_ENV = \
PLATFORM=$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM) \
INCLUDE="-idirafter $(LINUX_DIR)/include"
-# The archive is a shell-self-extractor of a bzipped tar. It happens
-# to extract in the correct directory (imx-vpu-x.y.z)
-# The --force makes sure it doesn't fail if the source dir already exists.
-# The --auto-accept skips the license check - not needed for us
-# because we have legal-info
-# Since there's a EULA in the bin file, extract it to imx-vpu-x.y.z/EULA
-#
+# See freescale-imx.mk
+IMX_VPU_LICENSE = Freescale Semiconductor Software License Agreement
+IMX_VPU_LICENSE_FILES = EULA vpu/EULA.txt
+IMX_VPU_REDISTRIBUTE = NO
+
define IMX_VPU_EXTRACT_CMDS
- awk 'BEGIN { start=0; } \
- /^EOEULA/ { start = 0; } \
- { if (start) print; } \
- /<<EOEULA/ { start=1; }'\
- $(DL_DIR)/$(IMX_VPU_SOURCE) > $(@D)/EULA
- cd $(BUILD_DIR); \
- sh $(DL_DIR)/$(IMX_VPU_SOURCE) --force --auto-accept
+ $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_VPU_SOURCE))
endef
define IMX_VPU_BUILD_CMDS
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Buildroot] [PATCH v2 3/9] imx-vpu: Use self-extractible helper
2014-11-19 21:30 ` [Buildroot] [PATCH v2 3/9] imx-vpu: " Jérôme Pouiller
@ 2014-11-27 18:16 ` Yann E. MORIN
0 siblings, 0 replies; 18+ messages in thread
From: Yann E. MORIN @ 2014-11-27 18:16 UTC (permalink / raw)
To: buildroot
J?r?me, All,
On 2014-11-19 22:30 +0100, J?r?me Pouiller spake thusly:
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/freescale-imx/imx-vpu/imx-vpu.mk | 22 ++++++----------------
> 1 file changed, 6 insertions(+), 16 deletions(-)
>
> diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk
> index e0292ed..110287b 100644
> --- a/package/freescale-imx/imx-vpu/imx-vpu.mk
> +++ b/package/freescale-imx/imx-vpu/imx-vpu.mk
> @@ -6,8 +6,6 @@
>
> IMX_VPU_VERSION = $(FREESCALE_IMX_VERSION)
> IMX_VPU_SITE = $(FREESCALE_IMX_SITE)
> -IMX_VPU_LICENSE = Freescale License
> -IMX_VPU_LICENSE_FILES = EULA vpu/EULA.txt
> IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin
>
> IMX_VPU_INSTALL_STAGING = YES
> @@ -21,21 +19,13 @@ IMX_VPU_MAKE_ENV = \
> PLATFORM=$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM) \
> INCLUDE="-idirafter $(LINUX_DIR)/include"
>
> -# The archive is a shell-self-extractor of a bzipped tar. It happens
> -# to extract in the correct directory (imx-vpu-x.y.z)
> -# The --force makes sure it doesn't fail if the source dir already exists.
> -# The --auto-accept skips the license check - not needed for us
> -# because we have legal-info
> -# Since there's a EULA in the bin file, extract it to imx-vpu-x.y.z/EULA
> -#
> +# See freescale-imx.mk
> +IMX_VPU_LICENSE = Freescale Semiconductor Software License Agreement
> +IMX_VPU_LICENSE_FILES = EULA vpu/EULA.txt
> +IMX_VPU_REDISTRIBUTE = NO
> +
> define IMX_VPU_EXTRACT_CMDS
> - awk 'BEGIN { start=0; } \
> - /^EOEULA/ { start = 0; } \
> - { if (start) print; } \
> - /<<EOEULA/ { start=1; }'\
> - $(DL_DIR)/$(IMX_VPU_SOURCE) > $(@D)/EULA
> - cd $(BUILD_DIR); \
> - sh $(DL_DIR)/$(IMX_VPU_SOURCE) --force --auto-accept
> + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_VPU_SOURCE))
> endef
>
> define IMX_VPU_BUILD_CMDS
> --
> 1.9.1
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v2 4/9] libfslcodec: Use self-extractible helper
2014-11-19 21:30 [Buildroot] [PATCH v2 0/9] Better handling of freescale self-extractible binaries Jérôme Pouiller
` (2 preceding siblings ...)
2014-11-19 21:30 ` [Buildroot] [PATCH v2 3/9] imx-vpu: " Jérôme Pouiller
@ 2014-11-19 21:30 ` Jérôme Pouiller
2014-11-27 18:18 ` Yann E. MORIN
2014-11-19 21:30 ` [Buildroot] [PATCH v2 5/9] libfslparser: " Jérôme Pouiller
` (5 subsequent siblings)
9 siblings, 1 reply; 18+ messages in thread
From: Jérôme Pouiller @ 2014-11-19 21:30 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
package/libfslcodec/libfslcodec.mk | 23 ++++-------------------
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/package/libfslcodec/libfslcodec.mk b/package/libfslcodec/libfslcodec.mk
index 1a364bb..cf943a8 100644
--- a/package/libfslcodec/libfslcodec.mk
+++ b/package/libfslcodec/libfslcodec.mk
@@ -7,30 +7,15 @@
LIBFSLCODEC_VERSION = 3.0.11
LIBFSLCODEC_SITE = $(FREESCALE_IMX_SITE)
LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin
+LIBFSLCODEC_INSTALL_STAGING = YES
+
+# See freescale-imx.mk
LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers)
LIBFSLCODEC_LICENSE_FILES = EULA EULA.txt
-# This is a legal minefield: the EULA in the bin file specifies that
-# the Board Support Package includes software and hardware (sic!)
-# for which a separate license is needed...
LIBFSLCODEC_REDISTRIBUTE = NO
-LIBFSLCODEC_INSTALL_STAGING = YES
-
-# The archive is a shell-self-extractor of a bzipped tar. It happens
-# to extract in the correct directory (libfslcodec-x.y.z)
-# The --force makes sure it doesn't fail if the source dir already exists.
-# The --auto-accept skips the license check - not needed for us
-# because we have legal-info.
-# Since the EULA in the bin file differs from the one in the tar file,
-# extract the one from the bin file as well.
define LIBFSLCODEC_EXTRACT_CMDS
- awk 'BEGIN { start=0; } \
- /^EOEULA/ { start = 0; } \
- { if (start) print; } \
- /<<EOEULA/ { start=1; }'\
- $(DL_DIR)/$(LIBFSLCODEC_SOURCE) > $(@D)/EULA
- cd $(BUILD_DIR); \
- sh $(DL_DIR)/$(LIBFSLCODEC_SOURCE) --force --auto-accept
+ $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBFSLCODEC_SOURCE))
endef
# FIXME The Makefile installs both the arm9 and arm11 versions of the
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Buildroot] [PATCH v2 4/9] libfslcodec: Use self-extractible helper
2014-11-19 21:30 ` [Buildroot] [PATCH v2 4/9] libfslcodec: " Jérôme Pouiller
@ 2014-11-27 18:18 ` Yann E. MORIN
0 siblings, 0 replies; 18+ messages in thread
From: Yann E. MORIN @ 2014-11-27 18:18 UTC (permalink / raw)
To: buildroot
J?r?me, All,
On 2014-11-19 22:30 +0100, J?r?me Pouiller spake thusly:
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
The variable re-ordering is a bit superfluous, but OK:
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/libfslcodec/libfslcodec.mk | 23 ++++-------------------
> 1 file changed, 4 insertions(+), 19 deletions(-)
>
> diff --git a/package/libfslcodec/libfslcodec.mk b/package/libfslcodec/libfslcodec.mk
> index 1a364bb..cf943a8 100644
> --- a/package/libfslcodec/libfslcodec.mk
> +++ b/package/libfslcodec/libfslcodec.mk
> @@ -7,30 +7,15 @@
> LIBFSLCODEC_VERSION = 3.0.11
> LIBFSLCODEC_SITE = $(FREESCALE_IMX_SITE)
> LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin
> +LIBFSLCODEC_INSTALL_STAGING = YES
> +
> +# See freescale-imx.mk
> LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers)
> LIBFSLCODEC_LICENSE_FILES = EULA EULA.txt
> -# This is a legal minefield: the EULA in the bin file specifies that
> -# the Board Support Package includes software and hardware (sic!)
> -# for which a separate license is needed...
> LIBFSLCODEC_REDISTRIBUTE = NO
>
> -LIBFSLCODEC_INSTALL_STAGING = YES
> -
> -# The archive is a shell-self-extractor of a bzipped tar. It happens
> -# to extract in the correct directory (libfslcodec-x.y.z)
> -# The --force makes sure it doesn't fail if the source dir already exists.
> -# The --auto-accept skips the license check - not needed for us
> -# because we have legal-info.
> -# Since the EULA in the bin file differs from the one in the tar file,
> -# extract the one from the bin file as well.
> define LIBFSLCODEC_EXTRACT_CMDS
> - awk 'BEGIN { start=0; } \
> - /^EOEULA/ { start = 0; } \
> - { if (start) print; } \
> - /<<EOEULA/ { start=1; }'\
> - $(DL_DIR)/$(LIBFSLCODEC_SOURCE) > $(@D)/EULA
> - cd $(BUILD_DIR); \
> - sh $(DL_DIR)/$(LIBFSLCODEC_SOURCE) --force --auto-accept
> + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBFSLCODEC_SOURCE))
> endef
>
> # FIXME The Makefile installs both the arm9 and arm11 versions of the
> --
> 1.9.1
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v2 5/9] libfslparser: Use self-extractible helper
2014-11-19 21:30 [Buildroot] [PATCH v2 0/9] Better handling of freescale self-extractible binaries Jérôme Pouiller
` (3 preceding siblings ...)
2014-11-19 21:30 ` [Buildroot] [PATCH v2 4/9] libfslcodec: " Jérôme Pouiller
@ 2014-11-19 21:30 ` Jérôme Pouiller
2014-11-27 18:19 ` Yann E. MORIN
2014-11-19 21:30 ` [Buildroot] [PATCH v2 6/9] libfslvpuwrap: " Jérôme Pouiller
` (4 subsequent siblings)
9 siblings, 1 reply; 18+ messages in thread
From: Jérôme Pouiller @ 2014-11-19 21:30 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
package/libfslparser/libfslparser.mk | 23 ++++-------------------
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/package/libfslparser/libfslparser.mk b/package/libfslparser/libfslparser.mk
index d52b151..b980ba0 100644
--- a/package/libfslparser/libfslparser.mk
+++ b/package/libfslparser/libfslparser.mk
@@ -7,30 +7,15 @@
LIBFSLPARSER_VERSION = 3.0.11
LIBFSLPARSER_SITE = $(FREESCALE_IMX_SITE)
LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin
+LIBFSLPARSER_INSTALL_STAGING = YES
+
+# See freescale-imx.mk
LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement
LIBFSLPARSER_LICENSE_FILES = EULA EULA.txt
-# This is a legal minefield: the EULA in the bin file specifies that
-# the Board Support Package includes software and hardware (sic!)
-# for which a separate license is needed...
LIBFSLPARSER_REDISTRIBUTE = NO
-LIBFSLPARSER_INSTALL_STAGING = YES
-
-# The archive is a shell-self-extractor of a bzipped tar. It happens
-# to extract in the correct directory (libfslparser-x.y.z)
-# The --force makes sure it doesn't fail if the source dir already exists.
-# The --auto-accept skips the license check - not needed for us
-# because we have legal-info
-# Since the EULA in the bin file differs from the one in the tar file,
-# extract the one from the bin file as well.
define LIBFSLPARSER_EXTRACT_CMDS
- awk 'BEGIN { start=0; } \
- /^EOEULA/ { start = 0; } \
- { if (start) print; } \
- /<<EOEULA/ { start=1; }'\
- $(DL_DIR)/$(LIBFSLPARSER_SOURCE) > $(@D)/EULA
- cd $(BUILD_DIR); \
- sh $(DL_DIR)/$(LIBFSLPARSER_SOURCE) --force --auto-accept
+ $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBFSLPARSER_SOURCE))
endef
# The Makefile installs several versions of the libraries, but we only
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Buildroot] [PATCH v2 5/9] libfslparser: Use self-extractible helper
2014-11-19 21:30 ` [Buildroot] [PATCH v2 5/9] libfslparser: " Jérôme Pouiller
@ 2014-11-27 18:19 ` Yann E. MORIN
0 siblings, 0 replies; 18+ messages in thread
From: Yann E. MORIN @ 2014-11-27 18:19 UTC (permalink / raw)
To: buildroot
J?r?me, All,
On 2014-11-19 22:30 +0100, J?r?me Pouiller spake thusly:
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
Ditto the variable re-ordering.
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/libfslparser/libfslparser.mk | 23 ++++-------------------
> 1 file changed, 4 insertions(+), 19 deletions(-)
>
> diff --git a/package/libfslparser/libfslparser.mk b/package/libfslparser/libfslparser.mk
> index d52b151..b980ba0 100644
> --- a/package/libfslparser/libfslparser.mk
> +++ b/package/libfslparser/libfslparser.mk
> @@ -7,30 +7,15 @@
> LIBFSLPARSER_VERSION = 3.0.11
> LIBFSLPARSER_SITE = $(FREESCALE_IMX_SITE)
> LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin
> +LIBFSLPARSER_INSTALL_STAGING = YES
> +
> +# See freescale-imx.mk
> LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement
> LIBFSLPARSER_LICENSE_FILES = EULA EULA.txt
> -# This is a legal minefield: the EULA in the bin file specifies that
> -# the Board Support Package includes software and hardware (sic!)
> -# for which a separate license is needed...
> LIBFSLPARSER_REDISTRIBUTE = NO
>
> -LIBFSLPARSER_INSTALL_STAGING = YES
> -
> -# The archive is a shell-self-extractor of a bzipped tar. It happens
> -# to extract in the correct directory (libfslparser-x.y.z)
> -# The --force makes sure it doesn't fail if the source dir already exists.
> -# The --auto-accept skips the license check - not needed for us
> -# because we have legal-info
> -# Since the EULA in the bin file differs from the one in the tar file,
> -# extract the one from the bin file as well.
> define LIBFSLPARSER_EXTRACT_CMDS
> - awk 'BEGIN { start=0; } \
> - /^EOEULA/ { start = 0; } \
> - { if (start) print; } \
> - /<<EOEULA/ { start=1; }'\
> - $(DL_DIR)/$(LIBFSLPARSER_SOURCE) > $(@D)/EULA
> - cd $(BUILD_DIR); \
> - sh $(DL_DIR)/$(LIBFSLPARSER_SOURCE) --force --auto-accept
> + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBFSLPARSER_SOURCE))
> endef
>
> # The Makefile installs several versions of the libraries, but we only
> --
> 1.9.1
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v2 6/9] libfslvpuwrap: Use self-extractible helper
2014-11-19 21:30 [Buildroot] [PATCH v2 0/9] Better handling of freescale self-extractible binaries Jérôme Pouiller
` (4 preceding siblings ...)
2014-11-19 21:30 ` [Buildroot] [PATCH v2 5/9] libfslparser: " Jérôme Pouiller
@ 2014-11-19 21:30 ` Jérôme Pouiller
2014-11-27 18:20 ` Yann E. MORIN
2014-11-19 21:30 ` [Buildroot] [PATCH v2 7/9] gpu-viv-bin-mx6q: " Jérôme Pouiller
` (3 subsequent siblings)
9 siblings, 1 reply; 18+ messages in thread
From: Jérôme Pouiller @ 2014-11-19 21:30 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
package/libfslvpuwrap/libfslvpuwrap.mk | 24 +++++-------------------
1 file changed, 5 insertions(+), 19 deletions(-)
diff --git a/package/libfslvpuwrap/libfslvpuwrap.mk b/package/libfslvpuwrap/libfslvpuwrap.mk
index c3a5c1c..3bdab99 100644
--- a/package/libfslvpuwrap/libfslvpuwrap.mk
+++ b/package/libfslvpuwrap/libfslvpuwrap.mk
@@ -7,30 +7,16 @@
LIBFSLVPUWRAP_VERSION = 1.0.46
LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE)
LIBFSLVPUWRAP_SOURCE = libfslvpuwrap-$(LIBFSLVPUWRAP_VERSION).bin
+LIBFSLVPUWRAP_DEPENDENCIES = imx-vpu
+LIBFSLVPUWRAP_INSTALL_STAGING = YES
+
+# See freescale-imx.mk
LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement
-# N.B.: the content of the two license files is different
LIBFSLVPUWRAP_LICENSE_FILES = EULA EULA.txt
LIBFSLVPUWRAP_REDISTRIBUTE = NO
-LIBFSLVPUWRAP_INSTALL_STAGING = YES
-
-LIBFSLVPUWRAP_DEPENDENCIES += imx-vpu
-
-# The archive is a shell-self-extractor of a bzipped tar. It happens
-# to extract in the correct directory (libfslvpuwrap-x.y.z)
-# The --force makes sure it doesn't fail if the source dir already exists.
-# The --auto-accept skips the license check - not needed for us
-# because we have legal-info
-# Since the EULA in the bin file differs from the one in the tar file,
-# extract the one from the bin file as well.
define LIBFSLVPUWRAP_EXTRACT_CMDS
- awk 'BEGIN { start=0; } \
- /^EOEULA/ { start = 0; } \
- { if (start) print; } \
- /<<EOEULA/ { start=1; }'\
- $(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE) > $(@D)/EULA
- cd $(BUILD_DIR); \
- sh $(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE) --force --auto-accept
+ $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE))
endef
$(eval $(autotools-package))
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Buildroot] [PATCH v2 6/9] libfslvpuwrap: Use self-extractible helper
2014-11-19 21:30 ` [Buildroot] [PATCH v2 6/9] libfslvpuwrap: " Jérôme Pouiller
@ 2014-11-27 18:20 ` Yann E. MORIN
0 siblings, 0 replies; 18+ messages in thread
From: Yann E. MORIN @ 2014-11-27 18:20 UTC (permalink / raw)
To: buildroot
J?r?me, All,
On 2014-11-19 22:30 +0100, J?r?me Pouiller spake thusly:
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
Ditto the variable re-ordering...
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/libfslvpuwrap/libfslvpuwrap.mk | 24 +++++-------------------
> 1 file changed, 5 insertions(+), 19 deletions(-)
>
> diff --git a/package/libfslvpuwrap/libfslvpuwrap.mk b/package/libfslvpuwrap/libfslvpuwrap.mk
> index c3a5c1c..3bdab99 100644
> --- a/package/libfslvpuwrap/libfslvpuwrap.mk
> +++ b/package/libfslvpuwrap/libfslvpuwrap.mk
> @@ -7,30 +7,16 @@
> LIBFSLVPUWRAP_VERSION = 1.0.46
> LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE)
> LIBFSLVPUWRAP_SOURCE = libfslvpuwrap-$(LIBFSLVPUWRAP_VERSION).bin
> +LIBFSLVPUWRAP_DEPENDENCIES = imx-vpu
> +LIBFSLVPUWRAP_INSTALL_STAGING = YES
> +
> +# See freescale-imx.mk
> LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement
> -# N.B.: the content of the two license files is different
> LIBFSLVPUWRAP_LICENSE_FILES = EULA EULA.txt
> LIBFSLVPUWRAP_REDISTRIBUTE = NO
>
> -LIBFSLVPUWRAP_INSTALL_STAGING = YES
> -
> -LIBFSLVPUWRAP_DEPENDENCIES += imx-vpu
> -
> -# The archive is a shell-self-extractor of a bzipped tar. It happens
> -# to extract in the correct directory (libfslvpuwrap-x.y.z)
> -# The --force makes sure it doesn't fail if the source dir already exists.
> -# The --auto-accept skips the license check - not needed for us
> -# because we have legal-info
> -# Since the EULA in the bin file differs from the one in the tar file,
> -# extract the one from the bin file as well.
> define LIBFSLVPUWRAP_EXTRACT_CMDS
> - awk 'BEGIN { start=0; } \
> - /^EOEULA/ { start = 0; } \
> - { if (start) print; } \
> - /<<EOEULA/ { start=1; }'\
> - $(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE) > $(@D)/EULA
> - cd $(BUILD_DIR); \
> - sh $(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE) --force --auto-accept
> + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE))
> endef
>
> $(eval $(autotools-package))
> --
> 1.9.1
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v2 7/9] gpu-viv-bin-mx6q: Use self-extractible helper
2014-11-19 21:30 [Buildroot] [PATCH v2 0/9] Better handling of freescale self-extractible binaries Jérôme Pouiller
` (5 preceding siblings ...)
2014-11-19 21:30 ` [Buildroot] [PATCH v2 6/9] libfslvpuwrap: " Jérôme Pouiller
@ 2014-11-19 21:30 ` Jérôme Pouiller
2014-11-27 19:22 ` Yann E. MORIN
2014-11-19 21:30 ` [Buildroot] [PATCH v2 8/9] libz160: " Jérôme Pouiller
` (2 subsequent siblings)
9 siblings, 1 reply; 18+ messages in thread
From: Jérôme Pouiller @ 2014-11-19 21:30 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
.../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
index 85d01d2..1e731b3 100644
--- a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
@@ -12,29 +12,17 @@ GPU_VIV_BIN_MX6Q_VERSION = $(GPU_VIV_BIN_MX6Q_BASE_VERSION)-sfp
endif
GPU_VIV_BIN_MX6Q_SITE = $(FREESCALE_IMX_SITE)
GPU_VIV_BIN_MX6Q_SOURCE = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION).bin
-
GPU_VIV_BIN_MX6Q_INSTALL_STAGING = YES
+GPU_VIV_BIN_MX6Q_PROVIDES = libegl libgles libopenvg
+GPU_VIV_BIN_MX6Q_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT))
+# See freescale-imx.mk
GPU_VIV_BIN_MX6Q_LICENSE = Freescale Semiconductor Software License Agreement
-
-# No license file is included in the archive; we could extract it from
-# the self-extractor, but that's just too much effort.
-# 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...
+GPU_VIV_BIN_MX6Q_LICENSE_FILES = EULA
GPU_VIV_BIN_MX6Q_REDISTRIBUTE = NO
-GPU_VIV_BIN_MX6Q_PROVIDES = libegl libgles libopenvg
-GPU_VIV_BIN_MX6Q_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT))
-
-# The archive is a shell-self-extractor of a bzipped tar. It happens
-# to extract in the correct directory (gpu-viv-bin-mx6q-x.y.z)
-# The --force makes sure it doesn't fail if the source dir already exists.
-# The --auto-accept skips the license check - not needed for us
-# because we have legal-info.
define GPU_VIV_BIN_MX6Q_EXTRACT_CMDS
- (cd $(BUILD_DIR); \
- sh $(DL_DIR)/$(GPU_VIV_BIN_MX6Q_SOURCE) --force --auto-accept)
+ $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(GPU_VIV_BIN_MX6Q_SOURCE))
endef
# Instead of building, we fix up the inconsistencies that exist
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Buildroot] [PATCH v2 7/9] gpu-viv-bin-mx6q: Use self-extractible helper
2014-11-19 21:30 ` [Buildroot] [PATCH v2 7/9] gpu-viv-bin-mx6q: " Jérôme Pouiller
@ 2014-11-27 19:22 ` Yann E. MORIN
0 siblings, 0 replies; 18+ messages in thread
From: Yann E. MORIN @ 2014-11-27 19:22 UTC (permalink / raw)
To: buildroot
J?r?me, All,
On 2014-11-19 22:30 +0100, J?r?me Pouiller spake thusly:
> Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
Ditto the variable re-ordering...
Reported-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 22 +++++-----------------
> 1 file changed, 5 insertions(+), 17 deletions(-)
>
> diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
> index 85d01d2..1e731b3 100644
> --- a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
> +++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
> @@ -12,29 +12,17 @@ GPU_VIV_BIN_MX6Q_VERSION = $(GPU_VIV_BIN_MX6Q_BASE_VERSION)-sfp
> endif
> GPU_VIV_BIN_MX6Q_SITE = $(FREESCALE_IMX_SITE)
> GPU_VIV_BIN_MX6Q_SOURCE = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION).bin
> -
> GPU_VIV_BIN_MX6Q_INSTALL_STAGING = YES
> +GPU_VIV_BIN_MX6Q_PROVIDES = libegl libgles libopenvg
> +GPU_VIV_BIN_MX6Q_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT))
>
> +# See freescale-imx.mk
> GPU_VIV_BIN_MX6Q_LICENSE = Freescale Semiconductor Software License Agreement
> -
> -# No license file is included in the archive; we could extract it from
> -# the self-extractor, but that's just too much effort.
> -# 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...
> +GPU_VIV_BIN_MX6Q_LICENSE_FILES = EULA
> GPU_VIV_BIN_MX6Q_REDISTRIBUTE = NO
>
> -GPU_VIV_BIN_MX6Q_PROVIDES = libegl libgles libopenvg
> -GPU_VIV_BIN_MX6Q_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT))
> -
> -# The archive is a shell-self-extractor of a bzipped tar. It happens
> -# to extract in the correct directory (gpu-viv-bin-mx6q-x.y.z)
> -# The --force makes sure it doesn't fail if the source dir already exists.
> -# The --auto-accept skips the license check - not needed for us
> -# because we have legal-info.
> define GPU_VIV_BIN_MX6Q_EXTRACT_CMDS
> - (cd $(BUILD_DIR); \
> - sh $(DL_DIR)/$(GPU_VIV_BIN_MX6Q_SOURCE) --force --auto-accept)
> + $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(GPU_VIV_BIN_MX6Q_SOURCE))
> endef
>
> # Instead of building, we fix up the inconsistencies that exist
> --
> 1.9.1
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Buildroot] [PATCH v2 8/9] libz160: Use self-extractible helper
2014-11-19 21:30 [Buildroot] [PATCH v2 0/9] Better handling of freescale self-extractible binaries Jérôme Pouiller
` (6 preceding siblings ...)
2014-11-19 21:30 ` [Buildroot] [PATCH v2 7/9] gpu-viv-bin-mx6q: " Jérôme Pouiller
@ 2014-11-19 21:30 ` Jérôme Pouiller
2014-11-19 21:30 ` [Buildroot] [PATCH v2 9/9] gpu-amd-bin-mx51: " Jérôme Pouiller
2014-11-27 21:29 ` [Buildroot] [PATCH v2 0/9] Better handling of freescale self-extractible binaries Thomas Petazzoni
9 siblings, 0 replies; 18+ messages in thread
From: Jérôme Pouiller @ 2014-11-19 21:30 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
package/freescale-imx/libz160/libz160.mk | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/package/freescale-imx/libz160/libz160.mk b/package/freescale-imx/libz160/libz160.mk
index d083d81..c2442d1 100644
--- a/package/freescale-imx/libz160/libz160.mk
+++ b/package/freescale-imx/libz160/libz160.mk
@@ -7,25 +7,14 @@ LIBZ160_VERSION = 11.09.01
LIBZ160_SOURCE = libz160-bin-$(LIBZ160_VERSION).bin
LIBZ160_SITE = $(FREESCALE_IMX_SITE)
LIBZ160_INSTALL_STAGING = YES
-LIBZ160_LICENSE = Freescale Semiconductor Software License Agreement
-# No license file is included in the archive; we could extract it from
-# the self-extractor, but that's just too much effort.
-# 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...
+# See freescale-imx
+LIBZ160_LICENSE = Freescale Semiconductor Software License Agreement
+LIBZ160_LICENSE_FILES = EULA
LIBZ160_REDISTRIBUTE = NO
-# The archive is a shell-self-extractor of a bzipped tar. Output directory
-# depends of version of source.
-# The --force makes sure it doesn't fail if the source dir already exists.
-# The --auto-accept skips the license check - not needed for us
-# because we have legal-info.
define LIBZ160_EXTRACT_CMDS
- (cd $(@D); \
- sh $(DL_DIR)/$(LIBZ160_SOURCE) --force --auto-accept)
- mv $(@D)/libz160-bin-$(LIBZ160_VERSION)/* $(@D)
- rmdir $(@D)/libz160-bin-$(LIBZ160_VERSION)
+ $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(LIBZ160_SOURCE))
endef
define LIBZ160_INSTALL_STAGING_CMDS
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Buildroot] [PATCH v2 9/9] gpu-amd-bin-mx51: Use self-extractible helper
2014-11-19 21:30 [Buildroot] [PATCH v2 0/9] Better handling of freescale self-extractible binaries Jérôme Pouiller
` (7 preceding siblings ...)
2014-11-19 21:30 ` [Buildroot] [PATCH v2 8/9] libz160: " Jérôme Pouiller
@ 2014-11-19 21:30 ` Jérôme Pouiller
2014-11-27 21:29 ` [Buildroot] [PATCH v2 0/9] Better handling of freescale self-extractible binaries Thomas Petazzoni
9 siblings, 0 replies; 18+ messages in thread
From: Jérôme Pouiller @ 2014-11-19 21:30 UTC (permalink / raw)
To: buildroot
Signed-off-by: J?r?me Pouiller <jezz@sysmic.org>
---
.../gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk | 27 ++++++++--------------
1 file changed, 9 insertions(+), 18 deletions(-)
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 c4ff917..ca20a85 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
@@ -3,36 +3,27 @@
# gpu-amd-bin-mx51
#
#############################################################
-GPU_AMD_BIN_MX51_VERSION = 11.09.01
GPU_AMD_BIN_MX51_SITE = $(FREESCALE_IMX_SITE)
+GPU_AMD_BIN_MX51_BASE_VERSION = 11.09.01
ifeq ($(BR2_PACKAGE_GPU_AMD_BIN_MX51_OUTPUT_FB),y)
-GPU_AMD_BIN_MX51_SOURCE = amd-gpu-bin-mx51-$(GPU_AMD_BIN_MX51_VERSION).bin
+GPU_AMD_BIN_MX51_VERSION = $(GPU_AMD_BIN_MX51_BASE_VERSION)-fb
+GPU_AMD_BIN_MX51_SOURCE = amd-gpu-bin-mx51-$(GPU_AMD_BIN_MX51_BASE_VERSION).bin
else
-GPU_AMD_BIN_MX51_SOURCE = amd-gpu-x11-bin-mx51-$(GPU_AMD_BIN_MX51_VERSION).bin
+GPU_AMD_BIN_MX51_VERSION = $(GPU_AMD_BIN_MX51_BASE_VERSION)-x11
+GPU_AMD_BIN_MX51_SOURCE = amd-gpu-x11-bin-mx51-$(GPU_AMD_BIN_MX51_BASE_VERSION).bin
GPU_AMD_BIN_MX51_DEPENDENCIES = libxcb xlib_libX11 xlib_libXext \
xlib_libXrender xlib_libXau xlib_libXdmcp
endif
GPU_AMD_BIN_MX51_PROVIDES = libegl libgles libopenvg
-GPU_AMD_BIN_MX51_LICENSE = Freescale Semiconductor Software License Agreement
GPU_AMD_BIN_MX51_INSTALL_STAGING = YES
-# No license file is included in the archive; we could extract it from
-# the self-extractor, but that's just too much effort.
-# 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...
+# See freescale-imx.mk
+GPU_AMD_BIN_MX51_LICENSE = Freescale Semiconductor Software License Agreement
+GPU_AMD_BIN_MX51_LICENSE_FILES = EULA
GPU_AMD_BIN_MX51_REDISTRIBUTE = NO
-# The archive is a shell-self-extractor of a bzipped tar. Output directory
-# depends of version of source.
-# The --force makes sure it doesn't fail if the source dir already exists.
-# The --auto-accept skips the license check - not needed for us
-# because we have legal-info.
define GPU_AMD_BIN_MX51_EXTRACT_CMDS
- (cd $(@D); \
- sh $(DL_DIR)/$(GPU_AMD_BIN_MX51_SOURCE) --force --auto-accept)
- mv $(@D)/amd-gpu*-bin-mx51-$(GPU_AMD_BIN_MX51_VERSION)/* $(@D)
- rmdir $(@D)/amd-gpu*-bin-mx51-$(GPU_AMD_BIN_MX51_VERSION)
+ $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(GPU_AMD_BIN_MX51_SOURCE))
endef
define GPU_AMD_BIN_MX51_BUILD_CMDS
--
1.9.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Buildroot] [PATCH v2 0/9] Better handling of freescale self-extractible binaries
2014-11-19 21:30 [Buildroot] [PATCH v2 0/9] Better handling of freescale self-extractible binaries Jérôme Pouiller
` (8 preceding siblings ...)
2014-11-19 21:30 ` [Buildroot] [PATCH v2 9/9] gpu-amd-bin-mx51: " Jérôme Pouiller
@ 2014-11-27 21:29 ` Thomas Petazzoni
9 siblings, 0 replies; 18+ messages in thread
From: Thomas Petazzoni @ 2014-11-27 21:29 UTC (permalink / raw)
To: buildroot
Dear J?r?me Pouiller,
On Wed, 19 Nov 2014 22:30:33 +0100, J?r?me Pouiller wrote:
> J?r?me Pouiller (9):
> freescale-imx: Add helper to extract self-extractible binaries
Applied, after doing several fixes. One of the fix was very important,
since without it, your patch was simply not working. It would be good
to at least minimally test build patches before sending them. See my
changelog:
[Thomas:
- reword the comment of the new macro, and add details about the
expected arguments, as suggested by Yann E. Morin.
- rework the logic to move the files in $(@D), as it was simply not
working in the original patch. $(basename $(1)) was used to get the
filename without the extension, but it also contains the full
path. $(basename $(notdir $(1))) is needed.]
> firmware-imx: Use self-extractible helper
> imx-vpu: Use self-extractible helper
> libfslcodec: Use self-extractible helper
> libfslparser: Use self-extractible helper
> libfslvpuwrap: Use self-extractible helper
All applied, after removing the useless "See freescale-imx.mk" comment.
> gpu-viv-bin-mx6q: Use self-extractible helper
This patch does not apply to the next branch. Could you respin?
> libz160: Use self-extractible helper
Applied, but merged into the patch adding libz160.
> gpu-amd-bin-mx51: Use self-extractible helper
I haven't handled this new package yet.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 18+ messages in thread