[meta-fsl-arm][PATCH 0/3] Stop using Freescale as linux-libc-headers

[meta-fsl-arm][PATCH 0/3] Stop using Freescale as linux-libc-headers

[Otavio Salvador]

This patchset changes the build system to use regular libc' Linux
headers avoiding the need of rebuild everything which depends on LibC
when changing machine.

Otavio Salvador (3):
  linux-libc-headers: Use Yocto's default to avoid same arch rebuilds
  qt4: Use kernel staging include files
  mesa: Rename to follow OE-Core upgrade

 conf/machine/include/fsl-default-providers.inc           |  1 -
 conf/machine/include/imx-base.inc                        |  1 -
 .../{mesa-dri_9.0.1.bbappend => mesa-dri_9.0.2.bbappend} |  0
 .../linux-libc-headers-imx_2.6.35.3.bb                   | 16 ----------------
 .../linux-libc-headers/linux-libc-headers-imx_3.0.35.bb  | 13 -------------
 recipes-qt/qt4/qt4-embedded_4.8.4.bbappend               |  7 +++++--
 recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend               |  7 +++++--
 7 files changed, 10 insertions(+), 35 deletions(-)
 rename recipes-graphics/mesa/{mesa-dri_9.0.1.bbappend => mesa-dri_9.0.2.bbappend} (100%)
 delete mode 100644 recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bb
 delete mode 100644 recipes-kernel/linux-libc-headers/linux-libc-headers-imx_3.0.35.bb

-- 
1.8.1

[meta-fsl-arm][PATCH 1/3] linux-libc-headers: Use Yocto's default to avoid same arch rebuilds

[Otavio Salvador]

This avoids full rebuild in case of compatible machine changes (e.g
i.MX53 and i.MX6) and fixes the build failures seen in autobuilder.

