Skip to contentSkip to conversation

freescale-imx: bump version to 3.10.17-1.0.0

PATCH New Gary Bisson 2 participants 4 messages Jun 12, 2014 – Jun 13, 2014 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 freescale-imx: bump version to 3.10.17-1.0.0

---
 package/freescale-imx/freescale-imx.mk   |  2 +-
 package/freescale-imx/imx-lib/imx-lib.mk | 24 ++++--------------------
 2 files changed, 5 insertions(+), 21 deletions(-)
package/freescale-imx/freescale-imx.mk +1 -1
index 39ffa8a..843ba61 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FREESCALE_IMX_VERSION = 3.5.7-1.0.0
+FREESCALE_IMX_VERSION = 3.10.17-1.0.0
 FREESCALE_IMX_SITE    = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
 
 include $(sort $(wildcard package/freescale-imx/*/*.mk))
package/freescale-imx/imx-lib/imx-lib.mk +4 -20
index 4f605d7..1db01c9 100644
@@ -8,16 +8,17 @@ IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION)
 IMX_LIB_SITE    = $(FREESCALE_IMX_SITE)
 IMX_LIB_LICENSE = Freescale License (vpu), LGPLv2.1+ (the rest)
 IMX_LIB_LICENSE_FILES = EULA
-IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).bin
+IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).tar.gz
 
 IMX_LIB_INSTALL_STAGING = YES
 
 # imx-lib needs access to imx-specific kernel headers
 IMX_LIB_DEPENDENCIES += linux
 IMX_LIB_INCLUDE = \
+	-I$(LINUX_DIR)/include/uapi \
+	-I$(LINUX_DIR)/include \
 	-I$(LINUX_DIR)/drivers/mxc/security/rng/include \
-	-I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \
-	-idirafter $(LINUX_DIR)/include
+	-I$(LINUX_DIR)/drivers/mxc/security/sahara2/include
 
 IMX_LIB_MAKE_ENV = \
 	$(TARGET_MAKE_ENV) \
@@ -26,23 +27,6 @@ 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
Signature · 1 line
2.0.0
#1 lore raw

PATCH 1/1 freescale-imx: bump version to 3.10.17-1.0.0

On 2014-06-12 16:23 -0700, Gary Bisson spake thusly:

Quoted 1 line

NAK.

With 3.10.17, imx-lib no longer bundles the VPU code, which is now provided in a separate package, imx-vpu.

See chapter "Version by SoC Hierarchy" from:

    https://freescale.github.io/doc/release-notes/1.6/

So, bumping to 3.10.17 would need adding the imx-vpu package first.

Then, libfslvpuwrap should be made dependent on imx-vpu instead of imx-lib, obviously. To be noted, the version of libfslvpuwrap will not be aligned to the other imx components.

Regards,
Yann E. MORIN.

Quoted 74 lines
---
 package/freescale-imx/freescale-imx.mk   |  2 +-
 package/freescale-imx/imx-lib/imx-lib.mk | 24 ++++--------------------
 2 files changed, 5 insertions(+), 21 deletions(-)
package/freescale-imx/freescale-imx.mk +1 -1
index 39ffa8a..843ba61 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FREESCALE_IMX_VERSION = 3.5.7-1.0.0
+FREESCALE_IMX_VERSION = 3.10.17-1.0.0
 FREESCALE_IMX_SITE    = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
 
 include $(sort $(wildcard package/freescale-imx/*/*.mk))
package/freescale-imx/imx-lib/imx-lib.mk +4 -20
index 4f605d7..1db01c9 100644
@@ -8,16 +8,17 @@ IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION)
 IMX_LIB_SITE    = $(FREESCALE_IMX_SITE)
 IMX_LIB_LICENSE = Freescale License (vpu), LGPLv2.1+ (the rest)
 IMX_LIB_LICENSE_FILES = EULA
-IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).bin
+IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).tar.gz
 
 IMX_LIB_INSTALL_STAGING = YES
 
 # imx-lib needs access to imx-specific kernel headers
 IMX_LIB_DEPENDENCIES += linux
 IMX_LIB_INCLUDE = \
+	-I$(LINUX_DIR)/include/uapi \
+	-I$(LINUX_DIR)/include \
 	-I$(LINUX_DIR)/drivers/mxc/security/rng/include \
-	-I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \
-	-idirafter $(LINUX_DIR)/include
+	-I$(LINUX_DIR)/drivers/mxc/security/sahara2/include
 
 IMX_LIB_MAKE_ENV = \
 	$(TARGET_MAKE_ENV) \
@@ -26,23 +27,6 @@ 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
Signature · 6 lines
2.0.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
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.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 freescale-imx: bump version to 3.10.17-1.0.0

Hi Yann,

Quoted 8 lines · Yann E. MORIN

On 2014-06-12 16:23 -0700, Gary Bisson spake thusly:

Quoted 1 line

NAK.

With 3.10.17, imx-lib no longer bundles the VPU code, which is now provided in a separate package, imx-vpu.

My bad, I've only checked that it built and that the GPU examples were running fine.

Quoted 9 lines

See chapter "Version by SoC Hierarchy" from:

    https://freescale.github.io/doc/release-notes/1.6/

