From: David Nyström <david.nystrom@enea.com>
Date: Fri, 1 Jun 2012 15:46:01 +0000 (+0000)
Subject: Fixed meta-toolchain to include the proper linux-libc-headers-nativesdk
X-Git-Tag: 2.1~534^2~453
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=edae3bc3c0be439497ea668f5ae0145c4ca045eb;p=meta-freescale.git

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 479c513b..bfac9e6d 100644
--- 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 6e2eb493..cf8f36c8 100644
--- 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 1e5d92b6..80dee5ca 100644
--- 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 f34c2c0c..965618e3 100644
--- 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 cf1ffeee..4be6c420 100644
--- 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 dc650c06..7e5dbf4b 100644
--- 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)"