sdk.bbclass: Rename to nativesdk.bbclass

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 2b0c28477516ef32fbc91402c1f5861474ea349d..56d6a0b887a13385db7ad077bc73ff49484ee246 100644 (file)
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -289,7 +289,7 @@ def package_qa_check_arch(path,name,d):
     target_arch = bb.data.getVar('TARGET_ARCH', d, True)
 
     # FIXME: Cross package confuse this check, so just skip them
-    if bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d):
+    if bb.data.inherits_class('cross', d) or bb.data.inherits_class('nativesdk', d):
         return True
 
     # avoid following links to /usr/bin (e.g. on udev builds)

diff --git a/meta/classes/sdk.bbclass b/meta/classes/nativesdk.bbclass
similarity index 89%
rename from meta/classes/sdk.bbclass
rename to meta/classes/nativesdk.bbclass
index 97fa8552cf2a5dad18b7a87de653946931d087f7..d1b429488b4c2a959ac9854aaa6a20c1910c418c 100644 (file)
--- a/meta/classes/sdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -6,7 +6,7 @@ EXCLUDE_FROM_WORLD = "1"
 OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}"
 # Save PACKAGE_ARCH
 OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
-PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk"
+PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-nativesdk"
 # Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it
 OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}"
 BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}"
@@ -82,21 +82,21 @@ python __anonymous () {
     for dep in deps:
         if dep.endswith("-native") or dep.endswith("-cross"):
             continue
-        if not dep.endswith("-sdk"):
+        if not dep.endswith("-nativesdk"):
             if autoextend:
-                depends = depends.replace(dep, dep + "-sdk")
-            elif pn == 'gcc-cross-sdk':
+                depends = depends.replace(dep, dep + "-nativesdk")
+            elif pn == 'gcc-cross-nativesdk':
                 continue
             else:
-                bb.note("%s has depends %s which doesn't end in -sdk?" % (pn, dep))
+                bb.note("%s has depends %s which doesn't end in -nativesdk?" % (pn, dep))
     bb.data.setVar("DEPENDS", depends, d)
     provides = bb.data.getVar("PROVIDES", d, True)
     for prov in provides.split():
         if prov.find(pn) != -1:
             continue
-        if not prov.endswith("-sdk"):
+        if not prov.endswith("-nativesdk"):
             if autoextend:
-                provides = provides.replace(prov, prov + "-sdk")
+                provides = provides.replace(prov, prov + "-nativesdk")
             #else:
             #    bb.note("%s has rouge PROVIDES of %s which doesn't end in -sdk?" % (pn, prov))
     bb.data.setVar("PROVIDES", provides, d)

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 7b13dab1be952d7a4841bc4a1bcbeadd24375152..d327bfc6b3195a00cda0eed6681b471a27e021c5 100644 (file)
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -75,7 +75,7 @@ package_update_index_ipk () {
 
        packagedirs="${DEPLOY_DIR_IPK}"
        for arch in $ipkgarchs; do
-               packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk"
+               packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-nativesdk"
        done
 
        for pkgdir in $packagedirs; do
@@ -100,8 +100,8 @@ package_generate_ipkg_conf () {
                if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
                        echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET}
                fi
-               if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages ] ; then
-                       echo "src oe-${BUILD_ARCH}-$arch-sdk file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk" >> ${IPKGCONF_SDK}
+               if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-nativesdk/Packages ] ; then
+                       echo "src oe-${BUILD_ARCH}-$arch-nativesdk file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-nativesdk" >> ${IPKGCONF_SDK}
                fi
        done
 }
@@ -111,7 +111,7 @@ package_generate_archlist () {
        priority=1
        for arch in $ipkgarchs; do
                echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
-               echo "arch ${BUILD_ARCH}-$arch-sdk $priority" >> ${IPKGCONF_SDK}
+               echo "arch ${BUILD_ARCH}-$arch-nativesdk $priority" >> ${IPKGCONF_SDK}
                priority=$(expr $priority + 5)
        done
 }

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f5031f0b0135b8bed3344a46e51cd6659549c75e..67de34ef8eb90e64393fae124f4c457eab3df61c 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -146,7 +146,7 @@ P = "${PN}-${PV}"
 # Base package name
 # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial"
 # otherwise it is the same as PN and P
-SPECIAL_PKGSUFFIX = "-native -cross-sdk -cross -sdk -initial -intermediate"
+SPECIAL_PKGSUFFIX = "-native -cross-sdk -cross -nativesdk -initial -intermediate"
 BPN = "${@base_prune_suffix(bb.data.getVar('PN', d, True), bb.data.getVar('SPECIAL_PKGSUFFIX', d, True).split(), d)}"
 BP = "${BPN}-${PV}"
 

diff --git a/meta/packages/binutils/binutils-cross-sdk.inc b/meta/packages/binutils/binutils-cross-nativesdk.inc
similarity index 97%
rename from meta/packages/binutils/binutils-cross-sdk.inc
rename to meta/packages/binutils/binutils-cross-nativesdk.inc
index 10e3080306b8bb873355a59dd3e11b289ff4635c..986ead43bb40381ba603cf82d420b0663bd975c9 100644 (file)
--- a/meta/packages/binutils/binutils-cross-sdk.inc
+++ b/meta/packages/binutils/binutils-cross-nativesdk.inc
@@ -1,4 +1,4 @@
-inherit sdk
+inherit nativesdk
 DEPENDS += "flex-native bison-native"
 EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \
                --program-prefix=${TARGET_PREFIX}"

