* [Buildroot] [PATCH 0/2] i.MX: update gst-fsl-plugin version
@ 2013-10-01 18:06 Eric Nelson
2013-10-01 18:06 ` [Buildroot] [PATCH 1/2] freescale-imx: separate variable assignment from Makefile Eric Nelson
2013-10-01 18:06 ` [Buildroot] [PATCH 2/2] gst-fsl-plugins: Bump version and change URL to match other i.MX components Eric Nelson
0 siblings, 2 replies; 9+ messages in thread
From: Eric Nelson @ 2013-10-01 18:06 UTC (permalink / raw)
To: buildroot
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
--
1.8.1.2
^ permalink raw reply [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 1/2] freescale-imx: separate variable assignment from Makefile
2013-10-01 18:06 [Buildroot] [PATCH 0/2] i.MX: update gst-fsl-plugin version Eric Nelson
@ 2013-10-01 18:06 ` Eric Nelson
2013-10-01 18:08 ` Eric Nelson
2013-10-01 19:44 ` Thomas Petazzoni
2013-10-01 18:06 ` [Buildroot] [PATCH 2/2] gst-fsl-plugins: Bump version and change URL to match other i.MX components Eric Nelson
1 sibling, 2 replies; 9+ messages in thread
From: Eric Nelson @ 2013-10-01 18:06 UTC (permalink / raw)
To: buildroot
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).
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
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
diff --git a/package/freescale-imx/freescale-imx.inc b/package/freescale-imx/freescale-imx.inc
new file mode 100644
index 0000000..51709f4
--- /dev/null
+++ b/package/freescale-imx/freescale-imx.inc
@@ -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/
+
diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
index 2762972..46f4ddb 100644
--- a/package/freescale-imx/freescale-imx.mk
+++ b/package/freescale-imx/freescale-imx.mk
@@ -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))
--
1.8.1.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] freescale-imx: separate variable assignment from Makefile
2013-10-01 18:06 ` [Buildroot] [PATCH 1/2] freescale-imx: separate variable assignment from Makefile Eric Nelson
@ 2013-10-01 18:08 ` Eric Nelson
2013-10-01 19:44 ` Thomas Petazzoni
1 sibling, 0 replies; 9+ messages in thread
From: Eric Nelson @ 2013-10-01 18:08 UTC (permalink / raw)
To: buildroot
Hi Arnout,
On 10/01/2013 11:06 AM, Eric Nelson wrote:
> 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).
>
> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
> ---
> 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
>
> diff --git a/package/freescale-imx/freescale-imx.inc b/package/freescale-imx/freescale-imx.inc
> new file mode 100644
> index 0000000..51709f4
> --- /dev/null
> +++ b/package/freescale-imx/freescale-imx.inc
> @@ -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/
> +
> diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
> index 2762972..46f4ddb 100644
> --- a/package/freescale-imx/freescale-imx.mk
> +++ b/package/freescale-imx/freescale-imx.mk
> @@ -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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] freescale-imx: separate variable assignment from Makefile
2013-10-01 18:06 ` [Buildroot] [PATCH 1/2] freescale-imx: separate variable assignment from Makefile Eric Nelson
2013-10-01 18:08 ` Eric Nelson
@ 2013-10-01 19:44 ` Thomas Petazzoni
2013-10-01 21:19 ` Eric Nelson
1 sibling, 1 reply; 9+ messages in thread
From: Thomas Petazzoni @ 2013-10-01 19:44 UTC (permalink / raw)
To: buildroot
Dear Eric Nelson,
On Tue, 1 Oct 2013 11:06:29 -0700, Eric Nelson wrote:
> 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).
>
> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
> ---
> 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
--
Thomas Petazzoni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] freescale-imx: separate variable assignment from Makefile
2013-10-01 19:44 ` Thomas Petazzoni
@ 2013-10-01 21:19 ` Eric Nelson
2013-10-01 21:27 ` Thomas Petazzoni
0 siblings, 1 reply; 9+ messages in thread
From: Eric Nelson @ 2013-10-01 21:19 UTC (permalink / raw)
To: buildroot
Hi Thomas,
On 10/01/2013 12:44 PM, Thomas Petazzoni wrote:
> Dear Eric Nelson,
>
> On Tue, 1 Oct 2013 11:06:29 -0700, Eric Nelson wrote:
>> 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).
>>
>> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
>> ---
>> 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.
>
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] freescale-imx: separate variable assignment from Makefile
2013-10-01 21:19 ` Eric Nelson
@ 2013-10-01 21:27 ` Thomas Petazzoni
2013-10-01 21:50 ` Eric Nelson
0 siblings, 1 reply; 9+ messages in thread
From: Thomas Petazzoni @ 2013-10-01 21:27 UTC (permalink / raw)
To: buildroot
Dear Eric Nelson,
On Tue, 01 Oct 2013 14:19:09 -0700, Eric Nelson wrote:
> 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
--
Thomas Petazzoni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] freescale-imx: separate variable assignment from Makefile
2013-10-01 21:27 ` Thomas Petazzoni
@ 2013-10-01 21:50 ` Eric Nelson
0 siblings, 0 replies; 9+ messages in thread
From: Eric Nelson @ 2013-10-01 21:50 UTC (permalink / raw)
To: buildroot
Hi Thomas,
You (and Arnout) are right, of course.
On 10/01/2013 02:27 PM, Thomas Petazzoni wrote:
> Dear Eric Nelson,
>
> On Tue, 01 Oct 2013 14:19:09 -0700, Eric Nelson wrote:
>
>> 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.
>
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] gst-fsl-plugins: Bump version and change URL to match other i.MX components
2013-10-01 18:06 [Buildroot] [PATCH 0/2] i.MX: update gst-fsl-plugin version Eric Nelson
2013-10-01 18:06 ` [Buildroot] [PATCH 1/2] freescale-imx: separate variable assignment from Makefile Eric Nelson
@ 2013-10-01 18:06 ` Eric Nelson
2013-10-01 20:48 ` Arnout Vandecappelle
1 sibling, 1 reply; 9+ messages in thread
From: Eric Nelson @ 2013-10-01 18:06 UTC (permalink / raw)
To: buildroot
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---
package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
index ccdb521..00c6acb 100644
--- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
+++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
@@ -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+
--
1.8.1.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] gst-fsl-plugins: Bump version and change URL to match other i.MX components
2013-10-01 18:06 ` [Buildroot] [PATCH 2/2] gst-fsl-plugins: Bump version and change URL to match other i.MX components Eric Nelson
@ 2013-10-01 20:48 ` Arnout Vandecappelle
0 siblings, 0 replies; 9+ messages in thread
From: Arnout Vandecappelle @ 2013-10-01 20:48 UTC (permalink / raw)
To: buildroot
On 10/01/13 20:06, Eric Nelson wrote:
> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
> ---
> package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
> index ccdb521..00c6acb 100644
> --- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
> +++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
> @@ -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
> +
> +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+
>
--
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
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-10-01 21:50 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-01 18:06 [Buildroot] [PATCH 0/2] i.MX: update gst-fsl-plugin version Eric Nelson
2013-10-01 18:06 ` [Buildroot] [PATCH 1/2] freescale-imx: separate variable assignment from Makefile Eric Nelson
2013-10-01 18:08 ` Eric Nelson
2013-10-01 19:44 ` Thomas Petazzoni
2013-10-01 21:19 ` Eric Nelson
2013-10-01 21:27 ` Thomas Petazzoni
2013-10-01 21:50 ` Eric Nelson
2013-10-01 18:06 ` [Buildroot] [PATCH 2/2] gst-fsl-plugins: Bump version and change URL to match other i.MX components Eric Nelson
2013-10-01 20:48 ` Arnout Vandecappelle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox