Skip to contentSkip to conversation

i.MX: Use FREESCALE_IMX_MIRROR_SITE for newly-moved packages

PATCH New Eric Nelson 2 participants 7 messages Oct 6, 2013 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 i.MX: Use FREESCALE_IMX_MIRROR_SITE for newly-moved packages

Now that libfslcodec, libfslparser, and libfslvpuwrap are in the package/freescale-imx directory, they can share the _SITE mirror with other similar packages.

---
V2 updates libfslcodec/libfslparser/libfslvpuwrap in their original directories instead of freescale-imx/.

 package/libfslcodec/libfslcodec.mk     | 2 +-
 package/libfslparser/libfslparser.mk   | 2 +-
 package/libfslvpuwrap/libfslvpuwrap.mk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
package/libfslcodec/libfslcodec.mk +1 -1
index c18332a..e0dca7f 100644
@@ -6,7 +6,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_MIRROR_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 -1
index 3e27a6a..c2af129 100644
@@ -6,7 +6,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_MIRROR_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 -1
index 1bc7129..f4539f3 100644
@@ -6,7 +6,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_MIRROR_SITE)
 LIBFSLVPUWRAP_LICENSE = Freescale Semiconductor Software License Agreement
 LIBFSLVPUWRAP_LICENSE_FILES = EULA.txt
 LIBFSLVPUWRAP_REDISTRIBUTE = NO
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH v2 2/3 i.MX6: Use canonical site for Freescale packages

Use official Freescale site for distribution of i.MX packages, rename FREESCALE_IMX_MIRROR_SITE to FREESCALE_IMX_SITE as suggested by Peter Korsgaard.

---
V2 updates libfslcodec/libfslparser/libfslvpuwrap in their original directories instead of freescale-imx/.

 package/freescale-imx/firmware-imx/firmware-imx.mk         | 2 +-
 package/freescale-imx/freescale-imx.mk                     | 4 ++--
 package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 2 +-
 package/freescale-imx/imx-lib/imx-lib.mk                   | 2 +-
 package/libfslcodec/libfslcodec.mk                         | 3 +--
 package/libfslparser/libfslparser.mk                       | 3 +--
 package/libfslvpuwrap/libfslvpuwrap.mk                     | 3 +--
 7 files changed, 8 insertions(+), 11 deletions(-)
package/freescale-imx/firmware-imx/firmware-imx.mk +1 -1
index d9fcb89..d26b31c 100644
@@ -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 +2 -2
index d35a62e..47e7be2 100644
@@ -6,7 +6,7 @@
 
 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://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
+#FREESCALE_IMX_MIRROR_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
index c48d108..8e979ee 100644
@@ -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
index bd7e174..e1a68ef 100644
@@ -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/libfslcodec/libfslcodec.mk +1 -2
index e0dca7f..ad1cc63 100644
@@ -5,8 +5,7 @@
 ################################################################################
 
 LIBFSLCODEC_VERSION = 3.0.1
-# No official download site from freescale, just this mirror
-LIBFSLCODEC_SITE = $(FREESCALE_IMX_MIRROR_SITE)
+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
index c2af129..3aab3a7 100644
@@ -5,8 +5,7 @@
 ################################################################################
 
 LIBFSLPARSER_VERSION = 3.0.1
-# No official download site from freescale, just this mirror
-LIBFSLPARSER_SITE = $(FREESCALE_IMX_MIRROR_SITE)
+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
index f4539f3..346a20a 100644
@@ -5,8 +5,7 @@
 ################################################################################
 
 LIBFSLVPUWRAP_VERSION = 1.0.17
-# No official download site from freescale, just this mirror
-LIBFSLVPUWRAP_SITE = $(FREESCALE_IMX_MIRROR_SITE)
+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
#2 lore raw

PATCH v2 2/3 i.MX6: Use canonical site for Freescale packages

Dear Eric Nelson,

package/freescale-imx/freescale-imx.mk line 10

Quoted 4 lines · Eric Nelson
package/freescale-imx/freescale-imx.mk +2 -2
-# 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://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
+#FREESCALE_IMX_MIRROR_SITE   = http://download.ossystems.com.br/bsp/freescale/source

Please don't keep this as a comment.

Also, this patch actually does two things: renaming the variable, and change the site from download.ossystems.com.br to freescale.com. I believe the switch to freescale.com does not work if you don't also bump the version at the same time, so I'd suggest that:

* this patch only renames the variable from IMX_MIRROR_SITE to IMX_SITE, but does not change its value

* the change from ossystems.com.br to freescale.com is done in the following patch that bumps the version.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH v2 2/3 i.MX6: Use canonical site for Freescale packages

Thanks Thomas,

Quoted 15 lines · Thomas Petazzoni

Dear Eric Nelson,

package/freescale-imx/freescale-imx.mk line 10

Quoted 4 lines · Eric Nelson
package/freescale-imx/freescale-imx.mk +2 -2
-# 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://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
+#FREESCALE_IMX_MIRROR_SITE   = http://download.ossystems.com.br/bsp/freescale/source