diff --git a/meta/packages/binutils/binutils-cross-nativesdk_2.18.bb b/meta/packages/binutils/binutils-cross-nativesdk_2.18.bb
new file mode 100644 (file)
index 0000000..7eb313f
--- /dev/null
+++ b/meta/packages/binutils/binutils-cross-nativesdk_2.18.bb
@@ -0,0 +1,3 @@
+require binutils_${PV}.bb
+require binutils-cross-nativesdk.inc
+PR = "r3"

diff --git a/meta/packages/binutils/binutils-cross-nativesdk_2.19.bb b/meta/packages/binutils/binutils-cross-nativesdk_2.19.bb
new file mode 100644 (file)
index 0000000..3bb6e5e
--- /dev/null
+++ b/meta/packages/binutils/binutils-cross-nativesdk_2.19.bb
@@ -0,0 +1,3 @@
+require binutils_${PV}.bb
+require binutils-cross-nativesdk.inc
+PR = "r0"

diff --git a/meta/packages/binutils/binutils-cross-sdk_2.18.bb b/meta/packages/binutils/binutils-cross-sdk_2.18.bb
deleted file mode 100644 (file)
index 4695c61..0000000
--- a/meta/packages/binutils/binutils-cross-sdk_2.18.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require binutils_${PV}.bb
-require binutils-cross-sdk.inc
-PR = "r3"

diff --git a/meta/packages/binutils/binutils-cross-sdk_2.19.bb b/meta/packages/binutils/binutils-cross-sdk_2.19.bb
deleted file mode 100644 (file)
index 76dff54..0000000
--- a/meta/packages/binutils/binutils-cross-sdk_2.19.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require binutils_${PV}.bb
-require binutils-cross-sdk.inc
-PR = "r0"

diff --git a/meta/packages/curl/curl-nativesdk_7.18.0.bb b/meta/packages/curl/curl-nativesdk_7.18.0.bb
new file mode 100644 (file)
index 0000000..eeb653f
--- /dev/null
+++ b/meta/packages/curl/curl-nativesdk_7.18.0.bb
@@ -0,0 +1,4 @@
+require curl_${PV}.bb
+inherit nativesdk
+DEPENDS = "zlib-nativesdk"
+

diff --git a/meta/packages/curl/curl-sdk_7.18.0.bb b/meta/packages/curl/curl-sdk_7.18.0.bb
deleted file mode 100644 (file)
index f15e2db..0000000
--- a/meta/packages/curl/curl-sdk_7.18.0.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require curl_${PV}.bb
-inherit sdk
-DEPENDS = "zlib-sdk"
-

diff --git a/meta/packages/expat/expat_2.0.0.bb b/meta/packages/expat/expat_2.0.0.bb
index f24619a176a0daf2bff5cf9536ec1f36421e0d16..8921db03a440a6abe980986a8d1269f0ab380aa5 100644 (file)
--- a/meta/packages/expat/expat_2.0.0.bb
+++ b/meta/packages/expat/expat_2.0.0.bb
@@ -10,4 +10,4 @@ do_configure_prepend () {
        touch ${S}/conftools/libtool.m4
 }
 
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/packages/gcc/gcc-cross-sdk_3.4.4.bb b/meta/packages/gcc/gcc-cross-nativesdk_3.4.4.bb
similarity index 100%
rename from meta/packages/gcc/gcc-cross-sdk_3.4.4.bb
rename to meta/packages/gcc/gcc-cross-nativesdk_3.4.4.bb

diff --git a/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb b/meta/packages/gcc/gcc-cross-nativesdk_4.1.2.bb
similarity index 100%
rename from meta/packages/gcc/gcc-cross-sdk_4.1.2.bb
rename to meta/packages/gcc/gcc-cross-nativesdk_4.1.2.bb

diff --git a/meta/packages/gcc/gcc-cross-sdk_4.2.3.bb b/meta/packages/gcc/gcc-cross-nativesdk_4.2.3.bb
similarity index 94%
rename from meta/packages/gcc/gcc-cross-sdk_4.2.3.bb
rename to meta/packages/gcc/gcc-cross-nativesdk_4.2.3.bb
index 8cca9f8f06201d79433cdd6370ee2b3ddfe0c312..e2c641b49c55a751a46bcbbfb4811e4b724f6cd9 100644 (file)
--- a/meta/packages/gcc/gcc-cross-sdk_4.2.3.bb
+++ b/meta/packages/gcc/gcc-cross-nativesdk_4.2.3.bb
@@ -1,6 +1,6 @@
 PR = "r3"
 
-inherit sdk
+inherit nativesdk
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc

diff --git a/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb b/meta/packages/gcc/gcc-cross-nativesdk_4.3.1.bb
similarity index 95%
rename from meta/packages/gcc/gcc-cross-sdk_4.3.1.bb
rename to meta/packages/gcc/gcc-cross-nativesdk_4.3.1.bb
index 94a95de4075eb78facf2a68af596e5b0db79d10c..f1d0cbe3d1432c73f5d31f6be76961fc2af13c43 100644 (file)
--- a/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb
+++ b/meta/packages/gcc/gcc-cross-nativesdk_4.3.1.bb
@@ -1,6 +1,6 @@
 PR = "r6"
 