[YOCTO #3667]

Change-Id: I4c46499d00e95738409ee39a659e93095dd7f207
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/include/fsl-default-providers.inc           |  1 -
 conf/machine/include/imx-base.inc                        |  1 -
 .../linux-libc-headers-imx_2.6.35.3.bb                   | 16 ----------------
 .../linux-libc-headers/linux-libc-headers-imx_3.0.35.bb  | 13 -------------
 4 files changed, 31 deletions(-)
 delete mode 100644 recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bb
 delete mode 100644 recipes-kernel/linux-libc-headers/linux-libc-headers-imx_3.0.35.bb

diff --git a/conf/machine/include/fsl-default-providers.inc b/conf/machine/include/fsl-default-providers.inc
index 43adeb3..de15189 100644
--- a/conf/machine/include/fsl-default-providers.inc
+++ b/conf/machine/include/fsl-default-providers.inc
@@ -2,5 +2,4 @@
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-imx"
-PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-imx"
 PREFERRED_PROVIDER_u-boot ?= "u-boot-fslc"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 2f366f9..dd7948b 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -66,7 +66,6 @@ PREFERRED_PROVIDER_virtual/libgles1_mx6 ?= "gpu-viv-bin-mx6q"
 PREFERRED_PROVIDER_virtual/libgles2_mx6 ?= "gpu-viv-bin-mx6q"
 
 PREFERRED_PROVIDER_virtual/kernel_mx3 = "linux-fslc"
-PREFERRED_PROVIDER_linux-libc-headers_mx3 = "linux-libc-headers"
 
 EXTRA_IMAGEDEPENDS = "u-boot"
 
diff --git a/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bb b/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bb
deleted file mode 100644
index b2f8d46..0000000
--- a/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require recipes-kernel/linux-libc-headers/linux-libc-headers.inc
-
-PROVIDES = "linux-libc-headers"
-RPROVIDES_${PN}-dev = "linux-libc-headers-dev"
-RPROVIDES_${PN}-dbg = "linux-libc-headers-dbg"
-
-# Revision of imx_2.6.35_10.12.01 branch
-SRCREV_mxs = "0ea8cb9453379388f870f9b8d13269fb9dc0761c"
-
-# Revision of imx_2.6.35_11.09.01 branch
-SRCREV_mx5 = "bc8159027063aded47316b669b1293998337b2ee"
-SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git"
-
-S = "${WORKDIR}/git"
-
-PR = "r6"
diff --git a/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_3.0.35.bb b/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_3.0.35.bb
deleted file mode 100644
index 01b178d..0000000
--- a/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_3.0.35.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require recipes-kernel/linux-libc-headers/linux-libc-headers.inc
-
-PROVIDES = "linux-libc-headers"
-RPROVIDES_${PN}-dev = "linux-libc-headers-dev"
-RPROVIDES_${PN}-dbg = "linux-libc-headers-dbg"
-
-COMPATIBLE_MACHINE = "(mx6)"
-
-# Revision of 12.09.01 tag
-SRCREV = "eaaf30efdc8dfeb03418bde1499a76c9903bd211"
-SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git"
-
-S = "${WORKDIR}/git"
-- 
1.8.1

[meta-fsl-arm][PATCH 2/3] qt4: Use kernel staging include files

[Otavio Salvador]

This allow the Phonon backend to proper build while using the
linux-libc-headers provided by Yocto.

Change-Id: I648a01ffb638e2ac42962d4599857e621379f8cb
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-qt/qt4/qt4-embedded_4.8.4.bbappend | 7 +++++--
 recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend b/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
index 3a4cff1..041f1eb 100644
--- a/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
+++ b/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
@@ -4,10 +4,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:"
 SRC_URI_append_mx5 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch"
 SRC_URI_append_mx6 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch"
 
-DEPENDS_append_mx5 = " virtual/libgles2"
+DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2"
 PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
 QT_GLFLAGS_mx5 = "-opengl es2 -openvg"
+QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/"
 
+DEPENDS_append_mx6 = " virtual/kernel"
 PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
+QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/"
 
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
diff --git a/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend b/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
index 3a4cff1..041f1eb 100644
--- a/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
+++ b/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
@@ -4,10 +4,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:"
 SRC_URI_append_mx5 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch"
 SRC_URI_append_mx6 += "file://0001-Add-support-for-i.MX-codecs-to-phonon.patch"
 
-DEPENDS_append_mx5 = " virtual/libgles2"
+DEPENDS_append_mx5 = " virtual/kernel virtual/libgles2"
 PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
 QT_GLFLAGS_mx5 = "-opengl es2 -openvg"
+QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/"
 
+DEPENDS_append_mx6 = " virtual/kernel"
 PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
+QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/"
 
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
-- 
1.8.1

[meta-fsl-arm][PATCH 3/3] mesa: Rename to follow OE-Core upgrade

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../mesa/{mesa-dri_9.0.1.bbappend => mesa-dri_9.0.2.bbappend}             | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename recipes-graphics/mesa/{mesa-dri_9.0.1.bbappend => mesa-dri_9.0.2.bbappend} (100%)

diff --git a/recipes-graphics/mesa/mesa-dri_9.0.1.bbappend b/recipes-graphics/mesa/mesa-dri_9.0.2.bbappend
similarity index 100%
rename from recipes-graphics/mesa/mesa-dri_9.0.1.bbappend
rename to recipes-graphics/mesa/mesa-dri_9.0.2.bbappend
-- 
1.8.1

Re: [meta-fsl-arm][PATCH 1/3] linux-libc-headers: Use Yocto's default to avoid same arch rebuilds

[Eric Bénard]

Hi Otavio,

Le Tue, 19 Feb 2013 09:37:25 -0300,
Otavio Salvador <otavio@ossystems.com.br> a écrit :

> This avoids full rebuild in case of compatible machine changes (e.g
> i.MX53 and i.MX6) and fixes the build failures seen in autobuilder.
> 
aren't Frescale's headers needed for some GPU/VPU libraries ?

Eric

Re: [meta-fsl-arm][PATCH 0/3] Stop using Freescale as linux-libc-headers

[Richard Purdie]

On Tue, 2013-02-19 at 09:37 -0300, Otavio Salvador wrote:
> This patchset changes the build system to use regular libc' Linux
> headers avoiding the need of rebuild everything which depends on LibC
> when changing machine.
> 
> Otavio Salvador (3):
>   linux-libc-headers: Use Yocto's default to avoid same arch rebuilds
>   qt4: Use kernel staging include files
>   mesa: Rename to follow OE-Core upgrade

Thanks for this, the autobuilder SWAT team will be extremely pleased to
see this fixed :)

If I understand correctly, this does move the problem to qt4 which will
rebuild for each machine but its an improvement on the current situation
and perhaps even necessary if the graphics libs are so different between
machines.

In future, if you did want to avoid that, you could probably copy the
appropriate headers out of the kernel staging and install them as
headers as part of the graphics recipe. I'm pleased to see the siutation
improved with these patches though!

Cheers,

Richard

Re: [meta-fsl-arm][PATCH 1/3] linux-libc-headers: Use Yocto's default to avoid same arch rebuilds

[Richard Purdie]

On Tue, 2013-02-19 at 14:44 +0100, Eric Bénard wrote:
> Hi Otavio,
> 
> Le Tue, 19 Feb 2013 09:37:25 -0300,
> Otavio Salvador <otavio@ossystems.com.br> a écrit :
> 
> > This avoids full rebuild in case of compatible machine changes (e.g
> > i.MX53 and i.MX6) and fixes the build failures seen in autobuilder.
> > 
> aren't Frescale's headers needed for some GPU/VPU libraries ?

