i.MX updates
v4 cover i.MX updates
This patch series updates Freescale packages for i.MX processors to use the Freescale MAD/YOCTO repository and updates the versions to match the latest release.
Eric Nelson (2):
i.MX: Use FREESCALE_IMX_SITE for Freescale packages i.MX: Update versions to match latest Freescale release
V2 skipped moving libfslx packages into packages/freescale-imx V3 incorporates gstreamer plugin patch from
http://patchwork.ozlabs.org/patch/279625
and re-works the patch into two steps as suggested by Thomas Petazzoni:
- rename and use FREESCALE_IMX_SITE
- bump revisions and change site to freescale.com
V4 addresses comments by Arnout regarding license files
and comments
package/freescale-imx/firmware-imx/firmware-imx.mk | 2 +- package/freescale-imx/freescale-imx.mk | 6 ++---- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 8 +++++-- package/freescale-imx/imx-lib/imx-lib.mk | 24 ++++++++++++++++++--- .../gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 5 ++--- package/libfslcodec/libfslcodec.mk | 5 ++--- package/libfslparser/libfslparser.mk | 10 ++++++--- package/libfslvpuwrap/libfslvpuwrap.mk | 25 ++++++++++++++++++---- 8 files changed, 62 insertions(+), 23 deletions(-)
Signature · 1 line
1.8.1.2
PATCH v4 1/2 i.MX: Use FREESCALE_IMX_SITE for Freescale packages
This patch consolidates the URLs for various Freescale-supplied packages to use FREESCALE_IMX_SITE.
---
No changes in V4.
package/freescale-imx/firmware-imx/firmware-imx.mk | 2 +- package/freescale-imx/freescale-imx.mk | 2 +- package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 2 +- package/freescale-imx/imx-lib/imx-lib.mk | 2 +- package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 3 +-- package/libfslcodec/libfslcodec.mk | 3 +-- package/libfslparser/libfslparser.mk | 3 +-- package/libfslvpuwrap/libfslvpuwrap.mk | 3 +-- 8 files changed, 8 insertions(+), 12 deletions(-)
package/freescale-imx/firmware-imx/firmware-imx.mk +1 -1
@@ -5,7 +5,7 @@ ################################################################################ FIRMWARE_IMX_VERSION = $(FREESCALE_IMX_VERSION) -FIRMWARE_IMX_SITE = $(FREESCALE_IMX_MIRROR_SITE) +FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE) FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin FIRMWARE_IMX_LICENSE = Freescale Semiconductor Software License Agreement, \ Atheros license (ath6k)
package/freescale-imx/freescale-imx.mk +1 -1
@@ -7,6 +7,6 @@ FREESCALE_IMX_VERSION = 1.1.0 # No official download site from freescale, just this mirror -FREESCALE_IMX_MIRROR_SITE = http://download.ossystems.com.br/bsp/freescale/source +FREESCALE_IMX_SITE = http://download.ossystems.com.br/bsp/freescale/source include $(sort $(wildcard package/freescale-imx/*/*.mk))
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk +1 -1
@@ -5,7 +5,7 @@ ################################################################################ GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION) -GPU_VIV_BIN_MX6Q_SITE = $(FREESCALE_IMX_MIRROR_SITE) +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
package/freescale-imx/imx-lib/imx-lib.mk +1 -1
@@ -5,7 +5,7 @@ ################################################################################ IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION) -IMX_LIB_SITE = $(FREESCALE_IMX_MIRROR_SITE) +IMX_LIB_SITE = $(FREESCALE_IMX_SITE) IMX_LIB_LICENSE = LGPLv2.1+ # No license file included
package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk +1 -2
@@ -5,8 +5,7 @@ ################################################################################ GST_FSL_PLUGINS_VERSION = 3.0.1 -# No official download site from freescale, just this mirror -GST_FSL_PLUGINS_SITE = http://download.ossystems.com.br/bsp/freescale/source +GST_FSL_PLUGINS_SITE = $(FREESCALE_IMX_SITE) # Most is LGPLv2+, but some sources are copied from upstream and are # LGPLv2.1+, which essentially makes it LGPLv2.1+
package/libfslcodec/libfslcodec.mk +1 -2
@@ -5,8 +5,7 @@ ################################################################################ LIBFSLCODEC_VERSION = 3.0.1 -# No official download site from freescale, just this mirror -LIBFSLCODEC_SITE = http://download.ossystems.com.br/bsp/freescale/source +LIBFSLCODEC_SITE = $(FREESCALE_IMX_SITE) LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers) LIBFSLCODEC_LICENSE_FILES = EULA EULA.txt
package/libfslparser/libfslparser.mk +1 -2
@@ -5,8 +5,7 @@ ################################################################################ LIBFSLPARSER_VERSION = 3.0.1 -# No official download site from freescale, just this mirror -LIBFSLPARSER_SITE = http://download.ossystems.com.br/bsp/freescale/source +LIBFSLPARSER_SITE = $(FREESCALE_IMX_SITE) LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement LIBFSLPARSER_LICENSE_FILES = EULA EULA.txt
package/libfslvpuwrap/libfslvpuwrap.mk +1 -2
@@ -5,8 +5,7 @@ ################################################################################ LIBFSLVPUWRAP_VERSION = 1.0.17 -# No official download site from freescale, just this mirror -LIBFSLVPUWRAP_SITE = http://download.ossystems.com.br/bsp/freescale/source +LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE) LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement LIBFSLVPUWRAP_LICENSE_FILES = EULA.txt LIBFSLVPUWRAP_REDISTRIBUTE = NO
Signature · 1 line
1.8.1.2
PATCH v4 1/2 i.MX: Use FREESCALE_IMX_SITE for Freescale packages
Eric, All,
On 2013-10-08 20:05 -0700, Eric Nelson spake thusly:
Quoted 4 lines
This patch consolidates the URLs for various Freescale-supplied packages to use
FREESCALE_IMX_SITE.Signed-off-by Eric Nelson <[email protected]>
Also, I believe Thomas Petazzoni already provided his own revewed-by tag for your v3:
http://patchwork.ozlabs.org/patch/280899/
Peter, I guess this is good for -next.
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH v4 1/2 i.MX: Use FREESCALE_IMX_SITE for Freescale packages
Quoted 8 lines · Yann E. MORIN
Eric, All,
On 2013-10-08 20:05 -0700, Eric Nelson spake thusly:
Quoted 4 lines
This patch consolidates the URLs for various Freescale-supplied packages to use
FREESCALE_IMX_SITE.Signed-off-by Eric Nelson <[email protected]>
Quoted 8 lines
Reviewed-by "Yann E. MORIN" <[email protected]>Also, I believe Thomas Petazzoni already provided his own revewed-by tag for your v3:
http://patchwork.ozlabs.org/patch/280899/Peter, I guess this is good for -next.
Many thanks Yann.
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
In reply to Eric Nelson---
V4 addresses comments from Arnout Vandecappelle:
- Reworks license statement and extracts EULA for imx-lib
- Adds comment about AUTORECONF to libfslparser
- Adds EULA to LIBFSLVPUWRAP_LICENSE_FILES
package/freescale-imx/freescale-imx.mk | 6 ++---- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 6 +++++- package/freescale-imx/imx-lib/imx-lib.mk | 22 ++++++++++++++++++++-- .../gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 2 +- package/libfslcodec/libfslcodec.mk | 2 +- package/libfslparser/libfslparser.mk | 7 ++++++- package/libfslvpuwrap/libfslvpuwrap.mk | 22 ++++++++++++++++++++-- 7 files changed, 55 insertions(+), 12 deletions(-)
package/freescale-imx/freescale-imx.mk +2 -4
@@ -4,9 +4,7 @@ # ################################################################################ -FREESCALE_IMX_VERSION = 1.1.0 - -# No official download site from freescale, just this mirror -FREESCALE_IMX_SITE = http://download.ossystems.com.br/bsp/freescale/source +FREESCALE_IMX_VERSION = 3.5.7-1.0.0 +FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/ include $(sort $(wildcard package/freescale-imx/*/*.mk))
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk +5 -1
@@ -4,7 +4,11 @@ # ################################################################################ -GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION) +ifeq ($(BR2_ARM_EABIHF),y) +GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)-hfp +else +GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_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
package/freescale-imx/imx-lib/imx-lib.mk +20 -2
@@ -6,8 +6,9 @@ IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION) IMX_LIB_SITE = $(FREESCALE_IMX_SITE) -IMX_LIB_LICENSE = LGPLv2.1+ -# No license file included +IMX_LIB_LICENSE = IMX_LIB_LICENSE = Freescale Semiconductor Software License Agreement (vpu), LGPLv2.1+ (the rest) +IMX_LIB_LICENSE_FILES = EULA +IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).bin IMX_LIB_INSTALL_STAGING = YES
@@ -25,6 +26,23 @@ IMX_LIB_MAKE_ENV = \ PLATFORM=$(BR2_PACKAGE_IMX_LIB_PLATFORM) \ INCLUDE="$(IMX_LIB_INCLUDE)" +# The archive is a shell-self-extractor of a bzipped tar. It happens +# to extract in the correct directory (imx-lib-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-lib-x.y.z/EULA +# +define IMX_LIB_EXTRACT_CMDS + awk 'BEGIN { start=0; } \ + /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /<<EOEULA/ { start=1; }'\ + $(DL_DIR)/$(IMX_LIB_SOURCE) > $(@D)/EULA + cd $(BUILD_DIR); \ + sh $(DL_DIR)/$(IMX_LIB_SOURCE) --force --auto-accept +endef + define IMX_LIB_BUILD_CMDS $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) endef
package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -GST_FSL_PLUGINS_VERSION = 3.0.1 +GST_FSL_PLUGINS_VERSION = $(FREESCALE_IMX_VERSION) GST_FSL_PLUGINS_SITE = $(FREESCALE_IMX_SITE) # Most is LGPLv2+, but some sources are copied from upstream and are
package/libfslcodec/libfslcodec.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LIBFSLCODEC_VERSION = 3.0.1 +LIBFSLCODEC_VERSION = $(FREESCALE_IMX_VERSION) LIBFSLCODEC_SITE = $(FREESCALE_IMX_SITE) LIBFSLCODEC_SOURCE = libfslcodec-$(LIBFSLCODEC_VERSION).bin LIBFSLCODEC_LICENSE = Freescale Semiconductor Software License Agreement, BSD-3c (flac, ogg headers)
package/libfslparser/libfslparser.mk +6 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LIBFSLPARSER_VERSION = 3.0.1 +LIBFSLPARSER_VERSION = $(FREESCALE_IMX_VERSION) LIBFSLPARSER_SITE = $(FREESCALE_IMX_SITE) LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement
@@ -36,4 +36,9 @@ endef # The Makefile installs several versions of the libraries, but we only # need one of them, depending on the platform. +# +# without AUTORECONF, configure fails to find install-sh. +# +LIBFSLPARSER_AUTORECONF = YES + $(eval $(autotools-package))
package/libfslvpuwrap/libfslvpuwrap.mk +20 -2
@@ -4,14 +4,32 @@ # ################################################################################ -LIBFSLVPUWRAP_VERSION = 1.0.17 +LIBFSLVPUWRAP_VERSION = $(FREESCALE_IMX_VERSION) LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE) +LIBFSLVPUWRAP_SOURCE = libfslvpuwrap-$(LIBFSLVPUWRAP_VERSION).bin LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement -LIBFSLVPUWRAP_LICENSE_FILES = EULA.txt +LIBFSLVPUWRAP_LICENSE_FILES = EULA EULA.txt LIBFSLVPUWRAP_REDISTRIBUTE = NO LIBFSLVPUWRAP_INSTALL_STAGING = YES LIBFSLVPUWRAP_DEPENDENCIES += imx-lib +# 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 +endef + $(eval $(autotools-package))
Signature · 1 line
1.8.1.2
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
Eric, All,
On 2013-10-08 20:05 -0700, Eric Nelson spake thusly:
Quoted 1 line
Signed-off-by Eric Nelson <[email protected]>
[--SNIP--]
Quoted 5 lines
package/freescale-imx/freescale-imx.mk +0
-0
package/freescale-imx/freescale-imx.mk line 8
Quoted 9 lines
package/freescale-imx/freescale-imx.mk +2
-4@@ -4,9 +4,7 @@ # ################################################################################ -FREESCALE_IMX_VERSION = 1.1.0 - -# No official download site from freescale, just this mirror -FREESCALE_IMX_SITE = http://download.ossystems.com.br/bsp/freescale/source +FREESCALE_IMX_VERSION = 3.5.7-1.0.0 +FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
It looks like this site is no longer valid. The webpage states:
The system is currently unavailable.
And trying to retrieve any tarball from there result in a 404:
$ wget 'http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/gpu-viv-bin-mx6q-3.5.7-1.0.0.bin' HTTP request sent, awaiting response... 404 Not Found
While the previous 'mirror' still works, and has all the referenced tarballs.
So, maybe keep the mirror for now?
Otherwise, I was about to send such a bump-patch. You beat me to it (by a large margin, at that!).
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
Eric, All,
On 2014-02-12 19:23 +0100, Yann E. MORIN spake thusly:
Quoted 20 lines
On 2013-10-08 20:05 -0700, Eric Nelson spake thusly:
Quoted 1 line
Signed-off-by Eric Nelson <[email protected]>[--SNIP--]
Quoted 5 lines
package/freescale-imx/freescale-imx.mk +0
-0package/freescale-imx/freescale-imx.mk line 8
Quoted 9 lines
package/freescale-imx/freescale-imx.mk +2
-4@@ -4,9 +4,7 @@ # ################################################################################ -FREESCALE_IMX_VERSION = 1.1.0 - -# No official download site from freescale, just this mirror -FREESCALE_IMX_SITE = http://download.ossystems.com.br/bsp/freescale/source +FREESCALE_IMX_VERSION = 3.5.7-1.0.0 +FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/It looks like this site is no longer valid. The webpage states:
Quoted 6 lines
The system is currently unavailable.
And trying to retrieve any tarball from there result in a 404:
$ wget 'http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/gpu-viv-bin-mx6q-3.5.7-1.0.0.bin' HTTP request sent, awaiting response... 404 Not Found
OK, bear with me, I made a typo when copy-pasting the tarball name: I forgot to append either -sfp or -hfp. With that added, the tarball downloads OK.
So, forget my previous mail. I'll do another pass at testing this better.
Sorry for the noise. :-(
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
In reply to Eric NelsonEric, All,
A (hopefully!) better review this time...
On 2013-10-08 20:05 -0700, Eric Nelson spake thusly:
Quoted 1 line
Signed-off-by Eric Nelson <[email protected]>
[--SNIP--]
Quoted 6 lines
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk +0
-0@@ -4,7 +4,11 @@ #
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk line 13
Quoted 10 lines
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk +5
-1################################################################################ -GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION) +ifeq ($(BR2_ARM_EABIHF),y) +GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)-hfp +else +GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_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
I think we should make the source conditional on BR2_ARM_EABIHF, not the version:
GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)
ifeq ($(BR2_ARM_EABIHF),y)
GPU_VIV_BIN_MX6Q_SOURCE = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION)-hfp.bin
else
GPU_VIV_BIN_MX6Q_SOURCE = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION)-sfp.bin
endifpackage/freescale-imx/imx-lib/imx-lib.mk line 9
Quoted 11 lines
package/freescale-imx/imx-lib/imx-lib.mk +1
-2@@ -6,8 +6,9 @@ IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION) IMX_LIB_SITE = $(FREESCALE_IMX_SITE) -IMX_LIB_LICENSE = LGPLv2.1+ -# No license file included +IMX_LIB_LICENSE = IMX_LIB_LICENSE = Freescale Semiconductor Software License Agreement (vpu), LGPLv2.1+ (the rest)
Double IMX_LIB_LICENSE there.
This is a rather long license name. What about:
IMX_LIB_LICENSE = Freescale License (vpu), LGPLv2.1+ (the rest)
Quoted 15 lines
package/freescale-imx/imx-lib/imx-lib.mk +8
-0+IMX_LIB_LICENSE_FILES = EULA +IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).bin IMX_LIB_INSTALL_STAGING = YES@@ -25,6 +26,23 @@ IMX_LIB_MAKE_ENV = \ PLATFORM=$(BR2_PACKAGE_IMX_LIB_PLATFORM) \ INCLUDE="$(IMX_LIB_INCLUDE)" +# The archive is a shell-self-extractor of a bzipped tar. It happens +# to extract in the correct directory (imx-lib-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-lib-x.y.z/EULA
package/freescale-imx/imx-lib/imx-lib.mk IMX_LIB_MAKE_ENV = \ · line 44
Quoted 10 lines
package/freescale-imx/imx-lib/imx-lib.mk +10
-0+# +define IMX_LIB_EXTRACT_CMDS + awk 'BEGIN { start=0; } \ + /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /<<EOEULA/ { start=1; }'\ + $(DL_DIR)/$(IMX_LIB_SOURCE) > $(@D)/EULA + cd $(BUILD_DIR); \ + sh $(DL_DIR)/$(IMX_LIB_SOURCE) --force --auto-accept +endef
$ make imx-lib-extract
[...]
Unpacking file mkdir: cannot create directory ?imx-lib-3.5.7-1.0.0?:
File existsThis is only a warning, but still: maybe extract the EULA _after_ unpacking the archive?
Quoted 14 lines
package/libfslparser/libfslparser.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -LIBFSLPARSER_VERSION = 3.0.1 +LIBFSLPARSER_VERSION = $(FREESCALE_IMX_VERSION) LIBFSLPARSER_SITE = $(FREESCALE_IMX_SITE) LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement
package/libfslparser/libfslparser.mk endef · line 41
Quoted 6 lines
package/libfslparser/libfslparser.mk +3
-0@@ -36,4 +36,9 @@ endef # The Makefile installs several versions of the libraries, but we only # need one of them, depending on the platform. +# +# without AUTORECONF, configure fails to find install-sh. +#
No need for leading/trailing comment lines, just the line with the actual comment.
Quoted 5 lines
package/libfslvpuwrap/libfslvpuwrap.mk +0
-0
package/libfslvpuwrap/libfslvpuwrap.mk line 11
Quoted 10 lines
package/libfslvpuwrap/libfslvpuwrap.mk +3
-2@@ -4,14 +4,32 @@ # ################################################################################ -LIBFSLVPUWRAP_VERSION = 1.0.17 +LIBFSLVPUWRAP_VERSION = $(FREESCALE_IMX_VERSION) LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE) +LIBFSLVPUWRAP_SOURCE = libfslvpuwrap-$(LIBFSLVPUWRAP_VERSION).bin LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement -LIBFSLVPUWRAP_LICENSE_FILES = EULA.txt +LIBFSLVPUWRAP_LICENSE_FILES = EULA EULA.txt
A comment that both EULA are not the same would be nice:
# The contents of those two EULA are not the same:
LIBFSLVPUWRAP_LICENSE_FILES = EULA EULA.txt
Quoted 12 lines
package/libfslvpuwrap/libfslvpuwrap.mk +6
-0LIBFSLVPUWRAP_REDISTRIBUTE = NO LIBFSLVPUWRAP_INSTALL_STAGING = YES LIBFSLVPUWRAP_DEPENDENCIES += imx-lib +# 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,
package/libfslvpuwrap/libfslvpuwrap.mk line 33
Quoted 10 lines
package/libfslvpuwrap/libfslvpuwrap.mk +10
-0+# 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 +endef
Ditto the mkdir warning.
Ditto extract EULA after unpacking the archive.
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
Hi Yann,
Quoted 27 lines · Yann E. MORIN
Eric, All,
A (hopefully!) better review this time...
On 2013-10-08 20:05 -0700, Eric Nelson spake thusly:
Quoted 1 line
Signed-off-by Eric Nelson <[email protected]>[--SNIP--]
Quoted 6 lines
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk +0
-0@@ -4,7 +4,11 @@ #package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk line 13
Quoted 10 lines
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk +5
-1################################################################################ -GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION) +ifeq ($(BR2_ARM_EABIHF),y) +GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)-hfp +else +GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_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).binI think we should make the source conditional on
BR2_ARM_EABIHF, not the version:
Quoted 7 lines
GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)
ifeq ($(BR2_ARM_EABIHF),y)
GPU_VIV_BIN_MX6Q_SOURCE = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION)-hfp.bin
else
GPU_VIV_BIN_MX6Q_SOURCE = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION)-sfp.bin
endifAgreed. This is nicer.
Quoted 14 lines
package/freescale-imx/imx-lib/imx-lib.mk line 9
Quoted 11 lines
package/freescale-imx/imx-lib/imx-lib.mk +1
-2@@ -6,8 +6,9 @@ IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION) IMX_LIB_SITE = $(FREESCALE_IMX_SITE) -IMX_LIB_LICENSE = LGPLv2.1+ -# No license file included +IMX_LIB_LICENSE = IMX_LIB_LICENSE = Freescale Semiconductor Software License Agreement (vpu), LGPLv2.1+ (the rest)Double
IMX_LIB_LICENSEthere.
Quoted 4 lines
This is a rather long license name. What about:
IMX_LIB_LICENSE= Freescale License (vpu), LGPLv2.1+ (the rest)
This also works for me.
Quoted 31 lines
Quoted 15 lines
package/freescale-imx/imx-lib/imx-lib.mk +8
-0+IMX_LIB_LICENSE_FILES = EULA +IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).bin IMX_LIB_INSTALL_STAGING = YES@@ -25,6 +26,23 @@ IMX_LIB_MAKE_ENV = \ PLATFORM=$(BR2_PACKAGE_IMX_LIB_PLATFORM) \ INCLUDE="$(IMX_LIB_INCLUDE)" +# The archive is a shell-self-extractor of a bzipped tar. It happens +# to extract in the correct directory (imx-lib-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-lib-x.y.z/EULApackage/freescale-imx/imx-lib/imx-lib.mk IMX_LIB_MAKE_ENV = \ · line 44
Quoted 10 lines
package/freescale-imx/imx-lib/imx-lib.mk +10
-0+# +define IMX_LIB_EXTRACT_CMDS + awk 'BEGIN { start=0; } \ + /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /<<EOEULA/ { start=1; }'\ + $(DL_DIR)/$(IMX_LIB_SOURCE) > $(@D)/EULA + cd $(BUILD_DIR); \ + sh $(DL_DIR)/$(IMX_LIB_SOURCE) --force --auto-accept +endef$ make imx-lib-extract [...] Unpacking file mkdir: cannot create directory ?imx-lib-3.5.7-1.0.0?: File exists
Quoted 3 lines
This is only a warning, but still: maybe extract the EULA _after_ unpacking the archive?
Sure. I'll re-work.
Quoted 17 lines
Quoted 17 lines
package/libfslparser/libfslparser.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -LIBFSLPARSER_VERSION = 3.0.1 +LIBFSLPARSER_VERSION = $(FREESCALE_IMX_VERSION) LIBFSLPARSER_SITE = $(FREESCALE_IMX_SITE) LIBFSLPARSER_SOURCE = libfslparser-$(LIBFSLPARSER_VERSION).bin LIBFSLPARSER_LICENSE = Freescale Semiconductor Software License Agreement@@ -36,4 +36,9 @@ endef # The Makefile installs several versions of the libraries, but we only # need one of them, depending on the platform.
Quoted 7 lines
package/libfslparser/libfslparser.mk endef · line 41
Quoted 3 lines
package/libfslparser/libfslparser.mk +3
-0+# +# without AUTORECONF, configure fails to find install-sh. +#No need for leading/trailing comment lines, just the line with the actual comment.
Okay. Will fix in V5.
Quoted 38 lines
Quoted 5 lines
package/libfslvpuwrap/libfslvpuwrap.mk +0
-0package/libfslvpuwrap/libfslvpuwrap.mk line 11
Quoted 10 lines
package/libfslvpuwrap/libfslvpuwrap.mk +3
-2@@ -4,14 +4,32 @@ # ################################################################################ -LIBFSLVPUWRAP_VERSION = 1.0.17 +LIBFSLVPUWRAP_VERSION = $(FREESCALE_IMX_VERSION) LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_SITE) +LIBFSLVPUWRAP_SOURCE = libfslvpuwrap-$(LIBFSLVPUWRAP_VERSION).bin LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement -LIBFSLVPUWRAP_LICENSE_FILES = EULA.txt +LIBFSLVPUWRAP_LICENSE_FILES = EULA EULA.txtA comment that both EULA are not the same would be nice:
# The contents of those two EULA are not the same:
LIBFSLVPUWRAP_LICENSE_FILES= EULA EULA.txtQuoted 17 lines
package/libfslvpuwrap/libfslvpuwrap.mk +11
-0LIBFSLVPUWRAP_REDISTRIBUTE = NO LIBFSLVPUWRAP_INSTALL_STAGING = YES LIBFSLVPUWRAP_DEPENDENCIES += imx-lib +# 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; } \
Quoted 9 lines
package/libfslvpuwrap/libfslvpuwrap.mk line 33
Quoted 5 lines
package/libfslvpuwrap/libfslvpuwrap.mk +5
-0+ /<<EOEULA/ { start=1; }'\ + $(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE) > $(@D)/EULA + cd $(BUILD_DIR); \ + sh $(DL_DIR)/$(LIBFSLVPUWRAP_SOURCE) --force --auto-accept +endefDitto the mkdir warning.
Ditto extract EULA after unpacking the archive.
Thanks for the thorough review.
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
Hello Yann,
Quoted 36 lines · Eric Nelson
Hi Yann,
Quoted 33 lines · Yann E. MORIN
Eric, All,
A (hopefully!) better review this time...
On 2013-10-08 20:05 -0700, Eric Nelson spake thusly:
Quoted 12 lines
Signed-off-by Eric Nelson <[email protected]>[--SNIP--]
package/freescale-imx/imx-lib/imx-lib.mk +3
-0+# The archive is a shell-self-extractor of a bzipped tar. It happens +# to extract in the correct directory (imx-lib-x.y.z) +# The --force makes sure it doesn't fail if the source dir alreadyexists.
package/freescale-imx/imx-lib/imx-lib.mk +3
-0+# 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 toimx-lib-x.y.z/EULA
package/freescale-imx/imx-lib/imx-lib.mk IMX_LIB_MAKE_ENV = \ · line 44
Quoted 10 lines
package/freescale-imx/imx-lib/imx-lib.mk +10
-0+# +define IMX_LIB_EXTRACT_CMDS + awk 'BEGIN { start=0; } \ + /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /<<EOEULA/ { start=1; }'\ + $(DL_DIR)/$(IMX_LIB_SOURCE) > $(@D)/EULA + cd $(BUILD_DIR); \ + sh $(DL_DIR)/$(IMX_LIB_SOURCE) --force --auto-accept +endef$ make imx-lib-extract [...] Unpacking file mkdir: cannot create directory ?imx-lib-3.5.7-1.0.0?: File exists
Quoted 6 lines
Quoted 3 lines
This is only a warning, but still: maybe extract the EULA _after_ unpacking the archive?
Sure. I'll re-work.
Re-arranging these commands doesn't get rid of the warning.
It appears that the directory is created by the bit of structure using IMX_LIB_EXTRACT_CMDS, and the warning message is from a 'mkdir' embedded within the self-extracting package.
I could 'rm' the directory inside IMX_LIB_EXTRACT_CMDS, but it's not clear that this is the right thing to do.
Please let me know your thoughts on the matter.
Regards,
Eric
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
Quoted 48 lines · Eric Nelson
Hello Yann,
Quoted 36 lines · Eric Nelson
Hi Yann,
Quoted 33 lines · Yann E. MORIN
Eric, All,
A (hopefully!) better review this time...
On 2013-10-08 20:05 -0700, Eric Nelson spake thusly:
Quoted 12 lines
Signed-off-by Eric Nelson <[email protected]>[--SNIP--]
package/freescale-imx/imx-lib/imx-lib.mk +3
-0+# The archive is a shell-self-extractor of a bzipped tar. It happens +# to extract in the correct directory (imx-lib-x.y.z) +# The --force makes sure it doesn't fail if the source dir alreadyexists.
package/freescale-imx/imx-lib/imx-lib.mk +3
-0+# 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 toimx-lib-x.y.z/EULA
package/freescale-imx/imx-lib/imx-lib.mk IMX_LIB_MAKE_ENV = \ · line 44
Quoted 10 lines
package/freescale-imx/imx-lib/imx-lib.mk +10
-0+# +define IMX_LIB_EXTRACT_CMDS + awk 'BEGIN { start=0; } \ + /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /<<EOEULA/ { start=1; }'\ + $(DL_DIR)/$(IMX_LIB_SOURCE) > $(@D)/EULA + cd $(BUILD_DIR); \ + sh $(DL_DIR)/$(IMX_LIB_SOURCE) --force --auto-accept +endef$ make imx-lib-extract [...] Unpacking file mkdir: cannot create directory ?imx-lib-3.5.7-1.0.0?: File existsQuoted 6 lines
Quoted 3 lines
This is only a warning, but still: maybe extract the EULA _after_ unpacking the archive?
Sure. I'll re-work.
Re-arranging these commands doesn't get rid of the warning.
Quoted 7 lines
It appears that the directory is created by the bit of structure using
IMX_LIB_EXTRACT_CMDS, and the warning message is from a 'mkdir' embedded within the self-extracting package.I could 'rm' the directory inside
IMX_LIB_EXTRACT_CMDS, but it's not clear that this is the right thing to do.
The directory exists already because the buildroot infrastructure
creates some stamp files in it - e.g. .stamp-downloaded. So if you'd remove the directory, the download will be retried...
Therefore, I think we should just live with the warning.
Regards,
Arnout
Quoted 11 lines
Please let me know your thoughts on the matter.
Regards,
Eric
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
Quoted 5 lines · On Wed, 12 Feb 2014 22:58:17 +0100 Arnout Vandecappelle <[email protected]> wrote:
Quoted 5 lines
It appears that the directory is created by the bit of structure using
IMX_LIB_EXTRACT_CMDS, and the warning message is from a 'mkdir' embedded within the self-extracting package.
Quoted 9 lines
Quoted 2 lines
I could 'rm' the directory inside
IMX_LIB_EXTRACT_CMDS, but it's not clear that this is the right thing to do.The directory exists already because the buildroot infrastructure
creates some stamp files in it - e.g. .stamp-downloaded. So if you'd remove the directory, the download will be retried...Therefore, I think we should just live with the warning.
Perhaps alias "mkdir" to "mkdir -p" for the duration of the commands?
Mike
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
Thanks Mike,
Quoted 11 lines · Mike Zick
Quoted 8 lines · On Wed, 12 Feb 2014 22:58:17 +0100 Arnout Vandecappelle <[email protected]> wrote:
Quoted 7 lines
It appears that the directory is created by the bit of structure using
IMX_LIB_EXTRACT_CMDS, and the warning message is from a 'mkdir' embedded within the self-extracting package.I could 'rm' the directory inside
IMX_LIB_EXTRACT_CMDS, but it's not clear that this is the right thing to do.
Quoted 9 lines
Quoted 6 lines
The directory exists already because the buildroot infrastructure
creates some stamp files in it - e.g. .stamp-downloaded. So if you'd remove the directory, the download will be retried...Therefore, I think we should just live with the warning.
Perhaps alias "mkdir" to "mkdir -p" for the duration of the commands?
I like it, although I'm not certain whether that will break on arcane shells.
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
Hi Mike,
Quoted 18 lines · Eric Nelson
Thanks Mike,
Quoted 15 lines · Mike Zick
Quoted 12 lines · On Wed, 12 Feb 2014 22:58:17 +0100 Arnout Vandecappelle <[email protected]> wrote:
Quoted 7 lines
It appears that the directory is created by the bit of structure using
IMX_LIB_EXTRACT_CMDS, and the warning message is from a 'mkdir' embedded within the self-extracting package.I could 'rm' the directory inside
IMX_LIB_EXTRACT_CMDS, but it's not clear that this is the right thing to do.The directory exists already because the buildroot infrastructure
creates some stamp files in it - e.g. .stamp-downloaded. So if you'd remove the directory, the download will be retried...
Quoted 9 lines
Quoted 5 lines
Quoted 2 lines
Therefore, I think we should just live with the warning.
Perhaps alias "mkdir" to "mkdir -p" for the duration of the commands?
I like it, although I'm not certain whether that will break on arcane shells.
This is beyond me...
I can't figure out how to get an alias to be effective in the middle of this:
(cd $(BUILD_DIR); \ sh $(DL_DIR)/$(GPU_VIV_BIN_MX6Q_SOURCE) --force --auto-accept)
Regards,
Eric
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
Eric, All,
On 2014-02-12 16:53 -0700, Eric Nelson spake thusly:
Quoted 8 lines
Quoted 2 lines · Mike Zick
Quoted 1 line
Perhaps alias "mkdir" to "mkdir -p" for the duration of the commands?
I can't figure out how to get an alias to be effective in the middle of this:
(cd $(BUILD_DIR); \ sh $(DL_DIR)/$(GPU_VIV_BIN_MX6Q_SOURCE) --force --auto-accept)
An alias won't work, as aliases are not passed in the environment.
So, while the shell executing the '(.....)' commands will have an mkdir alias, the shell that runs the self-extractor 'sh $(DL_DIR)/....' will not have that alias.
You can try it easily:
(1)$ alias toto='echo TOTO'
(1)$ toto
TOTO
(1)$ /bin/sh
(2)$ toto
toto: command not found
(2)$ exit
(1)$ toto
TOTORegards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
In reply to Arnout VandecappelleQuoted 10 lines
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle <[email protected]> writes:
I could 'rm' the directory inside
IMX_LIB_EXTRACT_CMDS, but it's not clear that this is the right thing to do.The directory exists already because the buildroot infrastructure
creates some stamp files in it - e.g. .stamp-downloaded. So if you'd remove the directory, the download will be retried...Therefore, I think we should just live with the warning.
Agreed. Alternatively, patch the extracter to use mkdir -p (but I don't know if that is doable).
Signature · 1 line
Bye, Peter Korsgaard
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
Thanks Peter (and Arnout),
Quoted 5 lines · Peter Korsgaard
Quoted 4 lines
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle <[email protected]> writes:
I could 'rm' the directory inside
IMX_LIB_EXTRACT_CMDS, but it's not clear that this is the right thing to do.
Quoted 9 lines
Quoted 5 lines
The directory exists already because the buildroot infrastructure
creates some stamp files in it - e.g. .stamp-downloaded. So if you'd remove the directory, the download will be retried...Therefore, I think we should just live with the warning.
Agreed. Alternatively, patch the extracter to use mkdir -p (but I don't know if that is doable).
You made me flinch!
I thought of that (patching the extractor), and it is doable, but there's just something wrong with manipulating sources after download. You lose the ability to compare hashes, et cetera...
We could copy and then patch, but the GPU code is **big**, so this would be slow.
My other thought was to use "| 2>/dev/null", but that seems equally evil, so I think I'll just send V5 with the warning.
Unless... you think pre-empting the warning with another message is warranted:
echo "** You're about to see a warning that you can ignore "
Regards,
Eric
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
In reply to Eric NelsonEric, All,
On 2014-02-12 13:20 -0700, Eric Nelson spake thusly:
Quoted 2 lines · Eric Nelson
Quoted 1 line · Yann E. MORIN
[--SNIP--]
Quoted 10 lines
Quoted 7 lines
Quoted 7 lines
$ make imx-lib-extract [...] Unpacking file mkdir: cannot create directory ?imx-lib-3.5.7-1.0.0?: File existsThis is only a warning, but still: maybe extract the EULA _after_ unpacking the archive?
Re-arranging these commands doesn't get rid of the warning.
Quoted 7 lines
It appears that the directory is created by the bit of structure using
IMX_LIB_EXTRACT_CMDS, and the warning message is from a 'mkdir' embedded within the self-extracting package.I could 'rm' the directory inside
IMX_LIB_EXTRACT_CMDS, but it's not clear that this is the right thing to do.
No, as pointed out by Arnout, this won't work.
However, The cleanest in my opinion would be to extract the archive into a subdir of $(@D), like:
# Blurb about auto-extract in a properly-named dir
define IMX_LIB_EXTRACT_CMDS
cd $(@D); \
sh $(DL_DIR)/$(IMX_LIB_SOURCE) --force --auto-accept
endefSince we are anyway using the generic-package infrastructure, we do provide the build and isntall commands, so it is pretty easy to use that sub-dir in the build and install commands:
define IMX_LIB_BUILD_CMDS
$(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D)/imx-lib-$(FREESCALE_IMX_VERSION)
endef... and so on.
Also, to be noted: the warning probably pre-existed your patch, and is not related to extracting the EULA.
Speaking of the EULA, since 'make legal-info' will copy the source file as-is, the EULA will be present in the generated legal-info directory structure. So, I wonder if we really care about extracting it in the first place.
I'm a bit uneasy with the awk trick to begin with, since it would break without us easily noticing when we bump and the self-extractor no longer uses EULA/EOEULA (since the awk script will happily process its script, and will just print nothing and exit without error).
What do others think about it?
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
Hi Yann,
Quoted 21 lines · Yann E. MORIN
Eric, All,
On 2014-02-12 13:20 -0700, Eric Nelson spake thusly:
Quoted 2 lines · Eric Nelson
Quoted 1 line · Yann E. MORIN
[--SNIP--]
Quoted 15 lines
Quoted 7 lines
Quoted 7 lines
$ make imx-lib-extract [...] Unpacking file mkdir: cannot create directory ?imx-lib-3.5.7-1.0.0?: File existsThis is only a warning, but still: maybe extract the EULA _after_ unpacking the archive?
Re-arranging these commands doesn't get rid of the warning.
It appears that the directory is created by the bit of structure using
IMX_LIB_EXTRACT_CMDS, and the warning message is from a 'mkdir' embedded within the self-extracting package.
Quoted 5 lines
Quoted 2 lines
I could 'rm' the directory inside
IMX_LIB_EXTRACT_CMDS, but it's not clear that this is the right thing to do.No, as pointed out by Arnout, this won't work.
Right.
Quoted 7 lines
However, The cleanest in my opinion would be to extract the archive into a subdir of $(@D), like:
# Blurb about auto-extract in a properly-named dir define IMX_LIB_EXTRACT_CMDS cd $(@D); \ sh $(DL_DIR)/$(IMX_LIB_SOURCE) --force --auto-accept
And then move them?
i.e.
mv $(@D)/packagemname/* $(@D)/ rm -r $(@D)/packagemname/
Quoted 10 lines
endef
Since we are anyway using the generic-package infrastructure, we do provide the build and isntall commands, so it is pretty easy to use that sub-dir in the build and install commands:
define IMX_LIB_BUILD_CMDS $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D)/imx-lib-$(FREESCALE_IMX_VERSION) endef
It seems like over-kill to keep the directory around.
And what about the patch step references?
Quoted 5 lines
... and so on.
Also, to be noted: the warning probably pre-existed your patch, and is not related to extracting the EULA.
It did.
I've been trying to figure out whether I can split this into a separate patch for the purpose of a separate commit message.
Quoted 5 lines
Speaking of the EULA, since 'make legal-info' will copy the source file as-is, the EULA will be present in the generated legal-info directory structure. So, I wonder if we really care about extracting it in the first place.
I don't understand well enough to comment, and this too seems like the subject of a separate patch.
Quoted 5 lines
I'm a bit uneasy with the awk trick to begin with, since it would break without us easily noticing when we bump and the self-extractor no longer uses EULA/EOEULA (since the awk script will happily process its script, and will just print nothing and exit without error).
There may be another way, by executing the extractor first without the --accept-eula and re-directing the output.
Again, this seems like the subject of a different patch.
I'd also like to get Freescale to comment on this.
Perhaps we can get them to provide a "--showlicense" in the next release, and change things then.
And while we're at it, we can suggest "mkdir -p" when the "--force" option is specified.
Regards,
Eric
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
Eric, All,
On 2014-02-12 19:00 -0700, Eric Nelson spake thusly:
Quoted 9 lines · Yann E. MORIN
Quoted 7 lines
However, The cleanest in my opinion would be to extract the archive into a subdir of $(@D), like:
# Blurb about auto-extract in a properly-named dir define IMX_LIB_EXTRACT_CMDS cd $(@D); \ sh $(DL_DIR)/$(IMX_LIB_SOURCE) --force --auto-accept
Quoted 4 lines
And then move them?
i.e.mv $(@D)/packagemname/* $(@D)/ rm -r $(@D)/packagemname/
No, we would not need to move it. We'd just use it as-is in the following commands, like I showed below:
Quoted 5 lines
Quoted 3 lines
define IMX_LIB_BUILD_CMDS $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D)/imx-lib-$(FREESCALE_IMX_VERSION) endefIt seems like over-kill to keep the directory around.
Well, maybe not overkill, but not-so-clean, yes.
Quoted 1 line
And what about the patch step references?
Boom! :-)
Quoted 7 lines
Quoted 5 lines
Speaking of the EULA, since 'make legal-info' will copy the source file as-is, the EULA will be present in the generated legal-info directory structure. So, I wonder if we really care about extracting it in the first place.
I don't understand well enough to comment,
Basically, Buildroot provides the 'legal-info' infrastructure:
http://buildroot.net/downloads/manual/manual.html#legal-info
Quoted 2 lines
and this too seems like
the subject of a separate patch.
Well, it'd be a good idea to provide the bump in one patch, since that's pretty easy, and the extra EULA stuff in a separate patch, indeed.
So, to sum-up:
- provide a patch that bumps the version;
- just keep the directory layout as-is, we'll live with the warning but be sure to add a comment above the _EXTRACT_CMDS stating that a warning will be issued;
- provide a second patch that extracts the EULA; your initial solution is OK.
Quoted 9 lines
Quoted 5 lines
I'm a bit uneasy with the awk trick to begin with, since it would break without us easily noticing when we bump and the self-extractor no longer uses EULA/EOEULA (since the awk script will happily process its script, and will just print nothing and exit without error).
There may be another way, by executing the extractor first without the --accept-eula and re-directing the output.
Quoted 6 lines
Again, this seems like the subject of a different patch.
I'd also like to get Freescale to comment on this.
Perhaps we can get them to provide a "--showlicense" in the next release, and change things then.
If you have your ways inside Freescale, then it might be a good idea, yes! Unless they're already reading us. NSA, you there? :-]
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
Yann, Eric,
Quoted 5 lines · Yann E. MORIN
Quoted 2 lines
Perhaps we can get them to provide a "--showlicense" in the next release, and change things then.
If you have your ways inside Freescale, then it might be a good idea, yes! Unless they're already reading us. NSA, you there? :-]
On the other hand, our package infrastructure is not able to run a command to get the license text. It expects to have one file available in the source tree. (Though this can be worked-around by having a post extract hook that runs the --showlicense thing and redirects the output into a file in the source tree).
So the best way would be to simply tell Freescale to stop doing silly self-extractable executables, and switch to normal tarballs, just like everyone else does in the Linux world :-)
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
Hi Thomas,
Quoted 9 lines · Thomas Petazzoni
Yann, Eric,
Quoted 5 lines · Yann E. MORIN
Quoted 2 lines
Perhaps we can get them to provide a "--showlicense" in the next release, and change things then.
If you have your ways inside Freescale, then it might be a good idea, yes! Unless they're already reading us. NSA, you there? :-]
Friends in high^h^h^h^hstrange places?
Quoted 11 lines
On the other hand, our package infrastructure is not able to run a command to get the license text. It expects to have one file available in the source tree. (Though this can be worked-around by having a post extract hook that runs the --showlicense thing and redirects the output into a file in the source tree).
So the best way would be to simply tell Freescale to stop doing silly self-extractable executables, and switch to normal tarballs, just like everyone else does in the Linux world :-)
Or nag nicely and provide patches ;)
Regards,
Eric
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
In reply to Yann E. MORINHi Yann,
Quoted 24 lines · Yann E. MORIN
Eric, All,
On 2014-02-12 19:00 -0700, Eric Nelson spake thusly:
Quoted 9 lines · Yann E. MORIN
Quoted 7 lines
However, The cleanest in my opinion would be to extract the archive into a subdir of $(@D), like:
# Blurb about auto-extract in a properly-named dir define IMX_LIB_EXTRACT_CMDS cd $(@D); \ sh $(DL_DIR)/$(IMX_LIB_SOURCE) --force --auto-acceptQuoted 4 lines
And then move them?
i.e.mv $(@D)/packagemname/* $(@D)/ rm -r $(@D)/packagemname/No, we would not need to move it. We'd just use it as-is in the following commands, like I showed below:
Quoted 3 lines
Quoted 3 lines
define IMX_LIB_BUILD_CMDS $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D)/imx-lib-$(FREESCALE_IMX_VERSION) endef
Quoted 8 lines
Quoted 1 line
It seems like over-kill to keep the directory around.
Well, maybe not overkill, but not-so-clean, yes.
Quoted 1 line
And what about the patch step references?
Boom! :-)
I'm still not quite grokking this, but I'll take a stab.
I just sent a patch set with things done the other way.
Please just Nak patch 3 of 3.
I left it in because I already had the notes in place and it might be useful for comparison.
Regards,
Eric
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
In reply to Eric NelsonHi Yann,
Quoted 45 lines · Eric Nelson
Hi Yann,
Quoted 32 lines · Yann E. MORIN
Eric, All,
A (hopefully!) better review this time...
On 2013-10-08 20:05 -0700, Eric Nelson spake thusly:
Quoted 1 line
Signed-off-by Eric Nelson <[email protected]>[--SNIP--]
Quoted 19 lines
diff --git
a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mkb/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mkindex 8e979ee..e799fd2 100644package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk +5
-1@@ -4,7 +4,11 @@ # ################################################################################ -GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION) +ifeq ($(BR2_ARM_EABIHF),y) +GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)-hfp +else +GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)-sfp +endif GPU_VIV_BIN_MX6Q_SITE = $(FREESCALE_IMX_SITE)Quoted 2 lines
GPU_VIV_BIN_MX6Q_SOURCE=
gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION).binI think we should make the source conditional on
BR2_ARM_EABIHF, not the version:Quoted 9 lines
GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION) ifeq ($(BR2_ARM_EABIHF),y) GPU_VIV_BIN_MX6Q_SOURCE =gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION)-hfp.bin
else
GPU_VIV_BIN_MX6Q_SOURCE=
gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION)-sfp.bin
endif
Quoted 2 lines
Agreed. This is nicer.
And also not very workable.
Much seems to depend on GPU_VIV_BIN_MX6Q_VERSION having the right version.
In particular:
the build directory is named with the version, the self-extractor has this name embedded in it, and the patch step expects it to be set.
And in some ways, the V4 version seems more correct.
When you ask "what version of the Vivante GPU libraries" a build is using, the "-hfp" or "-sfp" piece is pretty important.
If you switch your build from EABI to ARMHF, it also makes sense that the stamp information shouldn't follow you.
Let me know if you feel strongly about this.
Regards,
Eric
PATCH v4 2/2 i.MX: Update versions to match latest Freescale release
Eric, All,
On 2014-02-12 16:25 -0700, Eric Nelson spake thusly:
Quoted 14 lines
Quoted 14 lines · Yann E. MORIN
Quoted 12 lines
I think we should make the source conditional on
BR2_ARM_EABIHF, not the version:GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION) ifeq ($(BR2_ARM_EABIHF),y) GPU_VIV_BIN_MX6Q_SOURCE =gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION)-hfp.bin
else
GPU_VIV_BIN_MX6Q_SOURCE=
gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION)-sfp.bin
endif
Quoted 7 lines
Quoted 2 lines
Agreed. This is nicer.
And also not very workable.
Much seems to depend on
GPU_VIV_BIN_MX6Q_VERSIONhaving the right version.
You meant: -sfp or -hp are actually part of the version string, since the archives self-extracts in a directory ending in -sfp or -hfp, right?
So, OK, leave -sfp/-hfp in the version string.
Quoted 2 lines
If you switch your build from EABI to ARMHF, it also makes sense that the stamp information shouldn't follow you.
Well, if you switch ABI, you're toast anyway. Changing a toolchain option will require a complete rebuild of all the packages, and you'll have to restart afresh.
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'