Skip to contentSkip to conversation

i.MX: update gst-fsl-plugin version

PATCH New Eric Nelson 3 participants 9 messages Oct 1, 2013 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

cover i.MX: update gst-fsl-plugin version

This series updates the version of gst-fsl-plugins to match the latest release from Freescale.

Since the gst-fsl-plugin package is in a separate tree from other freescale-imx components, this required splitting up freescale-imx.mk into two parts.

Eric Nelson (2):
freescale-imx: separate variable assignment from Makefile
gst-fsl-plugins: Bump version and change URL to match other i.MX
components

 package/freescale-imx/freescale-imx.inc              | 9 +++++++++
 package/freescale-imx/freescale-imx.mk               | 6 +-----
 package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 8 +++++---
 3 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 package/freescale-imx/freescale-imx.inc
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/2 freescale-imx: separate variable assignment from Makefile

This patch pulls the variable assignments for the site and version from freescale-imx.mk and places them into freescale-imx.inc so they can be used by components in other trees
(e.g. gstreamer plugins).

---
 package/freescale-imx/freescale-imx.inc | 9 +++++++++
 package/freescale-imx/freescale-imx.mk  | 6 +-----
 2 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 package/freescale-imx/freescale-imx.inc
package/freescale-imx/freescale-imx.inc new file +9 -0
new file mode 100644
index 0000000..51709f4
@@ -0,0 +1,9 @@
+################################################################################
+#
+# Set freescale-imx variables to make it easy to align versions of various
+# packages
+#
+################################################################################
+FREESCALE_IMX_VERSION = 3.5.7-1.0.0
+FREESCALE_IMX_SITE   = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
+
package/freescale-imx/freescale-imx.mk +1 -5
index 2762972..46f4ddb 100644
@@ -4,9 +4,5 @@
 #
 ################################################################################
 
-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
-
+include package/freescale-imx/freescale-imx.inc
 include $(sort $(wildcard package/freescale-imx/*/*.mk))
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 1/2 freescale-imx: separate variable assignment from Makefile

Hi Arnout,

Quoted 33 lines · Eric Nelson

This patch pulls the variable assignments for the site and version from freescale-imx.mk and places them into freescale-imx.inc so they can be used by components in other trees
(e.g. gstreamer plugins).

---
  package/freescale-imx/freescale-imx.inc | 9 +++++++++
  package/freescale-imx/freescale-imx.mk  | 6 +-----
  2 files changed, 10 insertions(+), 5 deletions(-)

create mode 100644 package/freescale-imx/freescale-imx.inc

package/freescale-imx/freescale-imx.inc new file +9 -0
new file mode 100644
index 0000000..51709f4
@@ -0,0 +1,9 @@
+################################################################################
+#
+# Set freescale-imx variables to make it easy to align versions of various
+# packages
+#
+################################################################################
+FREESCALE_IMX_VERSION = 3.5.7-1.0.0
+FREESCALE_IMX_SITE   = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO/
+
package/freescale-imx/freescale-imx.mk +0 -0
index 2762972..46f4ddb 100644

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

Quoted 10 lines
package/freescale-imx/freescale-imx.mk +1 -5
@@ -4,9 +4,5 @@
  #
  ################################################################################
 
-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
-
+include package/freescale-imx/freescale-imx.inc
  include $(sort $(wildcard package/freescale-imx/*/*.mk))

Note that with this patch, we could leave libfslcodec, libfslparser, and libvpuwrap in their original locations if that's what you'd like to do.

I still have a preference to keep them together, FWIW.

Regards,

Eric

#3 lore raw

PATCH 1/2 freescale-imx: separate variable assignment from Makefile

In reply to Eric Nelson

Dear Eric Nelson,

Quoted 9 lines · Eric Nelson

This patch pulls the variable assignments for the site and version from freescale-imx.mk and places them into freescale-imx.inc so they can be used by components in other trees
(e.g. gstreamer plugins).

---
 package/freescale-imx/freescale-imx.inc | 9 +++++++++
 package/freescale-imx/freescale-imx.mk  | 6 +-----

I know there has been past discussion with Arnout on this, but I clearly don't agree with the introduction of this new .inc extension in our makefiles.

Due to how make expands variable, I am not sure it is needed for the FREESCALE_IMX_VERSION and FREESCALE_IMX_SITE variables to be defined before they are used.

Thomas

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

PATCH 1/2 freescale-imx: separate variable assignment from Makefile

Hi Thomas,

Quoted 13 lines · Thomas Petazzoni

Dear Eric Nelson,

Quoted 9 lines · Eric Nelson

This patch pulls the variable assignments for the site and version from freescale-imx.mk and places them into freescale-imx.inc so they can be used by components in other trees
(e.g. gstreamer plugins).