-inherit sdk
+inherit nativesdk
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc

diff --git a/meta/packages/gcc/gcc-cross-sdk_4.3.3.bb b/meta/packages/gcc/gcc-cross-nativesdk_4.3.3.bb
similarity index 95%
rename from meta/packages/gcc/gcc-cross-sdk_4.3.3.bb
rename to meta/packages/gcc/gcc-cross-nativesdk_4.3.3.bb
index 65df556e8cd0da15f439efaa059b144dc72bc774..993676f8daacf41dff9bff2bf6cf836361bfdd9b 100644 (file)
--- a/meta/packages/gcc/gcc-cross-sdk_4.3.3.bb
+++ b/meta/packages/gcc/gcc-cross-nativesdk_4.3.3.bb
@@ -1,6 +1,6 @@
 PR = "r6"
 
-inherit sdk
+inherit nativesdk
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc

diff --git a/meta/packages/gcc/gcc-cross-sdk_csl-arm-2005q3.bb b/meta/packages/gcc/gcc-cross-nativesdk_csl-arm-2005q3.bb
similarity index 86%
rename from meta/packages/gcc/gcc-cross-sdk_csl-arm-2005q3.bb
rename to meta/packages/gcc/gcc-cross-nativesdk_csl-arm-2005q3.bb
index 258931ee4b373228ff901150f8aa1231d4d15cb3..51b2fccb507d4d76a1118f7d5c0c2db57098eef8 100644 (file)
--- a/meta/packages/gcc/gcc-cross-sdk_csl-arm-2005q3.bb
+++ b/meta/packages/gcc/gcc-cross-nativesdk_csl-arm-2005q3.bb
@@ -1,6 +1,6 @@
 PR = "r3"
 
-inherit sdk
+inherit nativesdk
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc

diff --git a/meta/packages/gcc/gcc-cross-sdk.inc b/meta/packages/gcc/gcc-cross-sdk.inc
index fb2434293975eb0eab358516ee9a4b529237f4db..390bb024ac4479e44523012f725e69756b7288a8 100644 (file)
--- a/meta/packages/gcc/gcc-cross-sdk.inc
+++ b/meta/packages/gcc/gcc-cross-sdk.inc
@@ -1,4 +1,4 @@
-inherit sdk
+inherit nativesdk
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 

diff --git a/meta/packages/gdb/gcc-cross-nativesdk_6.8.bb b/meta/packages/gdb/gcc-cross-nativesdk_6.8.bb
new file mode 100644 (file)
index 0000000..d9d2f79
--- /dev/null
+++ b/meta/packages/gdb/gcc-cross-nativesdk_6.8.bb
@@ -0,0 +1,9 @@
+require gdb-cross.inc
+
+DEPENDS = "ncurses-nativesdk expat-nativesdk"
+
+inherit nativesdk
+
+do_stage() {
+       :
+}

diff --git a/meta/packages/gdb/gdb-cross-sdk_6.8.bb b/meta/packages/gdb/gdb-cross-sdk_6.8.bb
deleted file mode 100644 (file)
index 22a11ec..0000000
--- a/meta/packages/gdb/gdb-cross-sdk_6.8.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require gdb-cross.inc
-
-DEPENDS = "ncurses-sdk expat-sdk"
-
-inherit sdk
-
-do_stage() {
-       :
-}

diff --git a/meta/packages/gmp/gmp-sdk.inc b/meta/packages/gmp/gmp-nativesdk.inc
similarity index 97%
rename from meta/packages/gmp/gmp-sdk.inc
rename to meta/packages/gmp/gmp-nativesdk.inc
index 5d4fe1d5099bf7958ae15a4a2ce51749c79f3a94..973c60142321791e1f50b03a6684feaea5a4cf58 100644 (file)
--- a/meta/packages/gmp/gmp-sdk.inc
+++ b/meta/packages/gmp/gmp-nativesdk.inc
@@ -1,6 +1,5 @@
 require gmp_${PV}.bb
