Fixed meta-toolchain to include the proper linux-libc-headers-nativesdk

diff --git a/meta-fsl-ppc/conf/machine/e500mc.inc b/meta-fsl-ppc/conf/machine/e500mc.inc
index 479c513bb1d86b3bfd21bbbfd59be1ea8694e88c..bfac9e6d2d97511c1d852998c1d613a16fd2353f 100644 (file)
--- a/meta-fsl-ppc/conf/machine/e500mc.inc
+++ b/meta-fsl-ppc/conf/machine/e500mc.inc
@@ -8,6 +8,7 @@ MACHINE_FEATURES_RRECOMMENDS = ""
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.6"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
+PREFERRED_PROVIDER_linux-libc-headers-nativesdk ?= "linux-qoriq-sdk-headers-nativesdk"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now

diff --git a/meta-fsl-ppc/conf/machine/e500v2.inc b/meta-fsl-ppc/conf/machine/e500v2.inc
index 6e2eb493455956865bb0a6f046e1f7cafb83bac3..cf8f36c8695f0593ebe894a01b8d741db0b10d7c 100644 (file)
--- a/meta-fsl-ppc/conf/machine/e500v2.inc
+++ b/meta-fsl-ppc/conf/machine/e500v2.inc
@@ -8,6 +8,7 @@ MACHINE_EXTRA_RRECOMMENDS = ""
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.6"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
+PREFERRED_PROVIDER_linux-libc-headers-nativesdk ?= "linux-qoriq-sdk-headers-nativesdk"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now

diff --git a/meta-fsl-ppc/conf/machine/e5500-64b.inc b/meta-fsl-ppc/conf/machine/e5500-64b.inc
index 1e5d92b682a96264f04696734860a1266d7bb0c7..80dee5cac015e30303d09a3e1ce1fbbcfae33faf 100644 (file)
--- a/meta-fsl-ppc/conf/machine/e5500-64b.inc
+++ b/meta-fsl-ppc/conf/machine/e5500-64b.inc
@@ -9,6 +9,7 @@ MACHINE_FEATURES_RRECOMMENDS = ""
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.6"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
+PREFERRED_PROVIDER_linux-libc-headers-nativesdk ?= "linux-qoriq-sdk-headers-nativesdk"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now

diff --git a/meta-fsl-ppc/conf/machine/e5500.inc b/meta-fsl-ppc/conf/machine/e5500.inc
index f34c2c0ccae3f1ab9e8f68b0707c227b08034f4c..965618e374da2f5d097d720a41056ae0dc9e3d29 100644 (file)
--- a/meta-fsl-ppc/conf/machine/e5500.inc
+++ b/meta-fsl-ppc/conf/machine/e5500.inc
@@ -8,6 +8,7 @@ MACHINE_FEATURES_RRECOMMENDS = ""
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.6"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
+PREFERRED_PROVIDER_linux-libc-headers-nativesdk ?= "linux-qoriq-sdk-headers-nativesdk"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now

diff --git a/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk-headers.bb b/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk-headers.bb
index cf1ffeee52d73d2bb5e51dcc15c66727f8c23997..4be6c420f435563cf5030aab5050ad69d174a320 100644 (file)
--- a/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk-headers.bb
+++ b/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk-headers.bb
@@ -1,15 +1,16 @@
-PROVIDES = "linux-libc-headers"
-
 DESCRIPTION = "Linux kernel headers for Freescale platforms"
 SECTION = "devel"
 LICENSE = "GPLv2"
 
+PKGSUFFIX = ""
+PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
+
 INHIBIT_DEFAULT_DEPS = "1"
-PROVIDES = "linux-libc-headers linux-qoriq-sdk-headers"
-RPROVIDES_${PN}-dev = "linux-libc-headers-dev"
-RPROVIDES_${PN}-dbg = "linux-libc-headers-dbg"
+PROVIDES = "linux-libc-headers${PKGSUFFIX} ${PN}"
+RPROVIDES_${PN}-dev += "linux-libc-headers${PKGSUFFIX}-dev"
+RPROVIDES_${PN}-dbg += "linux-libc-headers${PKGSUFFIX}-dbg"
 RDEPENDS_${PN}-dev = ""
-RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
+RRECOMMENDS_${PN}-dbg = "linux-libc-headers${PKGSUFFIX}-dev (= ${EXTENDPKGV})"
 
 require recipes-kernel/linux/linux-qoriq-sdk.inc
 

diff --git a/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.inc b/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.inc
index dc650c0644fad06c3326e03d940ce2a7e42266df..7e5dbf4b86a7e8c047469a1fa1bdd217e312f3b4 100644 (file)
--- a/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.inc
+++ b/meta-fsl-ppc/recipes-kernel/linux/linux-qoriq-sdk.inc
@@ -15,6 +15,3 @@ S = '${@base_conditional("KSRC", "", "${WORKDIR}/git", "${KSRC}", d)}'
 
 # make everything compatible for the time being
 COMPATIBLE_MACHINE_$MACHINE = "$MACHINE"
-
-# only powerpc and powerpc64 are compatible
-COMPATIBLE_HOST = "(powerpc|powerpc64)"