summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-22 17:43:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-02 05:52:06 -0700
commitad23395cd1f6c0cbfcc6980b6071d589f9f6cde0 (patch)
tree9965e27a93c73af1ccf9cdb24c588faabc90370a
parent58a8a38aa294edb74dde70d70a7e5faf49444b78 (diff)
downloadpoky-ad23395cd1f6c0cbfcc6980b6071d589f9f6cde0.tar.gz
nativesdk: Switch to using nativesdk as a prefix, not a suffix
As discussed on the mailing lists, using a suffix to package names is hard and has lead to many recipes having to do PKGSUFFIX games. Its looking extremely hard to scale nativesdk much further without hacking many recipes. By comparison, using a prefix like multilib does works much better and doesn't involve "hacking" as many recipes. This change converts nativesdk to use a prefix using the existing multilib infrastructure. (From OE-Core rev: 81813c0e322dc04ce4b069117188d8a54dfddb8c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass17
-rw-r--r--meta/classes/cross-canadian.bbclass2
-rw-r--r--meta/classes/distrodata.bbclass6
-rw-r--r--meta/classes/insane.bbclass4
-rw-r--r--meta/classes/nativesdk.bbclass2
-rw-r--r--meta/classes/package_rpm.bbclass2
-rw-r--r--meta/classes/pkgconfig.bbclass2
-rw-r--r--meta/classes/populate_sdk.bbclass1
-rw-r--r--meta/classes/populate_sdk_base.bbclass2
-rw-r--r--meta/conf/bitbake.conf4
-rw-r--r--meta/conf/distro/include/default-providers.inc6
-rw-r--r--meta/conf/distro/include/tclibc-eglibc.inc4
-rw-r--r--meta/conf/distro/include/tcmode-default.inc14
-rw-r--r--meta/lib/oe/sstatesig.py2
-rw-r--r--meta/recipes-core/dbus/dbus.inc2
-rw-r--r--meta/recipes-core/eglibc/eglibc-locale.inc15
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc53
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb2
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc2
-rw-r--r--meta/recipes-core/meta/external-python-tarball.bb38
-rw-r--r--meta/recipes-core/tasks/nativesdk-task-sdk-host.bb (renamed from meta/recipes-core/tasks/task-sdk-host-nativesdk.bb)24
-rw-r--r--meta/recipes-devtools/autoconf/autoconf.inc4
-rw-r--r--meta/recipes-devtools/automake/automake_1.12.1.bb2
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb4
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk.inc2
-rw-r--r--meta/recipes-devtools/gcc/libgcc_4.7.bb9
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross-canadian.inc7
-rw-r--r--meta/recipes-devtools/gnu-config/gnu-config_20111111.bb2
-rw-r--r--meta/recipes-devtools/gnu-config/gnu-config_git.bb2
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal8
-rw-r--r--meta/recipes-devtools/opkg/opkg.inc15
-rw-r--r--meta/recipes-devtools/perl/perl_5.14.2.bb2
-rw-r--r--meta/recipes-devtools/python/python_2.7.3.bb9
-rw-r--r--meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb (renamed from meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb)2
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc6
-rw-r--r--meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb4
-rw-r--r--meta/recipes-extended/bash/bash_4.2.bb1
-rw-r--r--meta/recipes-extended/bzip2/bzip2_1.0.6.bb3
-rw-r--r--meta/recipes-graphics/libsdl/libsdl_1.2.15.bb2
-rw-r--r--meta/recipes-graphics/mesa/qemugl_git.bb2
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.bb2
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb17
-rw-r--r--meta/recipes-qt/meta/meta-toolchain-qte.bb2
-rw-r--r--meta/recipes-qt/qt4/files/qt-dbus-const.patch2
-rw-r--r--meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb (renamed from meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb)0
-rw-r--r--meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb7
-rw-r--r--meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb7
-rw-r--r--meta/recipes-support/curl/curl_7.26.0.bb2
-rw-r--r--meta/recipes-support/sqlite/sqlite3.inc15
51 files changed, 167 insertions, 181 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 59febd1022..801896a5b9 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -191,7 +191,7 @@ def preferred_ml_updates(d):
191 for v in versions: 191 for v in versions:
192 val = d.getVar(v, False) 192 val = d.getVar(v, False)
193 pkg = v.replace("PREFERRED_VERSION_", "") 193 pkg = v.replace("PREFERRED_VERSION_", "")
194 if pkg.endswith("-native") or pkg.endswith("-nativesdk"): 194 if pkg.endswith("-native") or pkg.startswith("nativesdk-"):
195 continue 195 continue
196 for p in prefixes: 196 for p in prefixes:
197 newname = "PREFERRED_VERSION_" + p + "-" + pkg 197 newname = "PREFERRED_VERSION_" + p + "-" + pkg
@@ -201,7 +201,7 @@ def preferred_ml_updates(d):
201 for prov in providers: 201 for prov in providers:
202 val = d.getVar(prov, False) 202 val = d.getVar(prov, False)
203 pkg = prov.replace("PREFERRED_PROVIDER_", "") 203 pkg = prov.replace("PREFERRED_PROVIDER_", "")
204 if pkg.endswith("-native") or pkg.endswith("-nativesdk"): 204 if pkg.endswith("-native") or pkg.startswith("nativesdk-"):
205 continue 205 continue
206 virt = "" 206 virt = ""
207 if pkg.startswith("virtual/"): 207 if pkg.startswith("virtual/"):
@@ -218,7 +218,7 @@ def preferred_ml_updates(d):
218 mp = (d.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split() 218 mp = (d.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split()
219 extramp = [] 219 extramp = []
220 for p in mp: 220 for p in mp:
221 if p.endswith("-native") or p.endswith("-nativesdk"): 221 if p.endswith("-native") or p.startswith("nativesdk-"):
222 continue 222 continue
223 virt = "" 223 virt = ""
224 if p.startswith("virtual/"): 224 if p.startswith("virtual/"):
@@ -359,15 +359,18 @@ python () {
359 subs = a.split("/", 1)[1] 359 subs = a.split("/", 1)[1]
360 newappends.append("virtual/" + prefix + subs + extension) 360 newappends.append("virtual/" + prefix + subs + extension)
361 else: 361 else:
362 newappends.append(prefix + a + extension) 362 if a.startswith(prefix):
363 newappends.append(a + extension)
364 else:
365 newappends.append(prefix + a + extension)
363 return newappends 366 return newappends
364 367
365 def appendVar(varname, appends): 368 def appendVar(varname, appends):
366 if not appends: 369 if not appends:
367 return 370 return
368 if varname.find("DEPENDS") != -1: 371 if varname.find("DEPENDS") != -1:
369 if pn.endswith("-nativesdk"): 372 if pn.startswith("nativesdk-"):
370 appends = expandFilter(appends, "-nativesdk", "") 373 appends = expandFilter(appends, "", "nativesdk-")
371 if pn.endswith("-native"): 374 if pn.endswith("-native"):
372 appends = expandFilter(appends, "-native", "") 375 appends = expandFilter(appends, "-native", "")
373 if mlprefix: 376 if mlprefix:
@@ -456,7 +459,7 @@ python () {
456 459
457 dont_want_license = d.getVar('INCOMPATIBLE_LICENSE', True) 460 dont_want_license = d.getVar('INCOMPATIBLE_LICENSE', True)
458 461
459 if dont_want_license and not pn.endswith("-native") and not pn.endswith("-cross") and not pn.endswith("-cross-initial") and not pn.endswith("-cross-intermediate") and not pn.endswith("-crosssdk-intermediate") and not pn.endswith("-crosssdk") and not pn.endswith("-crosssdk-initial") and not pn.endswith("-cross-canadian-%s" % d.getVar('TRANSLATED_TARGET_ARCH', True)) and not pn.endswith("-nativesdk"): 462 if dont_want_license and not pn.endswith("-native") and not pn.endswith("-cross") and not pn.endswith("-cross-initial") and not pn.endswith("-cross-intermediate") and not pn.endswith("-crosssdk-intermediate") and not pn.endswith("-crosssdk") and not pn.endswith("-crosssdk-initial") and not pn.endswith("-cross-canadian-%s" % d.getVar('TRANSLATED_TARGET_ARCH', True)) and not pn.startswith("nativesdk-"):
460 # Internally, we'll use the license mapping. This way INCOMPATIBLE_LICENSE = "GPLv2" and 463 # Internally, we'll use the license mapping. This way INCOMPATIBLE_LICENSE = "GPLv2" and
461 # INCOMPATIBLE_LICENSE = "GPLv2.0" will pick up all variations of GPL-2.0 464 # INCOMPATIBLE_LICENSE = "GPLv2.0" will pick up all variations of GPL-2.0
462 spdx_license = return_spdx(d, dont_want_license) 465 spdx_license = return_spdx(d, dont_want_license)
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index ed53118a2f..aec7301981 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -52,7 +52,7 @@ LDFLAGS = "${BUILDSDK_LDFLAGS} \
52 -Wl,-rpath-link,${STAGING_LIBDIR}/.. \ 52 -Wl,-rpath-link,${STAGING_LIBDIR}/.. \
53 -Wl,-rpath,${libdir}/.. " 53 -Wl,-rpath,${libdir}/.. "
54 54
55DEPENDS_GETTEXT = "gettext-native gettext-nativesdk" 55DEPENDS_GETTEXT = "gettext-native nativesdk-gettext"
56 56
57# Path mangling needed by the cross packaging 57# Path mangling needed by the cross packaging
58# Note that we use := here to ensure that libdir and includedir are 58# Note that we use := here to ensure that libdir and includedir are
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index f196df5f56..0da10a1dd1 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -33,10 +33,10 @@ python do_distrodata_np() {
33 localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) 33 localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True))
34 bb.data.update_data(localdata) 34 bb.data.update_data(localdata)
35 35
36 if pn.find("-nativesdk") != -1: 36 if pn.find("nativesdk-") != -1:
37 pnstripped = pn.split("-nativesdk") 37 pnstripped = pn.replace("nativesdk-", "")
38 bb.note("Native Split: %s" % pnstripped) 38 bb.note("Native Split: %s" % pnstripped)
39 localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) 39 localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES', True))
40 bb.data.update_data(localdata) 40 bb.data.update_data(localdata)
41 41
42 if pn.find("-cross") != -1: 42 if pn.find("-cross") != -1:
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 8b6f05413d..6de14e0cac 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -195,7 +195,7 @@ def package_qa_check_dev(path, name, d, elf, messages):
195 Check for ".so" library symlinks in non-dev packages 195 Check for ".so" library symlinks in non-dev packages
196 """ 196 """
197 197
198 if not name.endswith("-dev") and not name.endswith("-dbg") and not name.endswith("-nativesdk") and path.endswith(".so") and os.path.islink(path): 198 if not name.endswith("-dev") and not name.endswith("-dbg") and not name.startswith("nativesdk-") and path.endswith(".so") and os.path.islink(path):
199 messages.append("non -dev/-dbg/-nativesdk package contains symlink .so: %s path '%s'" % \ 199 messages.append("non -dev/-dbg/-nativesdk package contains symlink .so: %s path '%s'" % \
200 (name, package_qa_clean_path(path,d))) 200 (name, package_qa_clean_path(path,d)))
201 201
@@ -726,7 +726,7 @@ Rerun configure task after fixing this. The path was '%s'""" % root)
726 if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk', d): 726 if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk', d):
727 gt = "gettext-native" 727 gt = "gettext-native"
728 elif bb.data.inherits_class('cross-canadian', d): 728 elif bb.data.inherits_class('cross-canadian', d):
729 gt = "gettext-nativesdk" 729 gt = "nativesdk-gettext"
730 else: 730 else:
731 gt = "virtual/" + ml + "gettext" 731 gt = "virtual/" + ml + "gettext"
732 deps = bb.utils.explode_deps(d.getVar('DEPENDS', True) or "") 732 deps = bb.utils.explode_deps(d.getVar('DEPENDS', True) or "")
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index 8c0cd5bea1..3334817da0 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -52,8 +52,6 @@ baselib = "lib"
52export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig" 52export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig"
53export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" 53export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
54 54
55PKGSUFFIX = "-nativesdk"
56
57python nativesdk_virtclass_handler () { 55python nativesdk_virtclass_handler () {
58 if not isinstance(e, bb.event.RecipePreFinalise): 56 if not isinstance(e, bb.event.RecipePreFinalise):
59 return 57 return
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 2c4c89a256..742f292307 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -1114,7 +1114,7 @@ python do_package_rpm () {
1114 targetsys = d.getVar('TARGET_SYS', True) 1114 targetsys = d.getVar('TARGET_SYS', True)
1115 targetvendor = d.getVar('TARGET_VENDOR', True) 1115 targetvendor = d.getVar('TARGET_VENDOR', True)
1116 package_arch = d.getVar('PACKAGE_ARCH', True) or "" 1116 package_arch = d.getVar('PACKAGE_ARCH', True) or ""
1117 if package_arch not in "all any noarch".split(): 1117 if package_arch not in "all any noarch".split() and not package_arch.endswith("-nativesdk"):
1118 ml_prefix = (d.getVar('MLPREFIX', True) or "").replace("-", "_") 1118 ml_prefix = (d.getVar('MLPREFIX', True) or "").replace("-", "_")
1119 d.setVar('PACKAGE_ARCH_EXTEND', ml_prefix + package_arch) 1119 d.setVar('PACKAGE_ARCH_EXTEND', ml_prefix + package_arch)
1120 else: 1120 else:
diff --git a/meta/classes/pkgconfig.bbclass b/meta/classes/pkgconfig.bbclass
index ddcf878220..5908b7f42d 100644
--- a/meta/classes/pkgconfig.bbclass
+++ b/meta/classes/pkgconfig.bbclass
@@ -2,6 +2,6 @@ DEPENDS_prepend = "pkgconfig-native "
2 2
3PKGCONFIGRDEP = "pkgconfig" 3PKGCONFIGRDEP = "pkgconfig"
4PKGCONFIGRDEP_virtclass-native = "" 4PKGCONFIGRDEP_virtclass-native = ""
5PKGCONFIGRDEP_virtclass-nativesdk = "pkgconfig-nativesdk" 5PKGCONFIGRDEP_virtclass-nativesdk = "nativesdk-pkgconfig"
6 6
7RDEPENDS_${PN}-dev += "${PKGCONFIGRDEP}" 7RDEPENDS_${PN}-dev += "${PKGCONFIGRDEP}"
diff --git a/meta/classes/populate_sdk.bbclass b/meta/classes/populate_sdk.bbclass
index e5bb54026e..f64a911b72 100644
--- a/meta/classes/populate_sdk.bbclass
+++ b/meta/classes/populate_sdk.bbclass
@@ -4,3 +4,4 @@
4inherit populate_sdk_base 4inherit populate_sdk_base
5 5
6addtask populate_sdk after do_install before do_build 6addtask populate_sdk after do_install before do_build
7
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index a1cb12a24a..c9fb00de48 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -7,7 +7,7 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
7 7
8SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${MULTIMACH_TARGET_SYS}" 8SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${MULTIMACH_TARGET_SYS}"
9 9
10TOOLCHAIN_HOST_TASK ?= "task-sdk-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}" 10TOOLCHAIN_HOST_TASK ?= "nativesdk-task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
11TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= "" 11TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= ""
12TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg" 12TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg"
13TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= "" 13TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= ""
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7dfeda32aa..1d56813a6b 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -194,7 +194,7 @@ EXTENDPKGV ?= "${EXTENDPKGEVER}${PKGV}-${PKGR}"
194# Base package name 194# Base package name
195# Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" 195# Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial"
196# otherwise it is the same as PN and P 196# otherwise it is the same as PN and P
197SPECIAL_PKGSUFFIX = "-native -cross -initial -intermediate -nativesdk -crosssdk -cross-canadian" 197SPECIAL_PKGSUFFIX = "-native -cross -initial -intermediate -crosssdk -cross-canadian"
198BPN = "${@base_prune_suffix(d.getVar('PN', True), d.getVar('SPECIAL_PKGSUFFIX', True).split(), d)}" 198BPN = "${@base_prune_suffix(d.getVar('PN', True), d.getVar('SPECIAL_PKGSUFFIX', True).split(), d)}"
199BP = "${BPN}-${PV}" 199BP = "${BPN}-${PV}"
200 200
@@ -250,7 +250,7 @@ PROVIDES = ""
250PROVIDES_prepend = "${P} ${PF} ${PN} " 250PROVIDES_prepend = "${P} ${PF} ${PN} "
251RPROVIDES = "" 251RPROVIDES = ""
252 252
253MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/libintl-nativesdk virtual/xserver virtual/update-alternatives-native virtual/update-alternatives" 253MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/nativesdk-libintl virtual/xserver virtual/update-alternatives-native virtual/update-alternatives"
254 254
255SOLIBS = ".so.*" 255SOLIBS = ".so.*"
256SOLIBS_darwin = ".*.dylib" 256SOLIBS_darwin = ".*.dylib"
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 28d2f8eac7..2d8a17dee9 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -27,12 +27,12 @@ PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
27PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" 27PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
28PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf" 28PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf"
29PREFERRED_PROVIDER_libgcc ?= "libgcc" 29PREFERRED_PROVIDER_libgcc ?= "libgcc"
30PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk" 30PREFERRED_PROVIDER_nativesdk-libgcc ?= "nativesdk-libgcc"
31PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" 31PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
32PREFERRED_PROVIDER_linux-libc-headers-nativesdk ?= "linux-libc-headers-nativesdk" 32PREFERRED_PROVIDER_nativesdk-linux-libc-headers ?= "nativesdk-linux-libc-headers"
33PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" 33PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
34PREFERRED_PROVIDER_opkg ?= "opkg" 34PREFERRED_PROVIDER_opkg ?= "opkg"
35PREFERRED_PROVIDER_opkg-native ?= "opkg-native" 35PREFERRED_PROVIDER_opkg-native ?= "opkg-native"
36PREFERRED_PROVIDER_opkg-nativesdk ?= "opkg-nativesdk" 36PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg"
37PREFERRED_PROVIDER_console-tools ?= "kbd" 37PREFERRED_PROVIDER_console-tools ?= "kbd"
38PREFERRED_PROVIDER_gzip-native ?= "pigz-native" 38PREFERRED_PROVIDER_gzip-native ?= "pigz-native"
diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc
index 4f5607f226..1c9e7e9de9 100644
--- a/meta/conf/distro/include/tclibc-eglibc.inc
+++ b/meta/conf/distro/include/tclibc-eglibc.inc
@@ -9,10 +9,10 @@ LIBCOVERRIDE = ":libc-glibc"
9OVERRIDES .= "${LIBCOVERRIDE}" 9OVERRIDES .= "${LIBCOVERRIDE}"
10 10
11PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" 11PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
12PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk" 12PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-eglibc"
13PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" 13PREFERRED_PROVIDER_virtual/libintl ?= "eglibc"
14PREFERRED_PROVIDER_virtual/libc ?= "eglibc" 14PREFERRED_PROVIDER_virtual/libc ?= "eglibc"
15PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "eglibc-nativesdk" 15PREFERRED_PROVIDER_virtual/nativesdk-libc ?= "nativesdk-eglibc"
16PREFERRED_PROVIDER_virtual/libc-locale ?= "eglibc-locale" 16PREFERRED_PROVIDER_virtual/libc-locale ?= "eglibc-locale"
17 17
18CXXFLAGS += "-fvisibility-inlines-hidden" 18CXXFLAGS += "-fvisibility-inlines-hidden"
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 2bfa225efd..91936918a4 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -12,9 +12,9 @@ PREFERRED_PROVIDER_gdb = "gdb"
12 12
13# Default libc config 13# Default libc config
14PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}" 14PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}"
15PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${TCLIBC}-nativesdk" 15PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc ?= "nativesdk-${TCLIBC}"
16PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial" 16PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial"
17PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk = "${TCLIBC}-initial-nativesdk" 17PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial = "nativesdk-${TCLIBC}-initial"
18PREFERRED_PROVIDER_virtual/gettext ??= "gettext" 18PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
19 19
20GCCVERSION ?= "4.7%" 20GCCVERSION ?= "4.7%"
@@ -33,20 +33,20 @@ PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}"
33PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${SDKGCCVERSION}" 33PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${SDKGCCVERSION}"
34PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}" 34PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}"
35PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" 35PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}"
36PREFERRED_VERSION_gcc-runtime-nativesdk ?= "${SDKGCCVERSION}" 36PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}"
37PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" 37PREFERRED_VERSION_libgcc ?= "${GCCVERSION}"
38PREFERRED_VERSION_libgcc-nativesdk ?= "${SDKGCCVERSION}" 38PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}"
39PREFERRED_VERSION_binutils ?= "${BINUVERSION}" 39PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
40PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}" 40PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}"
41PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}" 41PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}"
42PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}" 42PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}"
43PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" 43PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
44PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}" 44PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}"
45PREFERRED_VERSION_eglibc ?= "${EGLIBCVERSION}" 45PREFERRED_VERSION_eglibc ?= "${EGLIBCVERSION}"
46PREFERRED_VERSION_eglibc-locale ?= "${EGLIBCVERSION}" 46PREFERRED_VERSION_eglibc-locale ?= "${EGLIBCVERSION}"
47PREFERRED_VERSION_eglibc-nativesdk ?= "${EGLIBCVERSION}" 47PREFERRED_VERSION_nativesdk-eglibc ?= "${EGLIBCVERSION}"
48PREFERRED_VERSION_eglibc-initial ?= "${EGLIBCVERSION}" 48PREFERRED_VERSION_eglibc-initial ?= "${EGLIBCVERSION}"
49PREFERRED_VERSION_eglibc-initial-nativesdk ?= "${EGLIBCVERSION}" 49PREFERRED_VERSION_nativesdk-eglibc-initial ?= "${EGLIBCVERSION}"
50PREFERRED_VERSION_cross-localedef-native ?= "${EGLIBCVERSION}" 50PREFERRED_VERSION_cross-localedef-native ?= "${EGLIBCVERSION}"
51PREFERRED_VERSION_uclibc ?= "${UCLIBCVERSION}" 51PREFERRED_VERSION_uclibc ?= "${UCLIBCVERSION}"
52PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}" 52PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}"
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 20d94b218b..50b4027bd6 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -7,7 +7,7 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCache):
7 def isCross(x): 7 def isCross(x):
8 return x.endswith("-cross") or x.endswith("-cross-initial") or x.endswith("-cross-intermediate") 8 return x.endswith("-cross") or x.endswith("-cross-initial") or x.endswith("-cross-intermediate")
9 def isNativeSDK(x): 9 def isNativeSDK(x):
10 return x.endswith("-nativesdk") 10 return x.startswith("nativesdk-")
11 def isKernel(fn): 11 def isKernel(fn):
12 inherits = " ".join(dataCache.inherits[fn]) 12 inherits = " ".join(dataCache.inherits[fn])
13 return inherits.find("module-base.bbclass") != -1 or inherits.find("linux-kernel-base.bbclass") != -1 13 return inherits.find("module-base.bbclass") != -1 or inherits.find("linux-kernel-base.bbclass") != -1
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 1984c74c6d..8f35f56d1b 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
8X11DEPENDS = "virtual/libx11 libsm" 8X11DEPENDS = "virtual/libx11 libsm"
9DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" 9DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
10DEPENDS_virtclass-native = "expat-native virtual/libintl-native" 10DEPENDS_virtclass-native = "expat-native virtual/libintl-native"
11DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk virtual/libx11" 11DEPENDS_virtclass-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11"
12 12
13INC_PR = "r3" 13INC_PR = "r3"
14 14
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index d6bdcb5f2e..296afdef6e 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -17,7 +17,7 @@ do_compile[noexec] = "1"
17 17
18# default to disabled 18# default to disabled
19ENABLE_BINARY_LOCALE_GENERATION ?= "0" 19ENABLE_BINARY_LOCALE_GENERATION ?= "0"
20ENABLE_BINARY_LOCALE_GENERATION_pn-eglibc-locale-nativesdk = "0" 20ENABLE_BINARY_LOCALE_GENERATION_pn-nativesdk-eglibc-locale = "0"
21 21
22#enable locale generation on these arches 22#enable locale generation on these arches
23# BINARY_LOCALE_ARCHES is a space separated list of regular expressions 23# BINARY_LOCALE_ARCHES is a space separated list of regular expressions
@@ -29,16 +29,13 @@ LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
29 29
30PR = "r22" 30PR = "r22"
31 31
32PKGSUFFIX = "" 32PROVIDES = "virtual/libc-locale"
33PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
34 33
35PROVIDES = "virtual/libc-locale${PKGSUFFIX}" 34PACKAGES = "localedef ${PN}-dbg"
36
37PACKAGES = "localedef${PKGSUFFIX} ${PN}-dbg"
38 35
39PACKAGES_DYNAMIC = "locale-base-* \ 36PACKAGES_DYNAMIC = "locale-base-* \
40 eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \ 37 eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \
41 glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" 38 glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*"
42 39
43# Create a eglibc-binaries package 40# Create a eglibc-binaries package
44ALLOW_EMPTY_${BPN}-binaries = "1" 41ALLOW_EMPTY_${BPN}-binaries = "1"
@@ -67,7 +64,7 @@ DESCRIPTION_localedef = "eglibc: compile locale definition files"
67# Explicitly add ${MLPREFIX} for FILES_eglibc-gconv. 64# Explicitly add ${MLPREFIX} for FILES_eglibc-gconv.
68FILES_${MLPREFIX}eglibc-gconv = "${libdir}/gconv/*" 65FILES_${MLPREFIX}eglibc-gconv = "${libdir}/gconv/*"
69FILES_${PN}-dbg += "${libdir}/gconv/.debug/*" 66FILES_${PN}-dbg += "${libdir}/gconv/.debug/*"
70FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" 67FILES_localedef = "${bindir}/localedef"
71 68
72LOCALETREESRC = "${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}" 69LOCALETREESRC = "${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}"
73 70
@@ -93,6 +90,6 @@ do_install () {
93 90
94inherit libc-package 91inherit libc-package
95 92
96do_install[depends] += "virtual/${MLPREFIX}libc${PKGSUFFIX}:do_populate_sysroot" 93do_install[depends] += "virtual/${MLPREFIX}libc:do_populate_sysroot"
97 94
98BBCLASSEXTEND = "nativesdk" 95BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index af784565d4..bd46cb8561 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -17,47 +17,44 @@ python __anonymous () {
17# Set this to zero if you don't want ldconfig in the output package 17# Set this to zero if you don't want ldconfig in the output package
18USE_LDCONFIG ?= "1" 18USE_LDCONFIG ?= "1"
19 19
20PKGSUFFIX = "" 20PACKAGES = "${PN}-dbg catchsegv sln nscd ldd ${PN}-mtrace ${PN}-utils eglibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN} eglibc-extra-nss"
21PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
22
23PACKAGES = "${PN}-dbg catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-mtrace ${PN}-utils eglibc-thread-db${PKGSUFFIX} ${PN}-pic libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX} ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN} eglibc-extra-nss${PKGSUFFIX}"
24 21
25# The ld.so in this eglibc supports the GNU_HASH 22# The ld.so in this eglibc supports the GNU_HASH
26RPROVIDES_${PN} = "glibc${PKGSUFFIX} rtld(GNU_HASH)" 23RPROVIDES_${PN} = "glibc rtld(GNU_HASH)"
27RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils" 24RPROVIDES_${PN}-utils = "glibc-utils"
28RPROVIDES_${PN}-mtrace = "glibc${PKGSUFFIX}-mtrace libc-mtrace" 25RPROVIDES_${PN}-mtrace = "glibc-mtrace libc-mtrace"
29RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic" 26RPROVIDES_${PN}-pic = "glibc-pic"
30RPROVIDES_${PN}-dev = "glibc${PKGSUFFIX}-dev" 27RPROVIDES_${PN}-dev = "glibc-dev"
31RPROVIDES_${PN}-staticdev = "glibc${PKGSUFFIX}-staticdev" 28RPROVIDES_${PN}-staticdev = "glibc-staticdev"
32RPROVIDES_${PN}-doc = "glibc${PKGSUFFIX}-doc" 29RPROVIDES_${PN}-doc = "glibc-doc"
33RPROVIDES_eglibc-extra-nss${PKGSUFFIX} = "glibc-extra-nss${PKGSUFFIX}" 30RPROVIDES_eglibc-extra-nss = "glibc-extra-nss"
34RPROVIDES_eglibc-thread-db${PKGSUFFIX} = "glibc-thread-db${PKGSUFFIX}" 31RPROVIDES_eglibc-thread-db = "glibc-thread-db"
35RPROVIDES_${PN}-pcprofile = "glibc${PKGSUFFIX}-pcprofile" 32RPROVIDES_${PN}-pcprofile = "glibc-pcprofile"
36RPROVIDES_${PN}-dbg = "glibc-dbg${PKGSUFFIX}" 33RPROVIDES_${PN}-dbg = "glibc-dbg"
37libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" 34libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so"
38 35
39FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}" 36FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}"
40FILES_ldd${PKGSUFFIX} = "${bindir}/ldd" 37FILES_ldd = "${bindir}/ldd"
41FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*" 38FILES_libsegfault = "${base_libdir}/libSegFault*"
42FILES_libcidn${PKGSUFFIX} = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" 39FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
43FILES_libmemusage${PKGSUFFIX} = "${base_libdir}/libmemusage.so" 40FILES_libmemusage = "${base_libdir}/libmemusage.so"
44FILES_eglibc-extra-nss${PKGSUFFIX} = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" 41FILES_eglibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*"
45FILES_sln${PKGSUFFIX} = "/sbin/sln" 42FILES_sln = "/sbin/sln"
46FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" 43FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o"
47FILES_libsotruss${PKGSUFFIX} = "${libdir}/audit/sotruss-lib.so" 44FILES_libsotruss = "${libdir}/audit/sotruss-lib.so"
48FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" 45FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}"
49FILES_${PN}-dev += "${bindir}/rpcgen ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" 46FILES_${PN}-dev += "${bindir}/rpcgen ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal"
50FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" 47FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a"
51FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" 48FILES_nscd = "${sbindir}/nscd*"
52FILES_${PN}-mtrace = "${bindir}/mtrace" 49FILES_${PN}-mtrace = "${bindir}/mtrace"
53FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" 50FILES_${PN}-utils = "${bindir}/* ${sbindir}/*"
54FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" 51FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug"
55FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" 52FILES_catchsegv = "${bindir}/catchsegv"
56RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" 53RDEPENDS_catchsegv = "libsegfault"
57RDEPENDS_${PN}-utils += "bash" 54RDEPENDS_${PN}-utils += "bash"
58RDEPENDS_${PN}-mtrace += "perl" 55RDEPENDS_${PN}-mtrace += "perl"
59FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so" 56FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so"
60FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" 57FILES_eglibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so"
61RPROVIDES_${PN}-dev += "libc-dev" 58RPROVIDES_${PN}-dev += "libc-dev"
62RPROVIDES_${PN}-staticdev += "libc-staticdev" 59RPROVIDES_${PN}-staticdev += "libc-staticdev"
63 60
@@ -65,8 +62,8 @@ SUMMARY_sln = "The static ln."
65DESCRIPTION_sln = "Similar to the 'ln' utility, but statically linked. sln is useful to make symbolic links to dynamic libraries if the dynamic linking system, for some reason, is not functional." 62DESCRIPTION_sln = "Similar to the 'ln' utility, but statically linked. sln is useful to make symbolic links to dynamic libraries if the dynamic linking system, for some reason, is not functional."
66SUMMARY_nscd = "Name service cache daemon" 63SUMMARY_nscd = "Name service cache daemon"
67DESCRIPTION_nscd = "nscd, name service cache daemon, caches name service lookups for the passwd, group and hosts information. It can damatically improvide performance with remote, such as NIS or NIS+, name services." 64DESCRIPTION_nscd = "nscd, name service cache daemon, caches name service lookups for the passwd, group and hosts information. It can damatically improvide performance with remote, such as NIS or NIS+, name services."
68SUMMARY_eglibc-extra-nss${PKGSUFFIX} = "hesiod, NIS and NIS+ nss libraries" 65SUMMARY_eglibc-extra-nss = "hesiod, NIS and NIS+ nss libraries"
69DESCRIPTION_eglibc-extra-nss${PKGSUFFIX} = "eglibc: nis, nisplus and hesiod search services." 66DESCRIPTION_eglibc-extra-nss = "eglibc: nis, nisplus and hesiod search services."
70SUMMARY_ldd = "print shared library dependencies" 67SUMMARY_ldd = "print shared library dependencies"
71DESCRIPTION_ldd = "/usr/bin/ldd prints shared library dependencies for each program or shared library specified on the command line." 68DESCRIPTION_ldd = "/usr/bin/ldd prints shared library dependencies for each program or shared library specified on the command line."
72SUMMARY_${PN}-utils = "Miscellaneous utilities provided by eglibc" 69SUMMARY_${PN}-utils = "Miscellaneous utilities provided by eglibc"
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
index 7bc97d68d3..3a075d48e8 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
@@ -5,7 +5,7 @@ PE = "1"
5 5
6DEPENDS += "libffi python-argparse-native zlib" 6DEPENDS += "libffi python-argparse-native zlib"
7DEPENDS_virtclass-native += "libffi-native python-argparse-native" 7DEPENDS_virtclass-native += "libffi-native python-argparse-native"
8DEPENDS_virtclass-nativesdk += "libffi-nativesdk python-argparse-native zlib-nativesdk ${BPN}-native" 8DEPENDS_virtclass-nativesdk += "nativesdk-libffi python-argparse-native nativesdk-zlib ${BPN}-native"
9 9
10SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" 10SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
11 11
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 9dca440e80..8b099f223e 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -15,7 +15,7 @@ SECTION = "libs"
15 15
16DEPENDS = "glib-2.0-native zip virtual/libiconv" 16DEPENDS = "glib-2.0-native zip virtual/libiconv"
17DEPENDS_virtclass-native = "pkgconfig-native gettext-native" 17DEPENDS_virtclass-native = "pkgconfig-native gettext-native"
18DEPENDS_virtclass-nativesdk = "libtool-nativesdk" 18DEPENDS_virtclass-nativesdk = "nativesdk-libtool"
19PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen" 19PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
20 20
21LEAD_SONAME = "libglib-2.0.*" 21LEAD_SONAME = "libglib-2.0.*"
diff --git a/meta/recipes-core/meta/external-python-tarball.bb b/meta/recipes-core/meta/external-python-tarball.bb
index e317ba32ca..2085acc223 100644
--- a/meta/recipes-core/meta/external-python-tarball.bb
+++ b/meta/recipes-core/meta/external-python-tarball.bb
@@ -16,25 +16,25 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
16IPKG_HOST = "opkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}" 16IPKG_HOST = "opkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
17 17
18TOOLCHAIN_HOST_TASK ?= "\ 18TOOLCHAIN_HOST_TASK ?= "\
19 python-nativesdk-core \ 19 nativesdk-python-core \
20 python-nativesdk-textutils \ 20 nativesdk-python-textutils \
21 python-nativesdk-sqlite3 \ 21 nativesdk-python-sqlite3 \
22 python-nativesdk-pickle \ 22 nativesdk-python-pickle \
23 python-nativesdk-logging \ 23 nativesdk-python-logging \
24 python-nativesdk-elementtree \ 24 nativesdk-python-elementtree \
25 python-nativesdk-curses \ 25 nativesdk-python-curses \
26 python-nativesdk-compile \ 26 nativesdk-python-compile \
27 python-nativesdk-compiler \ 27 nativesdk-python-compiler \
28 python-nativesdk-fcntl \ 28 nativesdk-python-fcntl \
29 python-nativesdk-shell \ 29 nativesdk-python-shell \
30 python-nativesdk-misc \ 30 nativesdk-python-misc \
31 python-nativesdk-multiprocessing \ 31 nativesdk-python-multiprocessing \
32 python-nativesdk-subprocess \ 32 nativesdk-python-subprocess \
33 python-nativesdk-xmlrpc \ 33 nativesdk-python-xmlrpc \
34 python-nativesdk-netclient \ 34 nativesdk-python-netclient \
35 python-nativesdk-netserver \ 35 nativesdk-python-netserver \
36 python-nativesdk-distutils \ 36 nativesdk-python-distutils \
37 chrpath-nativesdk \ 37 nativesdk-chrpath \
38 " 38 "
39 39
40TOOLCHAIN_OUTPUTNAME ?= "python-nativesdk-standalone-${SDKMACHINE}" 40TOOLCHAIN_OUTPUTNAME ?= "python-nativesdk-standalone-${SDKMACHINE}"
diff --git a/meta/recipes-core/tasks/task-sdk-host-nativesdk.bb b/meta/recipes-core/tasks/nativesdk-task-sdk-host.bb
index 920f359eea..ea054bc9c9 100644
--- a/meta/recipes-core/tasks/task-sdk-host-nativesdk.bb
+++ b/meta/recipes-core/tasks/nativesdk-task-sdk-host.bb
@@ -15,21 +15,21 @@ inherit nativesdk
15PACKAGES = "${PN}" 15PACKAGES = "${PN}"
16 16
17RDEPENDS_${PN} = "\ 17RDEPENDS_${PN} = "\
18 pkgconfig-nativesdk \ 18 nativesdk-pkgconfig \
19 qemu-nativesdk \ 19 nativesdk-qemu \
20 qemu-helper-nativesdk \ 20 nativesdk-qemu-helper \
21 pseudo-nativesdk \ 21 nativesdk-pseudo \
22 unfs-server-nativesdk \ 22 nativesdk-unfs-server \
23 opkg-nativesdk \ 23 nativesdk-opkg \
24 libtool-nativesdk \ 24 nativesdk-libtool \
25 autoconf-nativesdk \ 25 nativesdk-autoconf \
26 automake-nativesdk \ 26 nativesdk-automake \
27 " 27 "
28 28
29RDEPENDS_${PN}_darwin8 = "\ 29RDEPENDS_${PN}_darwin8 = "\
30 odcctools-cross-canadian \ 30 odcctools-cross-canadian \
31 llvm-cross-canadian \ 31 llvm-cross-canadian \
32 pkgconfig-nativesdk \ 32 nativesdk-pkgconfig \
33 opkg-nativesdk \ 33 nativesdk-opkg \
34 libtool-nativesdk \ 34 nativesdk-libtool \
35 " 35 "
diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc
index 4f5a5b2a46..e80a83410e 100644
--- a/meta/recipes-devtools/autoconf/autoconf.inc
+++ b/meta/recipes-devtools/autoconf/autoconf.inc
@@ -7,10 +7,10 @@ HOMEPAGE = "http://www.gnu.org/software/autoconf/"
7SECTION = "devel" 7SECTION = "devel"
8DEPENDS += "m4-native" 8DEPENDS += "m4-native"
9DEPENDS_virtclass-native = "m4-native gnu-config-native" 9DEPENDS_virtclass-native = "m4-native gnu-config-native"
10DEPENDS_virtclass-nativesdk = "m4-nativesdk gnu-config-nativesdk" 10DEPENDS_virtclass-nativesdk = "nativesdk-m4 nativesdk-gnu-config"
11RDEPENDS_${PN} = "m4 gnu-config" 11RDEPENDS_${PN} = "m4 gnu-config"
12RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native" 12RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native"
13RDEPENDS_${PN}_virtclass-nativesdk = "m4-nativesdk gnu-config-nativesdk" 13RDEPENDS_${PN}_virtclass-nativesdk = "nativesdk-m4 nativesdk-gnu-config"
14 14
15SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz \ 15SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz \
16 file://program_prefix.patch" 16 file://program_prefix.patch"
diff --git a/meta/recipes-devtools/automake/automake_1.12.1.bb b/meta/recipes-devtools/automake/automake_1.12.1.bb
index 2a97bcc9aa..700592c6c9 100644
--- a/meta/recipes-devtools/automake/automake_1.12.1.bb
+++ b/meta/recipes-devtools/automake/automake_1.12.1.bb
@@ -28,7 +28,7 @@ RDEPENDS_${PN} += "\
28 perl-module-vars " 28 perl-module-vars "
29 29
30RDEPENDS_${PN}_virtclass-native = "autoconf-native perl-native-runtime" 30RDEPENDS_${PN}_virtclass-native = "autoconf-native perl-native-runtime"
31RDEPENDS_${PN}_virtclass-nativesdk = "autoconf-nativesdk" 31RDEPENDS_${PN}_virtclass-nativesdk = "nativesdk-autoconf"
32 32
33PATHFIXPATCH = "file://path_prog_fixes.patch" 33PATHFIXPATCH = "file://path_prog_fixes.patch"
34PATHFIXPATCH_virtclass-native = "" 34PATHFIXPATCH_virtclass-native = ""
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
index a23531ca23..4658badfa6 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
@@ -4,7 +4,7 @@ DESCRIPTION = "A GNU collection of cross-canadian binary utilities for ${TARGET_
4PN = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" 4PN = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}"
5BPN = "binutils" 5BPN = "binutils"
6 6
7DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/libc-nativesdk zlib-nativesdk gettext-nativesdk" 7DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/nativesdk-libc nativesdk-zlib nativesdk-gettext"
8EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ 8EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \
9 " 9 "
10do_install () { 10do_install () {
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index cc0a3badb9..ef861ae6cb 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -4,5 +4,5 @@ DESCRIPTION = "The cross-canadian GNU cc and gcc C compilers for ${TARGET_ARCH}
4PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" 4PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}"
5BPN = "gcc" 5BPN = "gcc"
6 6
7DEPENDS = "virtual/${HOST_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc gettext-nativesdk" 7DEPENDS = "virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc gettext"
8 8
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb
index 308e6f5234..53c463264f 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.7.bb
@@ -5,8 +5,8 @@ require gcc-cross-canadian.inc
5require gcc-configure-sdk.inc 5require gcc-configure-sdk.inc
6require gcc-package-sdk.inc 6require gcc-package-sdk.inc
7 7
8DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" 8DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils"
9RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" 9RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils"
10 10
11SYSTEMHEADERS = "/usr/include" 11SYSTEMHEADERS = "/usr/include"
12SYSTEMLIBS = "${target_base_libdir}/" 12SYSTEMLIBS = "${target_base_libdir}/"
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk.inc b/meta/recipes-devtools/gcc/gcc-crosssdk.inc
index 0fd82a6fdf..467a3f5d43 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk.inc
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk.inc
@@ -6,5 +6,5 @@ SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
6 6
7GCCMULTILIB = "--disable-multilib" 7GCCMULTILIB = "--disable-multilib"
8 8
9DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc-nativesdk gettext-native" 9DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk virtual/nativesdk-${TARGET_PREFIX}libc-for-gcc gettext-native"
10PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk" 10PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk"
diff --git a/meta/recipes-devtools/gcc/libgcc_4.7.bb b/meta/recipes-devtools/gcc/libgcc_4.7.bb
index c796253c82..5eaa515570 100644
--- a/meta/recipes-devtools/gcc/libgcc_4.7.bb
+++ b/meta/recipes-devtools/gcc/libgcc_4.7.bb
@@ -4,14 +4,11 @@ INHIBIT_DEFAULT_DEPS = "1"
4 4
5DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" 5DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
6 6
7PKGSUFFIX = ""
8PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
9
10PACKAGES = "\ 7PACKAGES = "\
11 ${PN} \ 8 ${PN} \
12 ${PN}-dev \ 9 ${PN}-dev \
13 ${PN}-dbg \ 10 ${PN}-dbg \
14 libgcov${PKGSUFFIX}-dev \ 11 libgcov-dev \
15 " 12 "
16 13
17FILES_${PN} = "${base_libdir}/libgcc*.so.*" 14FILES_${PN} = "${base_libdir}/libgcc*.so.*"
@@ -19,7 +16,7 @@ FILES_${PN}-dev = " \
19 ${base_libdir}/libgcc*.so \ 16 ${base_libdir}/libgcc*.so \
20 ${libdir}/${TARGET_SYS}/${BINV}/*crt* \ 17 ${libdir}/${TARGET_SYS}/${BINV}/*crt* \
21 ${libdir}/${TARGET_SYS}/${BINV}/libgcc*" 18 ${libdir}/${TARGET_SYS}/${BINV}/libgcc*"
22FILES_libgcov${PKGSUFFIX}-dev = " \ 19FILES_libgcov-dev = " \
23 ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \ 20 ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \
24 " 21 "
25FILES_${PN}-dbg += "${base_libdir}/.debug/" 22FILES_${PN}-dbg += "${base_libdir}/.debug/"
@@ -72,4 +69,4 @@ do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package"
72BBCLASSEXTEND = "nativesdk" 69BBCLASSEXTEND = "nativesdk"
73 70
74INSANE_SKIP_${PN}-dev = "staticdev" 71INSANE_SKIP_${PN}-dev = "staticdev"
75INSANE_SKIP_${MLPREFIX}libgcov${PKGSUFFIX}-dev = "staticdev" 72INSANE_SKIP_${MLPREFIX}libgcov-dev = "staticdev"
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
index 2b6069883e..c947526e82 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
@@ -5,9 +5,9 @@ DESCRIPTION = "cross-canadian gdb for ${TARGET_ARCH} target - GNU debugger"
5PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" 5PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}"
6BPN = "gdb" 6BPN = "gdb"
7 7
8DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk readline-nativesdk python-nativesdk" 8DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext nativesdk-readline nativesdk-python"
9RDEPENDS += "python-nativesdk-core python-nativesdk-lang python-nativesdk-re \ 9RDEPENDS += "nativesdk-python-core nativesdk-python-lang nativesdk-python-re \
10 python-nativesdk-codecs python-nativesdk-netclient" 10 nativesdk-python-codecs nativesdk-python-netclient"
11 11
12EXTRA_OECONF_append = "--with-python=${WORKDIR}/python" 12EXTRA_OECONF_append = "--with-python=${WORKDIR}/python"
13 13
@@ -30,3 +30,4 @@ EOF
30do_install_append() { 30do_install_append() {
31 rm -rf ${D}${exec_prefix}/lib 31 rm -rf ${D}${exec_prefix}/lib
32} 32}
33
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb b/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb
index d4588daa81..f7313609a9 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb
+++ b/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb
@@ -28,7 +28,7 @@ do_install () {
28 sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \ 28 sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \
29 -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize 29 -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize
30 # In the native case we want the system perl as perl-native can't have built yet 30 # In the native case we want the system perl as perl-native can't have built yet
31 if [ "${PN}" != "gnu-config-native" -a "${PN}" != "gnu-config-nativesdk" ]; then 31 if [ "${PN}" != "gnu-config-native" -a "${PN}" != "nativesdk-gnu-config" ]; then
32 sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize 32 sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize
33 fi 33 fi
34 chmod 755 ${D}${bindir}/gnu-configize 34 chmod 755 ${D}${bindir}/gnu-configize
diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
index 4de479915b..73efbb0f91 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb
+++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb
@@ -29,7 +29,7 @@ do_install () {
29 sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \ 29 sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \
30 -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize 30 -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize
31 # In the native case we want the system perl as perl-native can't have built yet 31 # In the native case we want the system perl as perl-native can't have built yet
32 if [ "${PN}" != "gnu-config-native" -a "${PN}" != "gnu-config-nativesdk" ]; then 32 if [ "${PN}" != "gnu-config-native" -a "${PN}" != "nativesdk-gnu-config" ]; then
33 sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize 33 sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize
34 fi 34 fi
35 chmod 755 ${D}${bindir}/gnu-configize 35 chmod 755 ${D}${bindir}/gnu-configize
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
index a540c0d8ff..78ea6d0514 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -117,7 +117,7 @@ OPKG_INSTALL_NATIVE_CMD="$OPKG_INSTALL_CMD -f $OPKG_CONFIG_FILE -o $NATIVE_INST
117BASE_HOSTSDK_PKGNAMES="pseudo opkg pkgconfig libtool autoconf automake" 117BASE_HOSTSDK_PKGNAMES="pseudo opkg pkgconfig libtool autoconf automake"
118for pkg in $BASE_HOSTSDK_PKGNAMES; do 118for pkg in $BASE_HOSTSDK_PKGNAMES; do
119 echo_info "Installing ${pkg} nativesdk ...\n" 119 echo_info "Installing ${pkg} nativesdk ...\n"
120 $OPKG_INSTALL_NATIVE_CMD ${pkg}-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE 120 $OPKG_INSTALL_NATIVE_CMD nativesdk-${pkg} &>> $YOCTOADT_INSTALL_LOG_FILE
121 check_result 121 check_result
122done 122done
123 123
@@ -142,15 +142,15 @@ done
142 142
143if [ "$YOCTOADT_QEMU" == "Y" ] || [ "$YOCTOADT_QEMU" = "y" ]; then 143if [ "$YOCTOADT_QEMU" == "Y" ] || [ "$YOCTOADT_QEMU" = "y" ]; then
144 echo_info "\nInstalling qemu native ..." 144 echo_info "\nInstalling qemu native ..."
145 $OPKG_INSTALL_NATIVE_CMD qemu-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE 145 $OPKG_INSTALL_NATIVE_CMD nativesdk-qemu &>> $YOCTOADT_INSTALL_LOG_FILE
146 check_result 146 check_result
147 $OPKG_INSTALL_NATIVE_CMD qemu-helper-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE 147 $OPKG_INSTALL_NATIVE_CMD nativesdk-qemu-helper &>> $YOCTOADT_INSTALL_LOG_FILE
148 check_result 148 check_result
149fi 149fi
150 150
151if [ "$YOCTOADT_NFS_UTIL" == "Y" ] || [ "$YOCTOADT_NFS_UTIL" == "y" ]; then 151if [ "$YOCTOADT_NFS_UTIL" == "Y" ] || [ "$YOCTOADT_NFS_UTIL" == "y" ]; then
152 echo_info "\nInstalling unfs ..." 152 echo_info "\nInstalling unfs ..."
153 $OPKG_INSTALL_NATIVE_CMD unfs-server-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE 153 $OPKG_INSTALL_NATIVE_CMD nativesdk-unfs-server &>> $YOCTOADT_INSTALL_LOG_FILE
154 check_result 154 check_result
155fi 155fi
156 156
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index 5c7cad3665..10cd9d8f30 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -8,7 +8,7 @@ LICENSE = "GPLv2+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
9 file://src/opkg-cl.c;beginline=1;endline=20;md5=321f658c3f6b6c832e25c8850b5dffba" 9 file://src/opkg-cl.c;beginline=1;endline=20;md5=321f658c3f6b6c832e25c8850b5dffba"
10DEPENDS_virtclass-native = "curl-native" 10DEPENDS_virtclass-native = "curl-native"
11DEPENDS_virtclass-nativesdk = "curl-nativesdk" 11DEPENDS_virtclass-nativesdk = "nativesdk-curl"
12 12
13PE = "1" 13PE = "1"
14INC_PR = "r10" 14INC_PR = "r10"
@@ -41,12 +41,12 @@ RDEPENDS_${PN}_virtclass-nativesdk = ""
41PACKAGE_ARCH_update-alternatives-cworth = "all" 41PACKAGE_ARCH_update-alternatives-cworth = "all"
42RREPLACES_${PN} = "opkg-nogpg" 42RREPLACES_${PN} = "opkg-nogpg"
43 43
44PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX}-staticdev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" 44PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg update-alternatives-cworth"
45 45
46FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives" 46FILES_update-alternatives-cworth = "${bindir}/update-alternatives"
47FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.la ${libdir}/*.so" 47FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so"
48FILES_libopkg${PKGSUFFIX}-staticdev = "${libdir}/*.a" 48FILES_libopkg-staticdev = "${libdir}/*.a"
49FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" 49FILES_libopkg = "${libdir}/*.so.* ${localstatedir}/lib/opkg/"
50 50
51# We need to create the lock directory 51# We need to create the lock directory
52do_install_append() { 52do_install_append() {
@@ -75,9 +75,6 @@ ALTERNATIVE_TARGET[opkg] = "${bindir}/opkg-cl"
75 75
76BBCLASSEXTEND = "native nativesdk" 76BBCLASSEXTEND = "native nativesdk"
77 77
78PKGSUFFIX = ""
79PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
80
81# Define a variable to allow distros to run configure earlier. 78# Define a variable to allow distros to run configure earlier.
82# (for example, to enable loading of ethernet kernel modules before networking starts) 79# (for example, to enable loading of ethernet kernel modules before networking starts)
83POSTINSTALL_INITPOSITION ?= "98" 80POSTINSTALL_INITPOSITION ?= "98"
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
index 561b30ed18..9db38055cb 100644
--- a/meta/recipes-devtools/perl/perl_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
@@ -302,6 +302,7 @@ python populate_packages_prepend () {
302} 302}
303 303
304PACKAGES_DYNAMIC = "perl-module-*" 304PACKAGES_DYNAMIC = "perl-module-*"
305PACKAGES_DYNAMIC_virtclass-nativesdk = "nativesdk-perl-module-*"
305 306
306RPROVIDES_perl-lib = "perl-lib" 307RPROVIDES_perl-lib = "perl-lib"
307 308
@@ -311,3 +312,4 @@ require perl-rprovides_${PV}.inc
311 312
312SSTATE_SCAN_FILES += "*.pm *.pod *.h *.pl *.sh" 313SSTATE_SCAN_FILES += "*.pm *.pod *.h *.pl *.sh"
313 314
315BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb
index 9c648fec15..3eb36fc9aa 100644
--- a/meta/recipes-devtools/python/python_2.7.3.bb
+++ b/meta/recipes-devtools/python/python_2.7.3.bb
@@ -148,11 +148,11 @@ require python-${PYTHON_MAJMIN}-manifest.inc
148RPROVIDES_${PN}-core = "${PN}" 148RPROVIDES_${PN}-core = "${PN}"
149RRECOMMENDS_${PN}-core = "${PN}-readline" 149RRECOMMENDS_${PN}-core = "${PN}-readline"
150RRECOMMENDS_${PN}-crypt = "openssl" 150RRECOMMENDS_${PN}-crypt = "openssl"
151RRECOMMENDS_${PN}-crypt_virtclass-nativesdk = "openssl-nativesdk" 151RRECOMMENDS_${PN}-crypt_virtclass-nativesdk = "nativesdk-openssl"
152 152
153# package libpython2 153# package libpython2
154PACKAGES =+ "lib${BPN}2${PKGSUFFIX}" 154PACKAGES =+ "lib${BPN}2"
155FILES_lib${BPN}2${PKGSUFFIX} = "${libdir}/libpython*.so.*" 155FILES_lib${BPN}2 = "${libdir}/libpython*.so.*"
156 156
157# catch debug extensions (isn't that already in python-core-dbg?) 157# catch debug extensions (isn't that already in python-core-dbg?)
158FILES_${PN}-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug" 158FILES_${PN}-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug"
@@ -166,6 +166,3 @@ PACKAGES += "${PN}-man"
166FILES_${PN}-man = "${datadir}/man" 166FILES_${PN}-man = "${datadir}/man"
167 167
168BBCLASSEXTEND = "nativesdk" 168BBCLASSEXTEND = "nativesdk"
169
170PKGSUFFIX = ""
171PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
diff --git a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
index df0cae068e..fbf9e771df 100644
--- a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
+++ b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
@@ -1,7 +1,7 @@
1SUMMARY = "Qemu helper scripts" 1SUMMARY = "Qemu helper scripts"
2DESCRIPTION = "Qemu helper scripts" 2DESCRIPTION = "Qemu helper scripts"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4RDEPENDS_${PN} = "qemu-nativesdk" 4RDEPENDS_${PN} = "nativesdk-qemu"
5PR = "r9" 5PR = "r9"
6 6
7FILESPATH = "${FILE_DIRNAME}/qemu-helper" 7FILESPATH = "${FILE_DIRNAME}/qemu-helper"
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 9cb4aee458..bdb566d88f 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -22,7 +22,7 @@ inherit autotools
22do_configure() { 22do_configure() {
23 # Handle distros such as CentOS 5 32-bit that do not have kvm support 23 # Handle distros such as CentOS 5 32-bit that do not have kvm support
24 KVMOPTS="--disable-kvm" 24 KVMOPTS="--disable-kvm"
25 if [ "${PN}" != "qemu-native" -a "${PN}" != "qemu-nativesdk" ] \ 25 if [ "${PN}" != "qemu-native" -a "${PN}" != "nativesdk-qemu" ] \
26 || [ -f /usr/include/linux/kvm.h ] ; then 26 || [ -f /usr/include/linux/kvm.h ] ; then
27 KVMOPTS="--enable-kvm" 27 KVMOPTS="--enable-kvm"
28 fi 28 fi
@@ -41,8 +41,8 @@ do_install () {
41PACKAGECONFIG ??= "" 41PACKAGECONFIG ??= ""
42 42
43DEPENDS_virtclass-native = "zlib-native alsa-lib-native glib-2.0-native" 43DEPENDS_virtclass-native = "zlib-native alsa-lib-native glib-2.0-native"
44DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk glib-2.0-nativesdk" 44DEPENDS_virtclass-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0"
45RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk" 45RDEPENDS_virtclass-nativesdk = "nativesdk-libsdl"
46EXTRA_OECONF_virtclass-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \ 46EXTRA_OECONF_virtclass-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \
47 --disable-curl \ 47 --disable-curl \
48 " 48 "
diff --git a/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb b/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb
index d03c153298..7480638889 100644
--- a/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb
+++ b/meta/recipes-devtools/unfs-server/unfs-server_2.1+2.2beta47.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
5 5
6RDEPENDS_${PN} = "pseudo" 6RDEPENDS_${PN} = "pseudo"
7RDEPENDS_${PN}_virtclass-native = "pseudo-native" 7RDEPENDS_${PN}_virtclass-native = "pseudo-native"
8RDEPENDS_${PN}_virtclass-nativesdk = "pseudo-nativesdk" 8RDEPENDS_${PN}_virtclass-nativesdk = "nativesdk-pseudo"
9BASEPV = "2.2beta47" 9BASEPV = "2.2beta47"
10PR = "r1" 10PR = "r1"
11 11
@@ -73,6 +73,6 @@ python __anonymous () {
73 import re 73 import re
74 74
75 pn = d.getVar("PN", True) 75 pn = d.getVar("PN", True)
76 if not pn.endswith('-native') and not pn.endswith('-nativesdk'): 76 if not pn.endswith('-native') and not pn.startswith('nativesdk-'):
77 raise bb.parse.SkipPackage("unfs-server is intended for native/nativesdk builds only") 77 raise bb.parse.SkipPackage("unfs-server is intended for native/nativesdk builds only")
78} 78}
diff --git a/meta/recipes-extended/bash/bash_4.2.bb b/meta/recipes-extended/bash/bash_4.2.bb
index 50f2ff64b8..384eb6265d 100644
--- a/meta/recipes-extended/bash/bash_4.2.bb
+++ b/meta/recipes-extended/bash/bash_4.2.bb
@@ -39,3 +39,4 @@ SRC_URI[patch009.sha256sum] = "e7ed5440b4c19765786e90e4f1ded43195d38b3e4d1c4b39f
39SRC_URI[patch010.md5sum] = "0a51602b535ef661ee707be6c8bdb373" 39SRC_URI[patch010.md5sum] = "0a51602b535ef661ee707be6c8bdb373"
40SRC_URI[patch010.sha256sum] = "acfc5482c25e6923116fcf4b4f7f6345b80f75ad7299749db4b736ad67aa43dc" 40SRC_URI[patch010.sha256sum] = "acfc5482c25e6923116fcf4b4f7f6345b80f75ad7299749db4b736ad67aa43dc"
41 41
42BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
index e0c710b038..5f92deb689 100644
--- a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
@@ -43,4 +43,5 @@ SECTION_libbz2-staticdev = "devel"
43RDEPENDS_libbz2-staticdev = "libbz2-dev (= ${EXTENDPKGV})" 43RDEPENDS_libbz2-staticdev = "libbz2-dev (= ${EXTENDPKGV})"
44 44
45PROVIDES_append_virtclass-native = " bzip2-replacement-native" 45PROVIDES_append_virtclass-native = " bzip2-replacement-native"
46BBCLASSEXTEND = "native" 46BBCLASSEXTEND = "native nativesdk"
47
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index 8b394428dc..b05840a2fc 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -16,7 +16,7 @@ DEPENDS = "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
16 ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ 16 ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \
17 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ 17 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
18 tslib" 18 tslib"
19DEPENDS_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk', '', d)}" 19DEPENDS_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
20 20
21PR = "r0" 21PR = "r0"
22 22
diff --git a/meta/recipes-graphics/mesa/qemugl_git.bb b/meta/recipes-graphics/mesa/qemugl_git.bb
index 32980d319d..9cf04364ac 100644
--- a/meta/recipes-graphics/mesa/qemugl_git.bb
+++ b/meta/recipes-graphics/mesa/qemugl_git.bb
@@ -25,7 +25,7 @@ DEFAULT_PREFERENCE = "-1"
25 25
26do_install () { 26do_install () {
27 install -d ${D}${libdir}/ 27 install -d ${D}${libdir}/
28 if [ "${PN}" != "qemugl-nativesdk" ]; then 28 if [ "${PN}" != "nativesdk-qemugl" ]; then
29 install -m 0755 ${S}/libGL.so.1.2 ${D}${libdir}/libGL-qemu.so.1.2 29 install -m 0755 ${S}/libGL.so.1.2 ${D}${libdir}/libGL-qemu.so.1.2
30 else 30 else
31 install -m 0755 ${S}/libGL.so.1.2 ${D}${libdir}/libGL.so.1.2 31 install -m 0755 ${S}/libGL.so.1.2 ${D}${libdir}/libGL.so.1.2
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 059aca7b34..3f94e981ae 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -4,7 +4,7 @@ require systemtap_git.inc
4 4
5DEPENDS = "elfutils sqlite3 systemtap-native" 5DEPENDS = "elfutils sqlite3 systemtap-native"
6DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native" 6DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native"
7DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk" 7DEPENDS_virtclass-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext"
8 8
9PR = "r0" 9PR = "r0"
10 10
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb
index 08da5cd471..7914bb9800 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb
@@ -31,22 +31,19 @@ EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python"
31 31
32EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no " 32EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no "
33 33
34PKGSUFFIX = "" 34PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev"
35PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
36
37PACKAGES =+ "alsa-server${PKGSUFFIX} libasound${PKGSUFFIX} alsa-conf-base${PKGSUFFIX} alsa-conf${PKGSUFFIX} alsa-doc${PKGSUFFIX} alsa-dev${PKGSUFFIX}"
38FILES_${PN} += "${libdir}/${BPN}/smixer/*.so" 35FILES_${PN} += "${libdir}/${BPN}/smixer/*.so"
39FILES_${PN}-dbg += "${libdir}/${BPN}/smixer/.debug" 36FILES_${PN}-dbg += "${libdir}/${BPN}/smixer/.debug"
40FILES_${PN}-dev += "${libdir}/${BPN}/smixer/*.la" 37FILES_${PN}-dev += "${libdir}/${BPN}/smixer/*.la"
41FILES_libasound${PKGSUFFIX} = "${libdir}/libasound.so.*" 38FILES_libasound = "${libdir}/libasound.so.*"
42FILES_alsa-server${PKGSUFFIX} = "${bindir}/*" 39FILES_alsa-server = "${bindir}/*"
43FILES_alsa-conf${PKGSUFFIX} = "${datadir}/alsa/" 40FILES_alsa-conf = "${datadir}/alsa/"
44FILES_alsa-dev${PKGSUFFIX} += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" 41FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
45FILES_alsa-conf-base${PKGSUFFIX} = "\ 42FILES_alsa-conf-base = "\
46${datadir}/alsa/alsa.conf \ 43${datadir}/alsa/alsa.conf \
47${datadir}/alsa/cards/aliases.conf \ 44${datadir}/alsa/cards/aliases.conf \
48${datadir}/alsa/pcm/default.conf \ 45${datadir}/alsa/pcm/default.conf \
49${datadir}/alsa/pcm/dmix.conf \ 46${datadir}/alsa/pcm/dmix.conf \
50${datadir}/alsa/pcm/dsnoop.conf" 47${datadir}/alsa/pcm/dsnoop.conf"
51 48
52RDEPENDS_libasound${PKGSUFFIX} = "alsa-conf-base${PKGSUFFIX}" 49RDEPENDS_libasound = "alsa-conf-base"
diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb
index 735ccd10ab..116db914a1 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qte.bb
+++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb
@@ -1,6 +1,6 @@
1# Qt Embedded toolchain 1# Qt Embedded toolchain
2PR = "r5" 2PR = "r5"
3TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}" 3TOOLCHAIN_HOST_TASK = "nativesdk-task-qte-toolchain-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
4TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target" 4TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target"
5TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}" 5TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}"
6 6
diff --git a/meta/recipes-qt/qt4/files/qt-dbus-const.patch b/meta/recipes-qt/qt4/files/qt-dbus-const.patch
index f3de77e3e6..6ee402fdc1 100644
--- a/meta/recipes-qt/qt4/files/qt-dbus-const.patch
+++ b/meta/recipes-qt/qt4/files/qt-dbus-const.patch
@@ -1,4 +1,4 @@
1Remove "const" usage that causes compile failure building qt4-tools-nativesdk 1Remove "const" usage that causes compile failure building nativesdk-qt4-tools
2 2
3Upstream-Status: Denied [possible retry] 3Upstream-Status: Denied [possible retry]
4 4
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
index e17a8ad808..e17a8ad808 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb
+++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb
diff --git a/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb b/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb
new file mode 100644
index 0000000000..5098d11388
--- /dev/null
+++ b/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb
@@ -0,0 +1,7 @@
1require recipes-core/tasks/nativesdk-task-sdk-host.bb
2
3DESCRIPTION = "Host packages for Qt Embedded SDK"
4LICENSE = "MIT"
5ALLOW_EMPTY = "1"
6
7RDEPENDS_${PN} += "nativesdk-qt4-tools"
diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb b/meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb
deleted file mode 100644
index cfa45ef939..0000000000
--- a/meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require recipes-core/tasks/task-sdk-host-nativesdk.bb
2
3DESCRIPTION = "Host packages for Qt Embedded SDK"
4LICENSE = "MIT"
5ALLOW_EMPTY = "1"
6
7RDEPENDS_${PN} += "qt4-tools-nativesdk"
diff --git a/meta/recipes-support/curl/curl_7.26.0.bb b/meta/recipes-support/curl/curl_7.26.0.bb
index 418e29ca8f..dad5572dff 100644
--- a/meta/recipes-support/curl/curl_7.26.0.bb
+++ b/meta/recipes-support/curl/curl_7.26.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66
7 7
8DEPENDS = "zlib gnutls" 8DEPENDS = "zlib gnutls"
9DEPENDS_virtclass-native = "zlib-native openssl-native" 9DEPENDS_virtclass-native = "zlib-native openssl-native"
10DEPENDS_virtclass-nativesdk = "zlib-nativesdk" 10DEPENDS_virtclass-nativesdk = "nativesdk-zlib"
11PR = "r1" 11PR = "r1"
12 12
13SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ 13SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index 79542fe3d9..0cc5d65b72 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -17,17 +17,14 @@ export config_TARGET_LINK = "${CCLD}"
17export config_TARGET_CFLAGS = "${CFLAGS}" 17export config_TARGET_CFLAGS = "${CFLAGS}"
18export config_TARGET_LFLAGS = "${LDFLAGS}" 18export config_TARGET_LFLAGS = "${LDFLAGS}"
19 19
20PKGSUFFIX = "" 20PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN}-dbg lib${BPN}-staticdev ${PN}"
21PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
22
23PACKAGES = "lib${BPN}${PKGSUFFIX} lib${BPN}${PKGSUFFIX}-dev lib${BPN}${PKGSUFFIX}-doc ${PN}-dbg lib${BPN}${PKGSUFFIX}-staticdev ${PN}"
24 21
25FILES_${PN} = "${bindir}/*" 22FILES_${PN} = "${bindir}/*"
26FILES_lib${BPN}${PKGSUFFIX} = "${libdir}/*.so.*" 23FILES_lib${BPN} = "${libdir}/*.so.*"
27FILES_lib${BPN}${PKGSUFFIX}-dev = "${libdir}/*.la ${libdir}/*.so \ 24FILES_lib${BPN}-dev = "${libdir}/*.la ${libdir}/*.so \
28 ${libdir}/pkgconfig ${includedir}" 25 ${libdir}/pkgconfig ${includedir}"
29FILES_lib${BPN}${PKGSUFFIX}-doc = "${docdir} ${mandir} ${infodir}" 26FILES_lib${BPN}-doc = "${docdir} ${mandir} ${infodir}"
30FILES_lib${BPN}${PKGSUFFIX}-staticdev = "${libdir}/lib*.a" 27FILES_lib${BPN}-staticdev = "${libdir}/lib*.a"
31AUTO_LIBNAME_PKGS = "lib${BPN}${PKGSUFFIX}" 28AUTO_LIBNAME_PKGS = "lib${BPN}"
32 29
33BBCLASSEXTEND = "native nativesdk" 30BBCLASSEXTEND = "native nativesdk"