linux-libc-headers: Use Yocto's default to avoid same arch rebuilds

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>

diff --git a/meta-fsl-arm/conf/machine/include/fsl-default-providers.inc b/meta-fsl-arm/conf/machine/include/fsl-default-providers.inc
index 43adeb33706afd43524334c97cadc06deeda54f7..de151896182936aa2090a05800e4d769a36dd32b 100644 (file)
--- a/meta-fsl-arm/conf/machine/include/fsl-default-providers.inc
+++ b/meta-fsl-arm/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/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc
index 2f366f9086cfc3699a5c5cb70765d40dad30b0a8..dd7948b525ec547e9f416bf3f348428712bb3e4c 100644 (file)
--- a/meta-fsl-arm/conf/machine/include/imx-base.inc
+++ b/meta-fsl-arm/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/meta-fsl-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bb b/meta-fsl-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bb
deleted file mode 100644 (file)
index b2f8d46..0000000
--- a/meta-fsl-arm/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/meta-fsl-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_3.0.35.bb b/meta-fsl-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_3.0.35.bb
deleted file mode 100644 (file)
index 01b178d..0000000
--- a/meta-fsl-arm/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"