-inherit sdk
-
+inherit nativesdk
 
 oe_runconf () {
        if [ -x ${S}/configure ] ; then

diff --git a/meta/packages/gmp/gmp-nativesdk_4.2.4.bb b/meta/packages/gmp/gmp-nativesdk_4.2.4.bb
new file mode 100644 (file)
index 0000000..308f5fb
--- /dev/null
+++ b/meta/packages/gmp/gmp-nativesdk_4.2.4.bb
@@ -0,0 +1,2 @@
+PV = "4.2.4"
+require gmp-nativesdk.inc

diff --git a/meta/packages/gmp/gmp-sdk_4.2.4.bb b/meta/packages/gmp/gmp-sdk_4.2.4.bb
deleted file mode 100644 (file)
index d1d1829..0000000
--- a/meta/packages/gmp/gmp-sdk_4.2.4.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-PV = "4.2.4"
-require gmp-sdk.inc

diff --git a/meta/packages/libsdl/libsdl-sdk_1.2.11.bb b/meta/packages/libsdl/libsdl-nativesdk_1.2.11.bb
similarity index 84%
rename from meta/packages/libsdl/libsdl-sdk_1.2.11.bb
rename to meta/packages/libsdl/libsdl-nativesdk_1.2.11.bb
index 6cea742f176d329bc6fe592e8630424374de5f51..a364ca386a4514622b7bc393cba4101f160f7eb9 100644 (file)
--- a/meta/packages/libsdl/libsdl-sdk_1.2.11.bb
+++ b/meta/packages/libsdl/libsdl-nativesdk_1.2.11.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Simple DirectMedia Layer - native Edition"
 HOMEPAGE = "http://www.libsdl.org"
 SECTION = "libs"
 LICENSE = "LGPL"
-DEPENDS = "libx11-sdk libxext-sdk libxrandr-sdk libxrender-sdk"
-RDEPENDS = "libx11-sdk libxrandr-sdk libxrender-sdk libxext-sdk"
+DEPENDS = "libx11-nativesdk libxext-nativesdk libxrandr-nativesdk libxrender-nativesdk"
+RDEPENDS = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
 PR = "r4"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
@@ -12,7 +12,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
           file://kernel-asm-page.patch;patch=1 "
 S = "${WORKDIR}/SDL-${PV}"
 
-inherit autotools_stage binconfig pkgconfig sdk
+inherit autotools_stage binconfig pkgconfig nativesdk
 
 EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
                 --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \

diff --git a/meta/packages/libtool/libtool-sdk_2.2.6.bb b/meta/packages/libtool/libtool-nativesdk_2.2.6.bb
similarity index 99%
rename from meta/packages/libtool/libtool-sdk_2.2.6.bb
rename to meta/packages/libtool/libtool-nativesdk_2.2.6.bb
index 577907887d9116b3e3efd957b92d3e55940d684b..063fe9d761ea0398ce8ae554303bd9d37781930a 100644 (file)
--- a/meta/packages/libtool/libtool-sdk_2.2.6.bb
+++ b/meta/packages/libtool/libtool-nativesdk_2.2.6.bb
@@ -4,7 +4,7 @@ require libtool_${PV}.bb
 PR = "r0"
 SRC_URI_append = " file://cross_compile.patch;patch=1"
 
-inherit sdk
+inherit nativesdk
 
 do_install () {
        install -d ${D}${bindir}/

diff --git a/meta/packages/meta/external-poky-toolchain.bb b/meta/packages/meta/external-poky-toolchain.bb
index 2b8666099d8dcb96d9567be461e063214d8f4ce9..8bcc266d28f0d018a15a7cafbd081bcec87a601b 100644 (file)
--- a/meta/packages/meta/external-poky-toolchain.bb
+++ b/meta/packages/meta/external-poky-toolchain.bb
@@ -14,7 +14,7 @@ PACKAGES_DYNAMIC = "glibc-gconv-*"
 INHIBIT_DEFAULT_DEPS = "1"
 PR = "r1"
 
-inherit sdk
+inherit nativesdk
 
 do_stage() {
        if [ ! -e  ${prefix}/environment-setup ]; then

diff --git a/meta/packages/mpfr/mpfr-nativesdk_2.3.1.bb b/meta/packages/mpfr/mpfr-nativesdk_2.3.1.bb
new file mode 100644 (file)
index 0000000..009d4cf
--- /dev/null
+++ b/meta/packages/mpfr/mpfr-nativesdk_2.3.1.bb
@@ -0,0 +1,4 @@
+require mpfr_${PV}.bb
+inherit nativesdk
+DEPENDS = "gmp-nativesdk"
+

diff --git a/meta/packages/mpfr/mpfr-sdk_2.3.1.bb b/meta/packages/mpfr/mpfr-sdk_2.3.1.bb
deleted file mode 100644 (file)
index 32d3e3e..0000000
--- a/meta/packages/mpfr/mpfr-sdk_2.3.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require mpfr_${PV}.bb
-inherit sdk
-DEPENDS = "gmp-sdk"
-

diff --git a/meta/packages/ncurses/ncurses-sdk_5.4.bb b/meta/packages/ncurses/ncurses-nativesdk_5.4.bb
similarity index 80%
rename from meta/packages/ncurses/ncurses-sdk_5.4.bb
rename to meta/packages/ncurses/ncurses-nativesdk_5.4.bb
index fb69c1ec7d7412e2ca36c0760b6603a0b7d152dd..64658667430c9b76cec8a7c2fc01f9129472ec3e 100644 (file)
--- a/meta/packages/ncurses/ncurses-sdk_5.4.bb
+++ b/meta/packages/ncurses/ncurses-nativesdk_5.4.bb
@@ -1,3 +1,3 @@
 require ncurses_${PV}.bb
-inherit sdk
+inherit nativesdk
 EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'

diff --git a/meta/packages/opkg/opkg-sdk_svn.bb b/meta/packages/opkg/opkg-nativesdk_svn.bb
similarity index 68%
rename from meta/packages/opkg/opkg-sdk_svn.bb
rename to meta/packages/opkg/opkg-nativesdk_svn.bb
index 94344e13c4530ce114e58e0b4e01a52d7ade385f..05f5e6f47248ccbd1b3daf87fae0c52a3688a2c3 100644 (file)
--- a/meta/packages/opkg/opkg-sdk_svn.bb
+++ b/meta/packages/opkg/opkg-nativesdk_svn.bb
@@ -1,8 +1,8 @@
 require opkg.inc
 
-DEPENDS = "curl-sdk"
+DEPENDS = "curl-nativesdk"
 PR = "r3"
 
-inherit sdk
+inherit nativesdk
 
 EXTRA_OECONF += "--with-opkglibdir=${target_libdir} --disable-gpg"

diff --git a/meta/packages/pkgconfig/pkgconfig-sdk_0.23.bb b/meta/packages/pkgconfig/pkgconfig-nativesdk_0.23.bb
similarity index 66%
rename from meta/packages/pkgconfig/pkgconfig-sdk_0.23.bb
rename to meta/packages/pkgconfig/pkgconfig-nativesdk_0.23.bb
index 47fbcdaf245e5e4a25d58537e635be29f155cc72..7ceac3fda15e1de299157993382bcc306257a4f0 100644 (file)
--- a/meta/packages/pkgconfig/pkgconfig-sdk_0.23.bb
+++ b/meta/packages/pkgconfig/pkgconfig-nativesdk_0.23.bb
@@ -1,3 +1,3 @@
 require pkgconfig.inc
-inherit sdk
+inherit nativesdk
 DEPENDS = ""

diff --git a/meta/packages/qemu/qemu-helper-sdk_1.0.bb b/meta/packages/qemu/qemu-helper-nativesdk_1.0.bb
similarity index 95%
rename from meta/packages/qemu/qemu-helper-sdk_1.0.bb
rename to meta/packages/qemu/qemu-helper-nativesdk_1.0.bb
index 70c7d2347aa3cd749feedb7718d8dd44c84a31ed..fd658f51b8cf3d379b2598151aa0fd739abc2969 100644 (file)
--- a/meta/packages/qemu/qemu-helper-sdk_1.0.bb
+++ b/meta/packages/qemu/qemu-helper-nativesdk_1.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Qemu helper scripts from Poky"
 LICENSE = "GPL"
-RDEPENDS = "qemu-sdk"
+RDEPENDS = "qemu-nativesdk"
 PR = "r7"
 
 FILESPATH = "${FILE_DIRNAME}/qemu-helper"
@@ -11,10 +11,10 @@ SRC_URI = "file://${OEROOT}/scripts/poky-qemu \
            file://${OEROOT}/scripts/poky-qemu-ifup \
            file://${OEROOT}/scripts/poky-qemu-ifdown \
           file://raw2flash.c"
-                     
+
 S = "${WORKDIR}"
-                     
-inherit sdk
+
+inherit nativesdk
 
 do_compile() {
        ${CC} raw2flash.c -o raw2flash.spitz

diff --git a/meta/packages/qemu/qemu-nativesdk.inc b/meta/packages/qemu/qemu-nativesdk.inc
new file mode 100644 (file)
index 0000000..321bfa7
--- /dev/null
+++ b/meta/packages/qemu/qemu-nativesdk.inc
@@ -0,0 +1,3 @@
+inherit nativesdk
+DEPENDS = "zlib-nativesdk libsdl-nativesdk"
+RDEPENDS = "libsdl-nativesdk"

diff --git a/meta/packages/qemu/qemu-sdk_0.9.1.bb b/meta/packages/qemu/qemu-nativesdk_0.9.1.bb
similarity index 84%
rename from meta/packages/qemu/qemu-sdk_0.9.1.bb
rename to meta/packages/qemu/qemu-nativesdk_0.9.1.bb
index 7db8709b725b1e99f5c583e8236481b2609fc532..fc647e8df0ddc012dad3538defc7ec2c89c946fa 100644 (file)
--- a/meta/packages/qemu/qemu-sdk_0.9.1.bb
+++ b/meta/packages/qemu/qemu-nativesdk_0.9.1.bb
@@ -1,5 +1,5 @@
 require qemu_${PV}.bb
-require qemu-sdk.inc
+require qemu-nativesdk.inc
 
 EXTRA_OECONF +="--target-list=arm-linux-user,arm-softmmu,i386-softmmu"
 

diff --git a/meta/packages/qemu/qemu-sdk_git.bb b/meta/packages/qemu/qemu-nativesdk_git.bb
similarity index 81%
rename from meta/packages/qemu/qemu-sdk_git.bb
rename to meta/packages/qemu/qemu-nativesdk_git.bb
index 8a04d90dabaa4deec6891ea8e5a2e449724d0bfa..2f03dcc7b57a5d87908051b116cda78b26e2fa52 100644 (file)
--- a/meta/packages/qemu/qemu-sdk_git.bb
+++ b/meta/packages/qemu/qemu-nativesdk_git.bb
@@ -1,5 +1,5 @@
 require qemu_git.bb
-require qemu-sdk.inc
+require qemu-nativesdk.inc
 
 PR = "r2"
 

diff --git a/meta/packages/qemu/qemu-sdk.inc b/meta/packages/qemu/qemu-sdk.inc
deleted file mode 100644 (file)
index 5ecab10..0000000
--- a/meta/packages/qemu/qemu-sdk.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit sdk
-DEPENDS = "zlib-sdk libsdl-sdk"
-RDEPENDS = "libsdl-sdk"

diff --git a/meta/packages/tasks/task-sdk-host.bb b/meta/packages/tasks/task-sdk-host.bb
index fbccb4fb81dda4637c2745038e892c2a6435a9d1..77eb3404e69759d31268ecc4f8e1ef1b4920b054 100644 (file)
--- a/meta/packages/tasks/task-sdk-host.bb
+++ b/meta/packages/tasks/task-sdk-host.bb
@@ -7,24 +7,24 @@ PR = "r7"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
-inherit sdk
+inherit nativesdk
 
 PACKAGES = "${PN}"
 
 RDEPENDS_${PN} = "\
-    binutils-cross-sdk \
-    gcc-cross-sdk \
-    gdb-cross-sdk \
-    pkgconfig-sdk \
-    qemu-sdk \
-    qemu-helper-sdk \
-    opkg-sdk \
+    binutils-cross-nativesdk \
+    gcc-cross-nativesdk \
+    gdb-cross-nativesdk \
+    pkgconfig-nativesdk \
+    qemu-nativesdk \
+    qemu-helper-nativesdk \
+    opkg-nativesdk \
     "
 
 RDEPENDS_${PN}_darwin8 = "\
-    odcctools-cross-sdk \
-    llvm-cross-sdk \
-    pkgconfig-sdk \
-    opkg-sdk \
-    libtool-sdk \
+    odcctools-cross-nativesdk \
+    llvm-cross-nativesdk \
+    pkgconfig-nativesdk \
+    opkg-nativesdk \
+    libtool-nativesdk \
     "

diff --git a/meta/packages/xorg-lib/libx11-nativesdk_1.2.1.bb b/meta/packages/xorg-lib/libx11-nativesdk_1.2.1.bb
new file mode 100644 (file)
index 0000000..1313141
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-nativesdk_1.2.1.bb
@@ -0,0 +1,6 @@
+require libx11_${PV}.bb
+
+DEPENDS = "xproto-nativesdk xextproto-nativesdk libxau-nativesdk xtrans-nativesdk libxdmcp-nativesdk xcmiscproto-nativesdk xf86bigfontproto-nativesdk kbproto-nativesdk inputproto-nativesdk bigreqsproto-nativesdk util-macros-nativesdk xproto-native"
+PROVIDES = "virtual/libx11-nativesdk"
+
+inherit nativesdk

diff --git a/meta/packages/xorg-lib/libx11-nativesdk_git.bb b/meta/packages/xorg-lib/libx11-nativesdk_git.bb
new file mode 100644 (file)
index 0000000..40e52e9
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-nativesdk_git.bb
@@ -0,0 +1,9 @@
+require libx11.inc
+require libx11_git.inc
+
+DEPENDS = "xproto-nativesdk xextproto-nativesdk libxau-nativesdk xtrans-nativesdk libxdmcp-nativesdk xcmiscproto-nativesdk xf86bigfontproto-nativesdk kbproto-nativesdk inputproto-nativesdk bigreqsproto-nativesdk util-macros-nativesdk xproto-native"
+PROVIDES = "virtual/libx11-nativesdk"
+
+EXTRA_OECONF += "--without-xcb"
+
+inherit nativesdk

diff --git a/meta/packages/xorg-lib/libx11-sdk_1.2.1.bb b/meta/packages/xorg-lib/libx11-sdk_1.2.1.bb
deleted file mode 100644 (file)
index 920f7b7..0000000
--- a/meta/packages/xorg-lib/libx11-sdk_1.2.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libx11_${PV}.bb
-
-DEPENDS = "xproto-sdk xextproto-sdk libxau-sdk xtrans-sdk libxdmcp-sdk xcmiscproto-sdk xf86bigfontproto-sdk kbproto-sdk inputproto-sdk bigreqsproto-sdk util-macros-sdk xproto-native"
-PROVIDES = "virtual/libx11-sdk"
-
-inherit sdk

diff --git a/meta/packages/xorg-lib/libx11-sdk_git.bb b/meta/packages/xorg-lib/libx11-sdk_git.bb
deleted file mode 100644 (file)
index fae07b0..0000000
--- a/meta/packages/xorg-lib/libx11-sdk_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require libx11.inc
-require libx11_git.inc
-
-DEPENDS = "xproto-sdk xextproto-sdk libxau-sdk xtrans-sdk libxdmcp-sdk xcmiscproto-sdk xf86bigfontproto-sdk kbproto-sdk inputproto-sdk bigreqsproto-sdk util-macros-sdk xproto-native"
-PROVIDES = "virtual/libx11-sdk"
-
-EXTRA_OECONF += "--without-xcb"
-
-inherit sdk

diff --git a/meta/packages/xorg-lib/libxau_1.0.4.bb b/meta/packages/xorg-lib/libxau_1.0.4.bb
index b590a901223b74fe07a913e3a22e3fb1f610c0a9..f0932ab20b57b526fd2a07e2a3f9efb43ac0a9de 100644 (file)
--- a/meta/packages/xorg-lib/libxau_1.0.4.bb
+++ b/meta/packages/xorg-lib/libxau_1.0.4.bb
@@ -7,4 +7,4 @@ PE = "1"
 
 XORG_PN = "libXau"
 
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/packages/xorg-lib/libxdmcp_1.0.2.bb b/meta/packages/xorg-lib/libxdmcp_1.0.2.bb
index bf8fe55e654602c2a439a30817494ff07f50d9ef..ea503abbc764f42dbc3bf7afb1d37ed922e7a0a9 100644 (file)
--- a/meta/packages/xorg-lib/libxdmcp_1.0.2.bb
+++ b/meta/packages/xorg-lib/libxdmcp_1.0.2.bb
@@ -8,4 +8,4 @@ PE = "1"
 
 XORG_PN = "libXdmcp"
 
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/packages/xorg-lib/libxext_1.0.5.bb b/meta/packages/xorg-lib/libxext_1.0.5.bb
index d98a0e65d2c00b51421f958fa45f8df038b79cb9..e1f13a1d1adde623ab38448981e4ac5059af35a0 100644 (file)
--- a/meta/packages/xorg-lib/libxext_1.0.5.bb
+++ b/meta/packages/xorg-lib/libxext_1.0.5.bb
@@ -7,4 +7,4 @@ PE = "1"
 
 XORG_PN = "libXext"
 
-BBCLASSEXTEND = "sdk"
+BBCLASSEXTEND = "nativesdk"

diff --git a/meta/packages/xorg-lib/libxext_git.bb b/meta/packages/xorg-lib/libxext_git.bb
index 6ef1e5b943a0584b43f14dd535432569bdc2bd46..d0b3d7fbf5a76fe4a96faa16092ea13dedbf1a55 100644 (file)
--- a/meta/packages/xorg-lib/libxext_git.bb
+++ b/meta/packages/xorg-lib/libxext_git.bb
@@ -11,4 +11,4 @@ XORG_PN = "libXext"
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/${XORG_PN};protocol=git"
 S = "${WORKDIR}/git/"
 
-BBCLASSEXTEND = "sdk"
+BBCLASSEXTEND = "nativesdk"

diff --git a/meta/packages/xorg-lib/libxrandr_1.2.99.4.bb b/meta/packages/xorg-lib/libxrandr_1.2.99.4.bb
index 620fd7e2f2580b78c27c1e02ff8942d7a5c97587..173b6bd17409511ea92e78e5bcd32e8cf0bd9a3d 100644 (file)
--- a/meta/packages/xorg-lib/libxrandr_1.2.99.4.bb
+++ b/meta/packages/xorg-lib/libxrandr_1.2.99.4.bb
@@ -8,4 +8,4 @@ PE = "1"
 
 XORG_PN = "libXrandr"
 
-BBCLASSEXTEND = "sdk"
+BBCLASSEXTEND = "nativesdk"

diff --git a/meta/packages/xorg-lib/libxrender_0.9.4.bb b/meta/packages/xorg-lib/libxrender_0.9.4.bb
index 5913ab72573a9de377bec2ddd6d9fec7fc796f01..35065921a792389bed7e7cc5950b3d6330c4617f 100644 (file)
--- a/meta/packages/xorg-lib/libxrender_0.9.4.bb
+++ b/meta/packages/xorg-lib/libxrender_0.9.4.bb
@@ -8,4 +8,4 @@ PE = "1"
 
 XORG_PN = "libXrender"
 
-BBCLASSEXTEND = "sdk"
+BBCLASSEXTEND = "nativesdk"

diff --git a/meta/packages/xorg-lib/xtrans_1.2.2.bb b/meta/packages/xorg-lib/xtrans_1.2.2.bb
index d3703229b128bc1b346ef99e93693dae243363a8..120f013e212840aea41221c0ac5cda0cda12c745 100644 (file)
--- a/meta/packages/xorg-lib/xtrans_1.2.2.bb
+++ b/meta/packages/xorg-lib/xtrans_1.2.2.bb
@@ -7,4 +7,4 @@ PR = "r0"
 
 RDEPENDS_${PN}-dev = ""
 
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb b/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
index e799a991e78c7f438d59d6048d13ad181117f4cb..4a9bc806b5c75c4cb43b5eb62064ad6b0130018c 100644 (file)
--- a/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
+++ b/meta/packages/xorg-proto/bigreqsproto_1.0.2.bb
@@ -3,4 +3,4 @@ require xorg-proto-common.inc
 PR = "r1"
 PE = "1"
 
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/packages/xorg-proto/inputproto_1.9.99.12.bb b/meta/packages/xorg-proto/inputproto_1.9.99.12.bb
index 00af730bd5cd819a2d9f2ef4c1d1dbd71c123209..b5a05bc0f4774a8ec8b4c5b3f0752ef762e6ee40 100644 (file)
--- a/meta/packages/xorg-proto/inputproto_1.9.99.12.bb
+++ b/meta/packages/xorg-proto/inputproto_1.9.99.12.bb
@@ -5,4 +5,4 @@ PE = "1"
 
 DEPENDS += "util-macros"
 
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/packages/xorg-proto/inputproto_git.bb b/meta/packages/xorg-proto/inputproto_git.bb
index 40c94cd4ecf5109b21bb360ab8cb8ef37efb571d..14350f1e1df573ed29af6eae204e8bf9a976b9a8 100644 (file)
--- a/meta/packages/xorg-proto/inputproto_git.bb
+++ b/meta/packages/xorg-proto/inputproto_git.bb
@@ -9,4 +9,4 @@ S = "${WORKDIR}/git"
 
 DEPENDS += "util-macros"
 
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/packages/xorg-proto/kbproto_1.0.3.bb b/meta/packages/xorg-proto/kbproto_1.0.3.bb
index e799a991e78c7f438d59d6048d13ad181117f4cb..4a9bc806b5c75c4cb43b5eb62064ad6b0130018c 100644 (file)
--- a/meta/packages/xorg-proto/kbproto_1.0.3.bb
+++ b/meta/packages/xorg-proto/kbproto_1.0.3.bb
@@ -3,4 +3,4 @@ require xorg-proto-common.inc
 PR = "r1"
 PE = "1"
 
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/packages/xorg-proto/randrproto_1.2.99.3.bb b/meta/packages/xorg-proto/randrproto_1.2.99.3.bb
index 74a0e2d5f6c9d16578c801936115ef6a922508dd..42d33fb674642a2b0cce49122168ca35345b8e92 100644 (file)
--- a/meta/packages/xorg-proto/randrproto_1.2.99.3.bb
+++ b/meta/packages/xorg-proto/randrproto_1.2.99.3.bb
@@ -4,4 +4,4 @@ CONFLICTS = "randrext"
 PR = "r1"
 PE = "1"
 
-BBCLASSEXTEND = "sdk"
+BBCLASSEXTEND = "nativesdk"

diff --git a/meta/packages/xorg-proto/renderproto_0.9.3.bb b/meta/packages/xorg-proto/renderproto_0.9.3.bb
index 77d620a587870b36e6558e29a9b692f6c6a703aa..0168b9227cacf8df0ea4a4ba84407e5d87003dae 100644 (file)
--- a/meta/packages/xorg-proto/renderproto_0.9.3.bb
+++ b/meta/packages/xorg-proto/renderproto_0.9.3.bb
@@ -4,4 +4,4 @@ CONFLICTS = "renderext"
 PR = "r1"
 PE = "1"
 
-BBCLASSEXTEND = "sdk"
+BBCLASSEXTEND = "nativesdk"

diff --git a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
index e799a991e78c7f438d59d6048d13ad181117f4cb..4a9bc806b5c75c4cb43b5eb62064ad6b0130018c 100644 (file)
--- a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
+++ b/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
@@ -3,4 +3,4 @@ require xorg-proto-common.inc
 PR = "r1"
 PE = "1"
 
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/packages/xorg-proto/xextproto_7.0.5.bb b/meta/packages/xorg-proto/xextproto_7.0.5.bb
index dcec209badd3b7beef6c055f820b9ba78183bf80..991e523b28397e866404f4bcd846249dd6b6498e 100644 (file)
--- a/meta/packages/xorg-proto/xextproto_7.0.5.bb
+++ b/meta/packages/xorg-proto/xextproto_7.0.5.bb
@@ -3,4 +3,4 @@ require xorg-proto-common.inc
 PR = "r2"
 PE = "1"
 
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
index e799a991e78c7f438d59d6048d13ad181117f4cb..4a9bc806b5c75c4cb43b5eb62064ad6b0130018c 100644 (file)
--- a/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
+++ b/meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb
@@ -3,4 +3,4 @@ require xorg-proto-common.inc
 PR = "r1"
 PE = "1"
 
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/packages/xorg-proto/xproto_7.0.14.bb b/meta/packages/xorg-proto/xproto_7.0.14.bb
index e799a991e78c7f438d59d6048d13ad181117f4cb..4a9bc806b5c75c4cb43b5eb62064ad6b0130018c 100644 (file)
--- a/meta/packages/xorg-proto/xproto_7.0.14.bb
+++ b/meta/packages/xorg-proto/xproto_7.0.14.bb
@@ -3,4 +3,4 @@ require xorg-proto-common.inc
 PR = "r1"
 PE = "1"
 
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/packages/xorg-util/util-macros_1.2.1.bb b/meta/packages/xorg-util/util-macros_1.2.1.bb
index 9616bd1d1020d2333edeadf33a70fcef4e96f1d4..048a34c903683dd477de447d9397f2517282583a 100644 (file)
--- a/meta/packages/xorg-util/util-macros_1.2.1.bb
+++ b/meta/packages/xorg-util/util-macros_1.2.1.bb
@@ -11,4 +11,4 @@ SRC_URI += "file://unbreak_cross_compile.patch;patch=1 \
 RDEPENDS_${PN}-dev = ""
 RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"
 
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/packages/zlib/zlib_1.2.3.bb b/meta/packages/zlib/zlib_1.2.3.bb
index ca54b6abfbbe12fcb94eac96ca3897247f1581ea..c1d6ce6ea55504d88a73367c2c04e3c05455dcac 100644 (file)
--- a/meta/packages/zlib/zlib_1.2.3.bb
+++ b/meta/packages/zlib/zlib_1.2.3.bb
@@ -14,4 +14,4 @@ DEPENDS = "libtool-cross"
 
 inherit autotools_stage
 
-BBCLASSEXTEND = "native sdk"
+BBCLASSEXTEND = "native nativesdk"