So, bumping to 3.10.17 would need adding the imx-vpu package first.

Then, libfslvpuwrap should be made dependent on imx-vpu instead of imx-lib, obviously. To be noted, the version of libfslvpuwrap will not be aligned to the other imx components.

Would you recommend removing the generic FREESCALE_IMX_VERSION in order to specify a version for each component? Or would you prefer adding a new variable just for the libslvpuwrap?

Thanks for the feedback,
Gary

Quoted 95 lines

Regards,
Yann E. MORIN.

Review

Quoted 6 lines
---
 package/freescale-imx/freescale-imx.mk   |  2 +-
 package/freescale-imx/imx-lib/imx-lib.mk | 24 ++++--------------------
 2 files changed, 5 insertions(+), 21 deletions(-)
(quoted diff) +0 -0

b/package/freescale-imx/freescale-imx.mk

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

Quoted 6 lines

index 39ffa8a..843ba61 100644

package/freescale-imx/freescale-imx.mk +0 -0
@@ -4,7 +4,7 @@
 #
 

################################################################################

Review

Quoted 7 lines
package/freescale-imx/freescale-imx.mk +1 -1
-FREESCALE_IMX_VERSION = 3.5.7-1.0.0
+FREESCALE_IMX_VERSION = 3.10.17-1.0.0
 FREESCALE_IMX_SITE    = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
 
 include $(sort $(wildcard package/freescale-imx/*/*.mk))
(quoted diff) +0 -0

b/package/freescale-imx/imx-lib/imx-lib.mk

Quoted 25 lines

index 4f605d7..1db01c9 100644

package/freescale-imx/imx-lib/imx-lib.mk +4 -3
@@ -8,16 +8,17 @@ IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION)
 IMX_LIB_SITE    = $(FREESCALE_IMX_SITE)
 IMX_LIB_LICENSE = Freescale License (vpu), LGPLv2.1+ (the rest)
 IMX_LIB_LICENSE_FILES = EULA
-IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).bin
+IMX_LIB_SOURCE = imx-lib-$(IMX_LIB_VERSION).tar.gz
 
 IMX_LIB_INSTALL_STAGING = YES
 
 # imx-lib needs access to imx-specific kernel headers
 IMX_LIB_DEPENDENCIES += linux
 IMX_LIB_INCLUDE = \
+     -I$(LINUX_DIR)/include/uapi \
+     -I$(LINUX_DIR)/include \
      -I$(LINUX_DIR)/drivers/mxc/security/rng/include \
-     -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \
-     -idirafter $(LINUX_DIR)/include
+     -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include
 
 IMX_LIB_MAKE_ENV = \
      $(TARGET_MAKE_ENV) \

package/freescale-imx/imx-lib/imx-lib.mk IMX_LIB_MAKE_ENV = \ · line 31

Quoted 6 lines
package/freescale-imx/imx-lib/imx-lib.mk +0 -3
@@ -26,23 +27,6 @@ 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.

Quoted 20 lines
package/freescale-imx/imx-lib/imx-lib.mk +0 -15
-# 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
--

2.0.0

Quoted 4 lines

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

--

.-----------------.--------------------.------------------.--------------------.

|  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.  |
Quoted 2 lines

'------------------------------^-------^------------------^--------------------'

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140613/2b990929/attachment.html>

#3 lore raw

PATCH 1/1 freescale-imx: bump version to 3.10.17-1.0.0

Garry, All,

On 2014-06-13 09:51 -0700, Gary Bisson spake thusly:

Quoted 5 lines
Quoted 3 lines · Yann E. MORIN

On 2014-06-12 16:23 -0700, Gary Bisson spake thusly:

Quoted 1 line
Quoted 7 lines
Quoted 4 lines

NAK.

With 3.10.17, imx-lib no longer bundles the VPU code, which is now provided in a separate package, imx-vpu.

My bad, I've only checked that it built and that the GPU examples were running fine.

Yep, that's OK. :-)
Reviews are there to help find out this kind of issue. No worries! ;-)

Could you (briefly) explain in your commit log (after the '---' line) how you did the test, so it is easy to reproduce? Something like:

package/freescale-imx: bump version

Blabla commit log

Signed-off-by you

---
GPU tests are runnign fine, with just running:
blabla-freescale-demo-program --some-option
VPU tests not done, for lack of need.

Thanks! :-)

Quoted 5 lines
Quoted 5 lines

See chapter "Version by SoC Hierarchy" from:

    https://freescale.github.io/doc/release-notes/1.6/

So, bumping to 3.10.17 would need adding the imx-vpu package first.

Quoted 8 lines
Quoted 4 lines

Then, libfslvpuwrap should be made dependent on imx-vpu instead of imx-lib, obviously. To be noted, the version of libfslvpuwrap will not be aligned to the other imx components.

Would you recommend removing the generic FREESCALE_IMX_VERSION in order to specify a version for each component? Or would you prefer adding a new variable just for the libslvpuwrap?

The latter: just keep the common version for all components, and just specify the specific version for libfslvpuwrap.

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.  |
'------------------------------^-------^------------------^--------------------'