---
  package/freescale-imx/freescale-imx.inc | 9 +++++++++
  package/freescale-imx/freescale-imx.mk  | 6 +-----
Quoted 8 lines

I know there has been past discussion with Arnout on this, but I clearly don't agree with the introduction of this new .inc extension in our makefiles.

Due to how make expands variable, I am not sure it is needed for the FREESCALE_IMX_VERSION and FREESCALE_IMX_SITE variables to be defined before they are used.

I can do that if I move packages/gstreamer/gst-fsl-plugins/ under packages/freescale-imx, but not otherwise.

And as you said, we could have packages/gstreamer/Config.in point at the new location, though that seems a bit odd.

Let me know how you'd like this handled. I just want to make sure that everybody's using the latest and greatest code.

Regards,

Eric

#5 lore raw

PATCH 1/2 freescale-imx: separate variable assignment from Makefile

Dear Eric Nelson,

Quoted 2 lines · Eric Nelson

I can do that if I move packages/gstreamer/gst-fsl-plugins/ under packages/freescale-imx, but not otherwise.

Are you sure?

See:

$ cat foo.mk 
YOURPACKAGE_VERSION = $(FREESCALE_IMX_VERSION)

FREESCALE_IMX_VERSION = 42

all:

	@echo $(YOURPACKAGE_VERSION)
$ make -f foo.mk
42
$

This shows that the value of FREESCALE_IMX_VERSION can be given *after* it is used.

Best regards,

Thomas

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

PATCH 1/2 freescale-imx: separate variable assignment from Makefile

Hi Thomas,

You (and Arnout) are right, of course.

Quoted 17 lines · Thomas Petazzoni

Dear Eric Nelson,

Quoted 2 lines · Eric Nelson

I can do that if I move packages/gstreamer/gst-fsl-plugins/ under packages/freescale-imx, but not otherwise.

Are you sure?

See:

$ cat foo.mk
YOURPACKAGE_VERSION = $(FREESCALE_IMX_VERSION)

FREESCALE_IMX_VERSION = 42

all:

Quoted 9 lines
	@echo $(YOURPACKAGE_VERSION)
$ make -f foo.mk
42
$

This shows that the value of FREESCALE_IMX_VERSION can be given *after* it is used.

As Arnout said, I didn't grok that this is Make, with no sub-makes, so everything's global...

I'll re-submit the gstreamer patch without this bit.

Regards,

Eric

#7 lore raw

PATCH 2/2 gst-fsl-plugins: Bump version and change URL to match other i.MX components

In reply to Eric Nelson
---
 package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk +5 -3
index ccdb521..00c6acb 100644
@@ -4,9 +4,11 @@
 #
 ################################################################################
 
-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
+include package/freescale-imx/freescale-imx.inc
+
+GST_FSL_PLUGINS_VERSION = $(FREESCALE_IMX_VERSION)
+GST_FSL_PLUGINS_SITE = $(FREESCALE_IMX_SITE)
+GST_FSL_PLUGINS_SOURCE = gst-fsl-plugins-$(GST_FSL_PLUGINS_VERSION).tar.gz
 
 # Most is LGPLv2+, but some sources are copied from upstream and are
 # LGPLv2.1+, which essentially makes it LGPLv2.1+
Signature · 1 line
1.8.1.2
#8 lore raw

PATCH 2/2 gst-fsl-plugins: Bump version and change URL to match other i.MX components

Quoted 10 lines · Eric Nelson
---
  package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk +0 -0
index ccdb521..00c6acb 100644

package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk line 7

Quoted 7 lines
package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk +1 -3
@@ -4,9 +4,11 @@
  #
  ################################################################################
 
-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
+include package/freescale-imx/freescale-imx.inc

This is make, not C. You should never include the same file twice
unless you _really_ know what you're doing.

It is not a problem to define a variable in one file and use it in a
completely different file. This is already done for instance with LINUX_DIR. The only potential problem is when you want to use the variable in a condition. But that is not the case here, so you can use FREESCALE_IMX_VERSION etc. below without this include statement, even if gst-fsl-plugins.mk is read before freescale-imx.mk.

Regards,
Arnout

Quoted 8 lines
package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk +4 -0
+
+GST_FSL_PLUGINS_VERSION = $(FREESCALE_IMX_VERSION)
+GST_FSL_PLUGINS_SITE = $(FREESCALE_IMX_SITE)
+GST_FSL_PLUGINS_SOURCE = gst-fsl-plugins-$(GST_FSL_PLUGINS_VERSION).tar.gz
 
  # Most is LGPLv2+, but some sources are copied from upstream and are
  # LGPLv2.1+, which essentially makes it LGPLv2.1+
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