Please don't keep this as a comment.

Also, this patch actually does two things: renaming the variable, and change the site from download.ossystems.com.br to freescale.com. I believe the switch to freescale.com does not work if you don't also bump the version at the same time, so I'd suggest that:

Quoted 6 lines

* this patch only renames the variable from IMX_MIRROR_SITE to IMX_SITE, but does not change its value

* the change from ossystems.com.br to freescale.com is done in the following patch that bumps the version.

That's definitely cleaner, and I'll work up a V3.

#4 lore raw

PATCH v2 3/3 i.MX: Bump library versions to latest release (3.0.35-4.1.0)

In reply to Eric Nelson

This patchset updates the Freescale gstreamer and GPU libraries to the latest release (3.0.35_4.1.0).

Note that the package names refer to and are compatible with an alpha release of kernel version 3.5.7, and the package release versions reflect that by using the nomenclature 3.5.7_1.0.0.

The primary release package (based on LTIB) is available here and includes documentation.

	https://community.freescale.com/docs/DOC-95560

The 3.5.7 kernel sources are available here:

	http://git.freescale.com/git/cgit.cgi/imx/linux-2.6-imx.git/log/?h=imx_3.5.7_1.0.0_alpha

Note that there are some structural changes for various packages in this release:
- gpu-viv-bin-mx6q gains two variants for ARMEL (sfp) and ARMHF (hfp).
- imx-lib and libfslvpuwrap packages are distributed as self-extracting shell scripts requiring acceptance of an end-user license agreement (EULA).

---
V2 updates libfslcodec/libfslparser/libfslvpuwrap in their original directories instead of freescale-imx/.

 package/freescale-imx/freescale-imx.mk               |  2 +-
 .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk             |  6 +++++-
 package/freescale-imx/imx-lib/imx-lib.mk             | 16 ++++++++++++++--
 package/libfslcodec/libfslcodec.mk                   |  2 +-
 package/libfslparser/libfslparser.mk                 |  4 +++-
 package/libfslvpuwrap/libfslvpuwrap.mk               | 20 +++++++++++++++++++-
 6 files changed, 43 insertions(+), 7 deletions(-)
package/freescale-imx/freescale-imx.mk +1 -1
index 47e7be2..2762972 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FREESCALE_IMX_VERSION = 1.1.0
+FREESCALE_IMX_VERSION = 3.5.7-1.0.0
 
 FREESCALE_IMX_SITE   = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
 #FREESCALE_IMX_MIRROR_SITE   = http://download.ossystems.com.br/bsp/freescale/source
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk +5 -1
index 8e979ee..e799fd2 100644
@@ -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 +14 -2
index e1a68ef..416bb1b 100644
@@ -6,8 +6,8 @@
 
 IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION)
 IMX_LIB_SITE    = $(FREESCALE_IMX_SITE)
-IMX_LIB_LICENSE = LGPLv2.1+
-# No license file included
+IMX_LIB_LICENSE = Freescale Semiconductor Software License Agreement
+IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).bin
 
 IMX_LIB_INSTALL_STAGING = YES
 
@@ -25,6 +25,18 @@ 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 the EULA in the bin file differs from the one in the tar file,
+# extract the one from the bin file as well.
+define IMX_LIB_EXTRACT_CMDS
+	(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/libfslcodec/libfslcodec.mk +1 -1
index ad1cc63..d52158c 100644
@@ -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 +3 -1
index 3aab3a7..1aa975b 100644
@@ -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,6 @@ endef
 # The Makefile installs several versions of the libraries, but we only
 # need one of them, depending on the platform.
 
+LIBFSLPARSER_AUTORECONF = YES
+
 $(eval $(autotools-package))
package/libfslvpuwrap/libfslvpuwrap.mk +19 -1
index 346a20a..45193c4 100644
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-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_REDISTRIBUTE = NO
@@ -14,4 +15,21 @@ 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
#5 lore raw

PATCH v2 1/3 i.MX: Use FREESCALE_IMX_MIRROR_SITE for newly-moved packages

In reply to Eric Nelson

Dear Eric Nelson,

Quoted 3 lines · Eric Nelson

Now that libfslcodec, libfslparser, and libfslvpuwrap are in the package/freescale-imx directory, they can share the _SITE mirror with other similar packages.

This commit message doesn't match what the patch is doing :-)

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#6 lore raw

PATCH v2 1/3 i.MX: Use FREESCALE_IMX_MIRROR_SITE for newly-moved packages

Thanks for the review, Thomas.

Quoted 9 lines · Thomas Petazzoni

Dear Eric Nelson,

Quoted 3 lines · Eric Nelson

Now that libfslcodec, libfslparser, and libfslvpuwrap are in the package/freescale-imx directory, they can share the _SITE mirror with other similar packages.

This commit message doesn't match what the patch is doing :-)

Will fix & re-send.