linux-qoriq-sdk-headers: Make it machine independent

The linux libc headers should not be dependent on machine
at all. These are generic enough that we can use an all
purpose defconfig.

Signed-off-by: Khem Raj <raj.khem@gmail.com>

1 files changed, 12 insertions, 29 deletions

diff --git a/recipes-kernel/linux/linux-qoriq-sdk-headers.bb b/recipes-kernel/linux/linux-qoriq-sdk-headers.bb
index 4be6c42..b1cbb8d 100644
--- a/recipes-kernel/linux/linux-qoriq-sdk-headers.bb
+++ b/recipes-kernel/linux/linux-qoriq-sdk-headers.bb
@@ -2,46 +2,29 @@ DESCRIPTION = "Linux kernel headers for Freescale platforms"
 SECTION = "devel"
 LICENSE = "GPLv2"
 
-PKGSUFFIX = ""
-PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
-
 INHIBIT_DEFAULT_DEPS = "1"
-PROVIDES = "linux-libc-headers${PKGSUFFIX} ${PN}"
-RPROVIDES_${PN}-dev += "linux-libc-headers${PKGSUFFIX}-dev"
-RPROVIDES_${PN}-dbg += "linux-libc-headers${PKGSUFFIX}-dbg"
+PROVIDES = "linux-libc-headers ${PN}"
+RPROVIDES_${PN}-dev += "linux-libc-headers-dev"
+RPROVIDES_${PN}-dbg += "linux-libc-headers-dbg"
 RDEPENDS_${PN}-dev = ""
-RRECOMMENDS_${PN}-dbg = "linux-libc-headers${PKGSUFFIX}-dev (= ${EXTENDPKGV})"
+RRECOMMENDS_${PN}-dbg = "linux-libc-headers-dev (= ${EXTENDPKGV})"
 
 require recipes-kernel/linux/linux-qoriq-sdk.inc
 
-set_arch() {
-        case ${TARGET_ARCH} in
-                arm*)     ARCH=arm ;;
-                i*86*)    ARCH=i386 ;;
-                ia64*)    ARCH=ia64 ;;
-                mips*)    ARCH=mips ;;
-                powerpc*) ARCH=powerpc ;;
-                x86_64*)  ARCH=x86_64 ;;
-        esac
-}
+inherit kernel-arch
 
-do_configure () {
-        set_arch
-        cp ${KERNEL_DEFCONFIG} ${B}/.config
-        oe_runmake oldconfig ARCH=${ARCH}
+do_configure() {
+        oe_runmake allnoconfig
 }
-do_configure[vardepsexclude] += "KERNEL_DEFCONFIG"
 
 do_compile () {
 }
 
 do_install() {
-        set_arch
-        cd ${S}
-        oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=${ARCH}
+        oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}
+        # Kernel should not be exporting this header
+        rm -f ${D}${exec_prefix}/include/scsi/scsi.h
 
-        # The ..install.cmd conflicts between various configure runs
-        find ${D}${includedir} -name ..install.cmd | xargs rm -f
+        # The ..install.cmd conflicts between various configure runs
+        find ${D}${includedir} -name ..install.cmd | xargs rm -f
 }
-
-BBCLASSEXTEND = "nativesdk"