The GPU/VPU libraries should be looking at the kernel headers, not the
libc headers.

If you put the kernel headers in as libc headers, it means the whole
stack is machine specific and will entirely rebuild with each machine
switch. The libc headers are meant to be machine independent.

I suspect the situation after these patches still isn't perfect (see my
other reply) however it is *much* improved and I much appreciate this
being fixed. We've seen build repeated failures on the autobuilder for
what seems like months due to this problem.

Cheers,

Richard

Re: [meta-fsl-arm][PATCH 1/3] linux-libc-headers: Use Yocto's default to avoid same arch rebuilds

[Eric Bénard]

Le Tue, 19 Feb 2013 14:44:08 +0100,
Eric Bénard <eric@eukrea.com> a écrit :
> Le Tue, 19 Feb 2013 09:37:25 -0300,
> Otavio Salvador <otavio@ossystems.com.br> a écrit :
> 
> > This avoids full rebuild in case of compatible machine changes (e.g
> > i.MX53 and i.MX6) and fixes the build failures seen in autobuilder.
> > 
> aren't Frescale's headers needed for some GPU/VPU libraries ?
> 
OK forget that, we have -I${STAGING_KERNEL_DIR}/include in imxfb.

Eric

Re: [meta-fsl-arm][PATCH 1/3] linux-libc-headers: Use Yocto's default to avoid same arch rebuilds

[Eric Bénard]

Le Tue, 19 Feb 2013 05:59:41 -0800,
Richard Purdie <richard.purdie@linuxfoundation.org> a écrit :

> On Tue, 2013-02-19 at 14:44 +0100, Eric Bénard wrote:
> > Hi Otavio,
> > 
> > Le Tue, 19 Feb 2013 09:37:25 -0300,
> > Otavio Salvador <otavio@ossystems.com.br> a écrit :
> > 
> > > This avoids full rebuild in case of compatible machine changes (e.g
> > > i.MX53 and i.MX6) and fixes the build failures seen in autobuilder.
> > > 
> > aren't Frescale's headers needed for some GPU/VPU libraries ?
> 
> The GPU/VPU libraries should be looking at the kernel headers, not the
> libc headers.
> 
yes, I just looked at the recipe efter sending the mail and remembered
the difference ;-)

> If you put the kernel headers in as libc headers, it means the whole
> stack is machine specific and will entirely rebuild with each machine
> switch. The libc headers are meant to be machine independent.
> 
> I suspect the situation after these patches still isn't perfect (see my
> other reply) however it is *much* improved and I much appreciate this
> being fixed. We've seen build repeated failures on the autobuilder for
> what seems like months due to this problem.

very good.

Eric

Re: [meta-fsl-arm][PATCH 0/3] Stop using Freescale as linux-libc-headers

[Otavio Salvador]

On Tue, Feb 19, 2013 at 10:56 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Tue, 2013-02-19 at 09:37 -0300, Otavio Salvador wrote:
>> This patchset changes the build system to use regular libc' Linux
>> headers avoiding the need of rebuild everything which depends on LibC
>> when changing machine.
>>
>> Otavio Salvador (3):
>>   linux-libc-headers: Use Yocto's default to avoid same arch rebuilds
>>   qt4: Use kernel staging include files
>>   mesa: Rename to follow OE-Core upgrade
>
> Thanks for this, the autobuilder SWAT team will be extremely pleased to
> see this fixed :)

Yes, I can bed; they'll be pleased to have less build failures to check ;-)

> If I understand correctly, this does move the problem to qt4 which will
> rebuild for each machine but its an improvement on the current situation
> and perhaps even necessary if the graphics libs are so different between
> machines.

Yes; no good solution for it yet.

> In future, if you did want to avoid that, you could probably copy the
> appropriate headers out of the kernel staging and install them as
> headers as part of the graphics recipe. I'm pleased to see the siutation
> improved with these patches though!

Yes, this might be an option but people from Freescale needs to
confirm the API will be the same for all SoCs.

Another issue is that we could have a SoC family "arch" so Qt wouldn't
be rebuild if changing from one mx5 board to another mx5 board. What
do you think?

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Re: [meta-fsl-arm][PATCH 0/3] Stop using Freescale as linux-libc-headers

[Otavio Salvador]

On Tue, Feb 19, 2013 at 9:37 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> This patchset changes the build system to use regular libc' Linux
> headers avoiding the need of rebuild everything which depends on LibC
> when changing machine.
>
> Otavio Salvador (3):
>   linux-libc-headers: Use Yocto's default to avoid same arch rebuilds
>   qt4: Use kernel staging include files
>   mesa: Rename to follow OE-Core upgrade

All those patches were merged onto master branch.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br