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

login
register
mail settings
Submitter Otavio Salvador
Date Feb. 19, 2013, 12:37 p.m.
Message ID <1361277447-6186-2-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/44841/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - Feb. 19, 2013, 12:37 p.m.
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
Eric BENARD - Feb. 19, 2013, 1:44 p.m.
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
Richard Purdie - Feb. 19, 2013, 1:59 p.m.
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
Eric BENARD - Feb. 19, 2013, 2:02 p.m.
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
Eric BENARD - Feb. 19, 2013, 2:03 p.m.
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

Patch

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"