summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-09-17 00:05:34 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-09-17 22:25:22 +0100
commit0d7207ca39d1671682f9467a804766b151048573 (patch)
tree88a9b9b8588d8df986f4d6f0f4a232ec41841261 /meta
parentaf85ce4b4e675feb5796f87137c86d70c2f15b9a (diff)
downloadpoky-0d7207ca39d1671682f9467a804766b151048573.tar.gz
sdk.bbclass: Rename to nativesdk.bbclass
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/insane.bbclass2
-rw-r--r--meta/classes/nativesdk.bbclass (renamed from meta/classes/sdk.bbclass)14
-rw-r--r--meta/classes/package_ipk.bbclass8
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/packages/binutils/binutils-cross-nativesdk.inc (renamed from meta/packages/binutils/binutils-cross-sdk.inc)2
-rw-r--r--meta/packages/binutils/binutils-cross-nativesdk_2.18.bb3
-rw-r--r--meta/packages/binutils/binutils-cross-nativesdk_2.19.bb3
-rw-r--r--meta/packages/binutils/binutils-cross-sdk_2.18.bb3
-rw-r--r--meta/packages/binutils/binutils-cross-sdk_2.19.bb3
-rw-r--r--meta/packages/curl/curl-nativesdk_7.18.0.bb4
-rw-r--r--meta/packages/curl/curl-sdk_7.18.0.bb4
-rw-r--r--meta/packages/expat/expat_2.0.0.bb2
-rw-r--r--meta/packages/gcc/gcc-cross-nativesdk_3.4.4.bb (renamed from meta/packages/gcc/gcc-cross-sdk_3.4.4.bb)0
-rw-r--r--meta/packages/gcc/gcc-cross-nativesdk_4.1.2.bb (renamed from meta/packages/gcc/gcc-cross-sdk_4.1.2.bb)0
-rw-r--r--meta/packages/gcc/gcc-cross-nativesdk_4.2.3.bb (renamed from meta/packages/gcc/gcc-cross-sdk_4.2.3.bb)2
-rw-r--r--meta/packages/gcc/gcc-cross-nativesdk_4.3.1.bb (renamed from meta/packages/gcc/gcc-cross-sdk_4.3.1.bb)2
-rw-r--r--meta/packages/gcc/gcc-cross-nativesdk_4.3.3.bb (renamed from meta/packages/gcc/gcc-cross-sdk_4.3.3.bb)2
-rw-r--r--meta/packages/gcc/gcc-cross-nativesdk_csl-arm-2005q3.bb (renamed from meta/packages/gcc/gcc-cross-sdk_csl-arm-2005q3.bb)2
-rw-r--r--meta/packages/gcc/gcc-cross-sdk.inc2
-rw-r--r--meta/packages/gdb/gcc-cross-nativesdk_6.8.bb9
-rw-r--r--meta/packages/gdb/gdb-cross-sdk_6.8.bb9
-rw-r--r--meta/packages/gmp/gmp-nativesdk.inc (renamed from meta/packages/gmp/gmp-sdk.inc)3
-rw-r--r--meta/packages/gmp/gmp-nativesdk_4.2.4.bb2
-rw-r--r--meta/packages/gmp/gmp-sdk_4.2.4.bb2
-rw-r--r--meta/packages/libsdl/libsdl-nativesdk_1.2.11.bb (renamed from meta/packages/libsdl/libsdl-sdk_1.2.11.bb)6
-rw-r--r--meta/packages/libtool/libtool-nativesdk_2.2.6.bb (renamed from meta/packages/libtool/libtool-sdk_2.2.6.bb)2
-rw-r--r--meta/packages/meta/external-poky-toolchain.bb2
-rw-r--r--meta/packages/mpfr/mpfr-nativesdk_2.3.1.bb4
-rw-r--r--meta/packages/mpfr/mpfr-sdk_2.3.1.bb4
-rw-r--r--meta/packages/ncurses/ncurses-nativesdk_5.4.bb (renamed from meta/packages/ncurses/ncurses-sdk_5.4.bb)2
-rw-r--r--meta/packages/opkg/opkg-nativesdk_svn.bb (renamed from meta/packages/opkg/opkg-sdk_svn.bb)4
-rw-r--r--meta/packages/pkgconfig/pkgconfig-nativesdk_0.23.bb (renamed from meta/packages/pkgconfig/pkgconfig-sdk_0.23.bb)2
-rw-r--r--meta/packages/qemu/qemu-helper-nativesdk_1.0.bb (renamed from meta/packages/qemu/qemu-helper-sdk_1.0.bb)8
-rw-r--r--meta/packages/qemu/qemu-nativesdk.inc3
-rw-r--r--meta/packages/qemu/qemu-nativesdk_0.9.1.bb (renamed from meta/packages/qemu/qemu-sdk_0.9.1.bb)2
-rw-r--r--meta/packages/qemu/qemu-nativesdk_git.bb (renamed from meta/packages/qemu/qemu-sdk_git.bb)2
-rw-r--r--meta/packages/qemu/qemu-sdk.inc3
-rw-r--r--meta/packages/tasks/task-sdk-host.bb26
-rw-r--r--meta/packages/xorg-lib/libx11-nativesdk_1.2.1.bb6
-rw-r--r--meta/packages/xorg-lib/libx11-nativesdk_git.bb9
-rw-r--r--meta/packages/xorg-lib/libx11-sdk_1.2.1.bb6
-rw-r--r--meta/packages/xorg-lib/libx11-sdk_git.bb9
-rw-r--r--meta/packages/xorg-lib/libxau_1.0.4.bb2
-rw-r--r--meta/packages/xorg-lib/libxdmcp_1.0.2.bb2
-rw-r--r--meta/packages/xorg-lib/libxext_1.0.5.bb2
-rw-r--r--meta/packages/xorg-lib/libxext_git.bb2
-rw-r--r--meta/packages/xorg-lib/libxrandr_1.2.99.4.bb2
-rw-r--r--meta/packages/xorg-lib/libxrender_0.9.4.bb2
-rw-r--r--meta/packages/xorg-lib/xtrans_1.2.2.bb2
-rw-r--r--meta/packages/xorg-proto/bigreqsproto_1.0.2.bb2
-rw-r--r--meta/packages/xorg-proto/inputproto_1.9.99.12.bb2
-rw-r--r--meta/packages/xorg-proto/inputproto_git.bb2
-rw-r--r--meta/packages/xorg-proto/kbproto_1.0.3.bb2
-rw-r--r--meta/packages/xorg-proto/randrproto_1.2.99.3.bb2
-rw-r--r--meta/packages/xorg-proto/renderproto_0.9.3.bb2
-rw-r--r--meta/packages/xorg-proto/xcmiscproto_1.1.2.bb2
-rw-r--r--meta/packages/xorg-proto/xextproto_7.0.5.bb2
-rw-r--r--meta/packages/xorg-proto/xf86bigfontproto_1.1.2.bb2
-rw-r--r--meta/packages/xorg-proto/xproto_7.0.14.bb2
-rw-r--r--meta/packages/xorg-util/util-macros_1.2.1.bb2
-rw-r--r--meta/packages/zlib/zlib_1.2.3.bb2
61 files changed, 111 insertions, 112 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 2b0c284775..56d6a0b887 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -289,7 +289,7 @@ def package_qa_check_arch(path,name,d):
289 target_arch = bb.data.getVar('TARGET_ARCH', d, True) 289 target_arch = bb.data.getVar('TARGET_ARCH', d, True)
290 290
291 # FIXME: Cross package confuse this check, so just skip them 291 # FIXME: Cross package confuse this check, so just skip them
292 if bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d): 292 if bb.data.inherits_class('cross', d) or bb.data.inherits_class('nativesdk', d):
293 return True 293 return True
294 294
295 # avoid following links to /usr/bin (e.g. on udev builds) 295 # avoid following links to /usr/bin (e.g. on udev builds)
diff --git a/meta/classes/sdk.bbclass b/meta/classes/nativesdk.bbclass
index 97fa8552cf..d1b429488b 100644
--- a/meta/classes/sdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -6,7 +6,7 @@ EXCLUDE_FROM_WORLD = "1"
6OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}" 6OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}"
7# Save PACKAGE_ARCH 7# Save PACKAGE_ARCH
8OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} 8OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
9PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk" 9PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-nativesdk"
10# Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it 10# Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it
11OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}" 11OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}"
12BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}" 12BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}"
@@ -82,21 +82,21 @@ python __anonymous () {
82 for dep in deps: 82 for dep in deps:
83 if dep.endswith("-native") or dep.endswith("-cross"): 83 if dep.endswith("-native") or dep.endswith("-cross"):
84 continue 84 continue
85 if not dep.endswith("-sdk"): 85 if not dep.endswith("-nativesdk"):
86 if autoextend: 86 if autoextend:
87 depends = depends.replace(dep, dep + "-sdk") 87 depends = depends.replace(dep, dep + "-nativesdk")
88 elif pn == 'gcc-cross-sdk': 88 elif pn == 'gcc-cross-nativesdk':
89 continue 89 continue
90 else: 90 else:
91 bb.note("%s has depends %s which doesn't end in -sdk?" % (pn, dep)) 91 bb.note("%s has depends %s which doesn't end in -nativesdk?" % (pn, dep))
92 bb.data.setVar("DEPENDS", depends, d) 92 bb.data.setVar("DEPENDS", depends, d)
93 provides = bb.data.getVar("PROVIDES", d, True) 93 provides = bb.data.getVar("PROVIDES", d, True)
94 for prov in provides.split(): 94 for prov in provides.split():
95 if prov.find(pn) != -1: 95 if prov.find(pn) != -1:
96 continue 96 continue
97 if not prov.endswith("-sdk"): 97 if not prov.endswith("-nativesdk"):
98 if autoextend: 98 if autoextend:
99 provides = provides.replace(prov, prov + "-sdk") 99 provides = provides.replace(prov, prov + "-nativesdk")
100 #else: 100 #else:
101 # bb.note("%s has rouge PROVIDES of %s which doesn't end in -sdk?" % (pn, prov)) 101 # bb.note("%s has rouge PROVIDES of %s which doesn't end in -sdk?" % (pn, prov))
102 bb.data.setVar("PROVIDES", provides, d) 102 bb.data.setVar("PROVIDES", provides, d)
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 7b13dab1be..d327bfc6b3 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -75,7 +75,7 @@ package_update_index_ipk () {
75 75
76 packagedirs="${DEPLOY_DIR_IPK}" 76 packagedirs="${DEPLOY_DIR_IPK}"
77 for arch in $ipkgarchs; do 77 for arch in $ipkgarchs; do
78 packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk" 78 packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-nativesdk"
79 done 79 done
80 80
81 for pkgdir in $packagedirs; do 81 for pkgdir in $packagedirs; do
@@ -100,8 +100,8 @@ package_generate_ipkg_conf () {
100 if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then 100 if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
101 echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET} 101 echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET}
102 fi 102 fi
103 if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages ] ; then 103 if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-nativesdk/Packages ] ; then
104 echo "src oe-${BUILD_ARCH}-$arch-sdk file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk" >> ${IPKGCONF_SDK} 104 echo "src oe-${BUILD_ARCH}-$arch-nativesdk file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-nativesdk" >> ${IPKGCONF_SDK}
105 fi 105 fi
106 done 106 done
107} 107}
@@ -111,7 +111,7 @@ package_generate_archlist () {
111 priority=1 111 priority=1
112 for arch in $ipkgarchs; do 112 for arch in $ipkgarchs; do
113 echo "arch $arch $priority" >> ${IPKGCONF_TARGET} 113 echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
114 echo "arch ${BUILD_ARCH}-$arch-sdk $priority" >> ${IPKGCONF_SDK} 114 echo "arch ${BUILD_ARCH}-$arch-nativesdk $priority" >> ${IPKGCONF_SDK}
115 priority=$(expr $priority + 5) 115 priority=$(expr $priority + 5)
116 done 116 done
117} 117}
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f5031f0b01..67de34ef8e 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -146,7 +146,7 @@ P = "${PN}-${PV}"
146# Base package name 146# Base package name
147# Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" 147# Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial"
148# otherwise it is the same as PN and P 148# otherwise it is the same as PN and P
149SPECIAL_PKGSUFFIX = "-native -cross-sdk -cross -sdk -initial -intermediate" 149SPECIAL_PKGSUFFIX = "-native -cross-sdk -cross -nativesdk -initial -intermediate"
150BPN = "${@base_prune_suffix(bb.data.getVar('PN', d, True), bb.data.getVar('SPECIAL_PKGSUFFIX', d, True).split(), d)}" 150BPN = "${@base_prune_suffix(bb.data.getVar('PN', d, True), bb.data.getVar('SPECIAL_PKGSUFFIX', d, True).split(), d)}"
151BP = "${BPN}-${PV}" 151BP = "${BPN}-${PV}"
152 152
diff --git a/meta/packages/binutils/binutils-cross-sdk.inc b/meta/packages/binutils/binutils-cross-nativesdk.inc
index 10e3080306..986ead43bb 100644
--- a/meta/packages/binutils/binutils-cross-sdk.inc
+++ b/meta/packages/binutils/binutils-cross-nativesdk.inc
@@ -1,4 +1,4 @@
1inherit sdk 1inherit nativesdk
2DEPENDS += "flex-native bison-native" 2DEPENDS += "flex-native bison-native"
3EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \ 3EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \
4 --program-prefix=${TARGET_PREFIX}" 4 --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
index 0000000000..7eb313f1f1
--- /dev/null
+++ b/meta/packages/binutils/binutils-cross-nativesdk_2.18.bb
@@ -0,0 +1,3 @@
1require binutils_${PV}.bb
2require binutils-cross-nativesdk.inc
3PR = "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
index 0000000000..3bb6e5e534
--- /dev/null
+++ b/meta/packages/binutils/binutils-cross-nativesdk_2.19.bb
@@ -0,0 +1,3 @@
1require binutils_${PV}.bb
2require binutils-cross-nativesdk.inc
3PR = "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
index 4695c61cd5..0000000000
--- a/meta/packages/binutils/binutils-cross-sdk_2.18.bb
+++ /dev/null
@@ -1,3 +0,0 @@
1require binutils_${PV}.bb
2require binutils-cross-sdk.inc
3PR = "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
index 76dff5449f..0000000000
--- a/meta/packages/binutils/binutils-cross-sdk_2.19.bb
+++ /dev/null
@@ -1,3 +0,0 @@
1require binutils_${PV}.bb
2require binutils-cross-sdk.inc
3PR = "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
index 0000000000..eeb653f639
--- /dev/null
+++ b/meta/packages/curl/curl-nativesdk_7.18.0.bb
@@ -0,0 +1,4 @@
1require curl_${PV}.bb
2inherit nativesdk
3DEPENDS = "zlib-nativesdk"
4
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
index f15e2db39a..0000000000
--- a/meta/packages/curl/curl-sdk_7.18.0.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require curl_${PV}.bb
2inherit sdk
3DEPENDS = "zlib-sdk"
4
diff --git a/meta/packages/expat/expat_2.0.0.bb b/meta/packages/expat/expat_2.0.0.bb
index f24619a176..8921db03a4 100644
--- 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 () {
10 touch ${S}/conftools/libtool.m4 10 touch ${S}/conftools/libtool.m4
11} 11}
12 12
13BBCLASSEXTEND = "native sdk" 13BBCLASSEXTEND = "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
index c76b5b3c07..c76b5b3c07 100644
--- a/meta/packages/gcc/gcc-cross-sdk_3.4.4.bb
+++ b/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
index 83f0ec865b..83f0ec865b 100644
--- a/meta/packages/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/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
index 8cca9f8f06..e2c641b49c 100644
--- 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 @@
1PR = "r3" 1PR = "r3"
2 2
3inherit sdk 3inherit nativesdk
4 4
5require gcc-${PV}.inc 5require gcc-${PV}.inc
6require gcc-cross-sdk.inc 6require 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
index 94a95de407..f1d0cbe3d1 100644
--- 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 @@
1PR = "r6" 1PR = "r6"
2 2
3inherit sdk 3inherit nativesdk
4 4
5require gcc-${PV}.inc 5require gcc-${PV}.inc
6require gcc-cross-sdk.inc 6require 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
index 65df556e8c..993676f8da 100644
--- 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 @@
1PR = "r6" 1PR = "r6"
2 2
3inherit sdk 3inherit nativesdk
4 4
5require gcc-${PV}.inc 5require gcc-${PV}.inc
6require gcc-cross-sdk.inc 6require 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
index 258931ee4b..51b2fccb50 100644
--- 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 @@
1PR = "r3" 1PR = "r3"
2 2
3inherit sdk 3inherit nativesdk
4 4
5require gcc-${PV}.inc 5require gcc-${PV}.inc
6require gcc-cross-sdk.inc 6require gcc-cross-sdk.inc
diff --git a/meta/packages/gcc/gcc-cross-sdk.inc b/meta/packages/gcc/gcc-cross-sdk.inc
index fb24342939..390bb024ac 100644
--- a/meta/packages/gcc/gcc-cross-sdk.inc
+++ b/meta/packages/gcc/gcc-cross-sdk.inc
@@ -1,4 +1,4 @@
1inherit sdk 1inherit nativesdk
2 2
3DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" 3DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
4 4
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
index 0000000000..d9d2f793fc
--- /dev/null
+++ b/meta/packages/gdb/gcc-cross-nativesdk_6.8.bb
@@ -0,0 +1,9 @@
1require gdb-cross.inc
2
3DEPENDS = "ncurses-nativesdk expat-nativesdk"
4
5inherit nativesdk
6
7do_stage() {
8 :
9}
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
index 22a11ec104..0000000000
--- a/meta/packages/gdb/gdb-cross-sdk_6.8.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require gdb-cross.inc
2
3DEPENDS = "ncurses-sdk expat-sdk"
4
5inherit sdk
6
7do_stage() {
8 :
9}
diff --git a/meta/packages/gmp/gmp-sdk.inc b/meta/packages/gmp/gmp-nativesdk.inc
index 5d4fe1d509..973c601423 100644
--- a/meta/packages/gmp/gmp-sdk.inc
+++ b/meta/packages/gmp/gmp-nativesdk.inc
@@ -1,6 +1,5 @@
1require gmp_${PV}.bb 1require gmp_${PV}.bb
2inherit sdk 2inherit nativesdk
3
4 3
5oe_runconf () { 4oe_runconf () {
6 if [ -x ${S}/configure ] ; then 5 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
index 0000000000..308f5fbfc3
--- /dev/null
+++ b/meta/packages/gmp/gmp-nativesdk_4.2.4.bb
@@ -0,0 +1,2 @@
1PV = "4.2.4"
2require 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
index d1d182982a..0000000000
--- a/meta/packages/gmp/gmp-sdk_4.2.4.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1PV = "4.2.4"
2require 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
index 6cea742f17..a364ca386a 100644
--- 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"
2HOMEPAGE = "http://www.libsdl.org" 2HOMEPAGE = "http://www.libsdl.org"
3SECTION = "libs" 3SECTION = "libs"
4LICENSE = "LGPL" 4LICENSE = "LGPL"
5DEPENDS = "libx11-sdk libxext-sdk libxrandr-sdk libxrender-sdk" 5DEPENDS = "libx11-nativesdk libxext-nativesdk libxrandr-nativesdk libxrender-nativesdk"
6RDEPENDS = "libx11-sdk libxrandr-sdk libxrender-sdk libxext-sdk" 6RDEPENDS = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
7PR = "r4" 7PR = "r4"
8 8
9SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ 9SRC_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 \
12 file://kernel-asm-page.patch;patch=1 " 12 file://kernel-asm-page.patch;patch=1 "
13S = "${WORKDIR}/SDL-${PV}" 13S = "${WORKDIR}/SDL-${PV}"
14 14
15inherit autotools_stage binconfig pkgconfig sdk 15inherit autotools_stage binconfig pkgconfig nativesdk
16 16
17EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \ 17EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
18 --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \ 18 --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
index 577907887d..063fe9d761 100644
--- 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
4PR = "r0" 4PR = "r0"
5SRC_URI_append = " file://cross_compile.patch;patch=1" 5SRC_URI_append = " file://cross_compile.patch;patch=1"
6 6
7inherit sdk 7inherit nativesdk
8 8
9do_install () { 9do_install () {
10 install -d ${D}${bindir}/ 10 install -d ${D}${bindir}/
diff --git a/meta/packages/meta/external-poky-toolchain.bb b/meta/packages/meta/external-poky-toolchain.bb
index 2b8666099d..8bcc266d28 100644
--- a/meta/packages/meta/external-poky-toolchain.bb
+++ b/meta/packages/meta/external-poky-toolchain.bb
@@ -14,7 +14,7 @@ PACKAGES_DYNAMIC = "glibc-gconv-*"
14INHIBIT_DEFAULT_DEPS = "1" 14INHIBIT_DEFAULT_DEPS = "1"
15PR = "r1" 15PR = "r1"
16 16
17inherit sdk 17inherit nativesdk
18 18
19do_stage() { 19do_stage() {
20 if [ ! -e ${prefix}/environment-setup ]; then 20 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
index 0000000000..009d4cfad0
--- /dev/null
+++ b/meta/packages/mpfr/mpfr-nativesdk_2.3.1.bb
@@ -0,0 +1,4 @@
1require mpfr_${PV}.bb
2inherit nativesdk
3DEPENDS = "gmp-nativesdk"
4
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
index 32d3e3eeb0..0000000000
--- a/meta/packages/mpfr/mpfr-sdk_2.3.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require mpfr_${PV}.bb
2inherit sdk
3DEPENDS = "gmp-sdk"
4
diff --git a/meta/packages/ncurses/ncurses-sdk_5.4.bb b/meta/packages/ncurses/ncurses-nativesdk_5.4.bb
index fb69c1ec7d..6465866743 100644
--- a/meta/packages/ncurses/ncurses-sdk_5.4.bb
+++ b/meta/packages/ncurses/ncurses-nativesdk_5.4.bb
@@ -1,3 +1,3 @@
1require ncurses_${PV}.bb 1require ncurses_${PV}.bb
2inherit sdk 2inherit nativesdk
3EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"' 3EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
diff --git a/meta/packages/opkg/opkg-sdk_svn.bb b/meta/packages/opkg/opkg-nativesdk_svn.bb
index 94344e13c4..05f5e6f472 100644
--- a/meta/packages/opkg/opkg-sdk_svn.bb
+++ b/meta/packages/opkg/opkg-nativesdk_svn.bb
@@ -1,8 +1,8 @@
1require opkg.inc 1require opkg.inc
2 2
3DEPENDS = "curl-sdk" 3DEPENDS = "curl-nativesdk"
4PR = "r3" 4PR = "r3"
5 5
6inherit sdk 6inherit nativesdk
7 7
8EXTRA_OECONF += "--with-opkglibdir=${target_libdir} --disable-gpg" 8EXTRA_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
index 47fbcdaf24..7ceac3fda1 100644
--- a/meta/packages/pkgconfig/pkgconfig-sdk_0.23.bb
+++ b/meta/packages/pkgconfig/pkgconfig-nativesdk_0.23.bb
@@ -1,3 +1,3 @@
1require pkgconfig.inc 1require pkgconfig.inc
2inherit sdk 2inherit nativesdk
3DEPENDS = "" 3DEPENDS = ""
diff --git a/meta/packages/qemu/qemu-helper-sdk_1.0.bb b/meta/packages/qemu/qemu-helper-nativesdk_1.0.bb
index 70c7d2347a..fd658f51b8 100644
--- a/meta/packages/qemu/qemu-helper-sdk_1.0.bb
+++ b/meta/packages/qemu/qemu-helper-nativesdk_1.0.bb
@@ -1,6 +1,6 @@
1DESCRIPTION = "Qemu helper scripts from Poky" 1DESCRIPTION = "Qemu helper scripts from Poky"
2LICENSE = "GPL" 2LICENSE = "GPL"
3RDEPENDS = "qemu-sdk" 3RDEPENDS = "qemu-nativesdk"
4PR = "r7" 4PR = "r7"
5 5
6FILESPATH = "${FILE_DIRNAME}/qemu-helper" 6FILESPATH = "${FILE_DIRNAME}/qemu-helper"
@@ -11,10 +11,10 @@ SRC_URI = "file://${OEROOT}/scripts/poky-qemu \
11 file://${OEROOT}/scripts/poky-qemu-ifup \ 11 file://${OEROOT}/scripts/poky-qemu-ifup \
12 file://${OEROOT}/scripts/poky-qemu-ifdown \ 12 file://${OEROOT}/scripts/poky-qemu-ifdown \
13 file://raw2flash.c" 13 file://raw2flash.c"
14 14
15S = "${WORKDIR}" 15S = "${WORKDIR}"
16 16
17inherit sdk 17inherit nativesdk
18 18
19do_compile() { 19do_compile() {
20 ${CC} raw2flash.c -o raw2flash.spitz 20 ${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
index 0000000000..321bfa7ae2
--- /dev/null
+++ b/meta/packages/qemu/qemu-nativesdk.inc
@@ -0,0 +1,3 @@
1inherit nativesdk
2DEPENDS = "zlib-nativesdk libsdl-nativesdk"
3RDEPENDS = "libsdl-nativesdk"
diff --git a/meta/packages/qemu/qemu-sdk_0.9.1.bb b/meta/packages/qemu/qemu-nativesdk_0.9.1.bb
index 7db8709b72..fc647e8df0 100644
--- a/meta/packages/qemu/qemu-sdk_0.9.1.bb
+++ b/meta/packages/qemu/qemu-nativesdk_0.9.1.bb
@@ -1,5 +1,5 @@
1require qemu_${PV}.bb 1require qemu_${PV}.bb
2require qemu-sdk.inc 2require qemu-nativesdk.inc
3 3
4EXTRA_OECONF +="--target-list=arm-linux-user,arm-softmmu,i386-softmmu" 4EXTRA_OECONF +="--target-list=arm-linux-user,arm-softmmu,i386-softmmu"
5 5
diff --git a/meta/packages/qemu/qemu-sdk_git.bb b/meta/packages/qemu/qemu-nativesdk_git.bb
index 8a04d90dab..2f03dcc7b5 100644
--- a/meta/packages/qemu/qemu-sdk_git.bb
+++ b/meta/packages/qemu/qemu-nativesdk_git.bb
@@ -1,5 +1,5 @@
1require qemu_git.bb 1require qemu_git.bb
2require qemu-sdk.inc 2require qemu-nativesdk.inc
3 3
4PR = "r2" 4PR = "r2"
5 5
diff --git a/meta/packages/qemu/qemu-sdk.inc b/meta/packages/qemu/qemu-sdk.inc
deleted file mode 100644
index 5ecab10faf..0000000000
--- a/meta/packages/qemu/qemu-sdk.inc
+++ /dev/null
@@ -1,3 +0,0 @@
1inherit sdk
2DEPENDS = "zlib-sdk libsdl-sdk"
3RDEPENDS = "libsdl-sdk"
diff --git a/meta/packages/tasks/task-sdk-host.bb b/meta/packages/tasks/task-sdk-host.bb
index fbccb4fb81..77eb3404e6 100644
--- a/meta/packages/tasks/task-sdk-host.bb
+++ b/meta/packages/tasks/task-sdk-host.bb
@@ -7,24 +7,24 @@ PR = "r7"
7LICENSE = "MIT" 7LICENSE = "MIT"
8ALLOW_EMPTY = "1" 8ALLOW_EMPTY = "1"
9 9
10inherit sdk 10inherit nativesdk
11 11
12PACKAGES = "${PN}" 12PACKAGES = "${PN}"
13 13
14RDEPENDS_${PN} = "\ 14RDEPENDS_${PN} = "\
15 binutils-cross-sdk \ 15 binutils-cross-nativesdk \
16 gcc-cross-sdk \ 16 gcc-cross-nativesdk \
17 gdb-cross-sdk \ 17 gdb-cross-nativesdk \
18 pkgconfig-sdk \ 18 pkgconfig-nativesdk \
19 qemu-sdk \ 19 qemu-nativesdk \
20 qemu-helper-sdk \ 20 qemu-helper-nativesdk \
21 opkg-sdk \ 21 opkg-nativesdk \
22 " 22 "
23 23
24RDEPENDS_${PN}_darwin8 = "\ 24RDEPENDS_${PN}_darwin8 = "\
25 odcctools-cross-sdk \ 25 odcctools-cross-nativesdk \
26 llvm-cross-sdk \ 26 llvm-cross-nativesdk \
27 pkgconfig-sdk \ 27 pkgconfig-nativesdk \
28 opkg-sdk \ 28 opkg-nativesdk \
29 libtool-sdk \ 29 libtool-nativesdk \
30 " 30 "
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
index 0000000000..1313141bc0
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-nativesdk_1.2.1.bb
@@ -0,0 +1,6 @@
1require libx11_${PV}.bb
2
3DEPENDS = "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"
4PROVIDES = "virtual/libx11-nativesdk"
5
6inherit 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
index 0000000000..40e52e92ac
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11-nativesdk_git.bb
@@ -0,0 +1,9 @@
1require libx11.inc
2require libx11_git.inc
3
4DEPENDS = "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"
5PROVIDES = "virtual/libx11-nativesdk"
6
7EXTRA_OECONF += "--without-xcb"
8
9inherit 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
index 920f7b7704..0000000000
--- a/meta/packages/xorg-lib/libx11-sdk_1.2.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require libx11_${PV}.bb
2
3DEPENDS = "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"
4PROVIDES = "virtual/libx11-sdk"
5
6inherit 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
index fae07b054c..0000000000
--- a/meta/packages/xorg-lib/libx11-sdk_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require libx11.inc
2require libx11_git.inc
3
4DEPENDS = "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"
5PROVIDES = "virtual/libx11-sdk"
6
7EXTRA_OECONF += "--without-xcb"
8
9inherit sdk
diff --git a/meta/packages/xorg-lib/libxau_1.0.4.bb b/meta/packages/xorg-lib/libxau_1.0.4.bb
index b590a90122..f0932ab20b 100644
--- 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"
7 7
8XORG_PN = "libXau" 8XORG_PN = "libXau"
9 9
10BBCLASSEXTEND = "native sdk" 10BBCLASSEXTEND = "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 bf8fe55e65..ea503abbc7 100644
--- 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"
8 8
9XORG_PN = "libXdmcp" 9XORG_PN = "libXdmcp"
10 10
11BBCLASSEXTEND = "native sdk" 11BBCLASSEXTEND = "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 d98a0e65d2..e1f13a1d1a 100644
--- 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"
7 7
8XORG_PN = "libXext" 8XORG_PN = "libXext"
9 9
10BBCLASSEXTEND = "sdk" 10BBCLASSEXTEND = "nativesdk"
diff --git a/meta/packages/xorg-lib/libxext_git.bb b/meta/packages/xorg-lib/libxext_git.bb
index 6ef1e5b943..d0b3d7fbf5 100644
--- a/meta/packages/xorg-lib/libxext_git.bb
+++ b/meta/packages/xorg-lib/libxext_git.bb
@@ -11,4 +11,4 @@ XORG_PN = "libXext"
11SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/${XORG_PN};protocol=git" 11SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/${XORG_PN};protocol=git"
12S = "${WORKDIR}/git/" 12S = "${WORKDIR}/git/"
13 13
14BBCLASSEXTEND = "sdk" 14BBCLASSEXTEND = "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 620fd7e2f2..173b6bd174 100644
--- 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"
8 8
9XORG_PN = "libXrandr" 9XORG_PN = "libXrandr"
10 10
11BBCLASSEXTEND = "sdk" 11BBCLASSEXTEND = "nativesdk"
diff --git a/meta/packages/xorg-lib/libxrender_0.9.4.bb b/meta/packages/xorg-lib/libxrender_0.9.4.bb
index 5913ab7257..35065921a7 100644
--- 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"
8 8
9XORG_PN = "libXrender" 9XORG_PN = "libXrender"
10 10
11BBCLASSEXTEND = "sdk" 11BBCLASSEXTEND = "nativesdk"
diff --git a/meta/packages/xorg-lib/xtrans_1.2.2.bb b/meta/packages/xorg-lib/xtrans_1.2.2.bb
index d3703229b1..120f013e21 100644
--- 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"
7 7
8RDEPENDS_${PN}-dev = "" 8RDEPENDS_${PN}-dev = ""
9 9
10BBCLASSEXTEND = "native sdk" 10BBCLASSEXTEND = "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 e799a991e7..4a9bc806b5 100644
--- 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
3PR = "r1" 3PR = "r1"
4PE = "1" 4PE = "1"
5 5
6BBCLASSEXTEND = "native sdk" 6BBCLASSEXTEND = "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 00af730bd5..b5a05bc0f4 100644
--- 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"
5 5
6DEPENDS += "util-macros" 6DEPENDS += "util-macros"
7 7
8BBCLASSEXTEND = "native sdk" 8BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/packages/xorg-proto/inputproto_git.bb b/meta/packages/xorg-proto/inputproto_git.bb
index 40c94cd4ec..14350f1e1d 100644
--- a/meta/packages/xorg-proto/inputproto_git.bb
+++ b/meta/packages/xorg-proto/inputproto_git.bb
@@ -9,4 +9,4 @@ S = "${WORKDIR}/git"
9 9
10DEPENDS += "util-macros" 10DEPENDS += "util-macros"
11 11
12BBCLASSEXTEND = "native sdk" 12BBCLASSEXTEND = "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 e799a991e7..4a9bc806b5 100644
--- 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
3PR = "r1" 3PR = "r1"
4PE = "1" 4PE = "1"
5 5
6BBCLASSEXTEND = "native sdk" 6BBCLASSEXTEND = "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 74a0e2d5f6..42d33fb674 100644
--- 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"
4PR = "r1" 4PR = "r1"
5PE = "1" 5PE = "1"
6 6
7BBCLASSEXTEND = "sdk" 7BBCLASSEXTEND = "nativesdk"
diff --git a/meta/packages/xorg-proto/renderproto_0.9.3.bb b/meta/packages/xorg-proto/renderproto_0.9.3.bb
index 77d620a587..0168b9227c 100644
--- 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"
4PR = "r1" 4PR = "r1"
5PE = "1" 5PE = "1"
6 6
7BBCLASSEXTEND = "sdk" 7BBCLASSEXTEND = "nativesdk"
diff --git a/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto_1.1.2.bb
index e799a991e7..4a9bc806b5 100644
--- 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
3PR = "r1" 3PR = "r1"
4PE = "1" 4PE = "1"
5 5
6BBCLASSEXTEND = "native sdk" 6BBCLASSEXTEND = "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 dcec209bad..991e523b28 100644
--- 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
3PR = "r2" 3PR = "r2"
4PE = "1" 4PE = "1"
5 5
6BBCLASSEXTEND = "native sdk" 6BBCLASSEXTEND = "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 e799a991e7..4a9bc806b5 100644
--- 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
3PR = "r1" 3PR = "r1"
4PE = "1" 4PE = "1"
5 5
6BBCLASSEXTEND = "native sdk" 6BBCLASSEXTEND = "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 e799a991e7..4a9bc806b5 100644
--- 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
3PR = "r1" 3PR = "r1"
4PE = "1" 4PE = "1"
5 5
6BBCLASSEXTEND = "native sdk" 6BBCLASSEXTEND = "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 9616bd1d10..048a34c903 100644
--- 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 \
11RDEPENDS_${PN}-dev = "" 11RDEPENDS_${PN}-dev = ""
12RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" 12RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"
13 13
14BBCLASSEXTEND = "native sdk" 14BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/packages/zlib/zlib_1.2.3.bb b/meta/packages/zlib/zlib_1.2.3.bb
index ca54b6abfb..c1d6ce6ea5 100644
--- 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"
14 14
15inherit autotools_stage 15inherit autotools_stage
16 16
17BBCLASSEXTEND = "native sdk" 17BBCLASSEXTEND = "native nativesdk"