From 81813c0e322dc04ce4b069117188d8a54dfddb8c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 22 Dec 2011 17:43:33 +0000 Subject: 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. Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 17 ++++--- meta/classes/cross-canadian.bbclass | 2 +- meta/classes/distrodata.bbclass | 6 +-- meta/classes/insane.bbclass | 4 +- meta/classes/nativesdk.bbclass | 2 - meta/classes/package_rpm.bbclass | 2 +- meta/classes/pkgconfig.bbclass | 2 +- meta/classes/populate_sdk.bbclass | 1 + meta/classes/populate_sdk_base.bbclass | 2 +- meta/conf/bitbake.conf | 4 +- meta/conf/distro/include/default-providers.inc | 6 +-- meta/conf/distro/include/tclibc-eglibc.inc | 4 +- meta/conf/distro/include/tcmode-default.inc | 14 +++--- meta/lib/oe/sstatesig.py | 2 +- meta/recipes-core/dbus/dbus.inc | 2 +- meta/recipes-core/eglibc/eglibc-locale.inc | 15 +++--- meta/recipes-core/eglibc/eglibc-package.inc | 53 ++++++++++------------ meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 2 +- meta/recipes-core/glib-2.0/glib.inc | 2 +- meta/recipes-core/meta/external-python-tarball.bb | 38 ++++++++-------- meta/recipes-core/tasks/nativesdk-task-sdk-host.bb | 35 ++++++++++++++ meta/recipes-core/tasks/task-sdk-host-nativesdk.bb | 35 -------------- meta/recipes-devtools/autoconf/autoconf.inc | 4 +- meta/recipes-devtools/automake/automake_1.12.1.bb | 2 +- .../binutils/binutils-cross-canadian.inc | 2 +- meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 2 +- .../recipes-devtools/gcc/gcc-cross-canadian_4.7.bb | 4 +- meta/recipes-devtools/gcc/gcc-crosssdk.inc | 2 +- meta/recipes-devtools/gcc/libgcc_4.7.bb | 9 ++-- meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 7 +-- .../gnu-config/gnu-config_20111111.bb | 2 +- meta/recipes-devtools/gnu-config/gnu-config_git.bb | 2 +- .../adt-installer/scripts/adt_installer_internal | 8 ++-- meta/recipes-devtools/opkg/opkg.inc | 15 +++--- meta/recipes-devtools/perl/perl_5.14.2.bb | 2 + meta/recipes-devtools/python/python_2.7.3.bb | 9 ++-- .../qemu/nativesdk-qemu-helper_1.0.bb | 49 ++++++++++++++++++++ .../qemu/qemu-helper-nativesdk_1.0.bb | 49 -------------------- meta/recipes-devtools/qemu/qemu.inc | 6 +-- .../unfs-server/unfs-server_2.1+2.2beta47.bb | 4 +- meta/recipes-extended/bash/bash_4.2.bb | 1 + meta/recipes-extended/bzip2/bzip2_1.0.6.bb | 3 +- meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 2 +- meta/recipes-graphics/mesa/qemugl_git.bb | 2 +- meta/recipes-kernel/systemtap/systemtap_git.bb | 2 +- meta/recipes-multimedia/alsa/alsa-lib_1.0.25.bb | 17 +++---- meta/recipes-qt/meta/meta-toolchain-qte.bb | 2 +- meta/recipes-qt/qt4/files/qt-dbus-const.patch | 2 +- meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb | 8 ++++ meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb | 8 ---- .../tasks/nativesdk-task-qte-toolchain-host.bb | 7 +++ .../tasks/task-qte-toolchain-host-nativesdk.bb | 7 --- meta/recipes-support/curl/curl_7.26.0.bb | 2 +- meta/recipes-support/sqlite/sqlite3.inc | 15 +++--- 54 files changed, 246 insertions(+), 260 deletions(-) create mode 100644 meta/recipes-core/tasks/nativesdk-task-sdk-host.bb delete mode 100644 meta/recipes-core/tasks/task-sdk-host-nativesdk.bb create mode 100644 meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb delete mode 100644 meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb create mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb delete mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb create mode 100644 meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb delete mode 100644 meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb (limited to 'meta') 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): for v in versions: val = d.getVar(v, False) pkg = v.replace("PREFERRED_VERSION_", "") - if pkg.endswith("-native") or pkg.endswith("-nativesdk"): + if pkg.endswith("-native") or pkg.startswith("nativesdk-"): continue for p in prefixes: newname = "PREFERRED_VERSION_" + p + "-" + pkg @@ -201,7 +201,7 @@ def preferred_ml_updates(d): for prov in providers: val = d.getVar(prov, False) pkg = prov.replace("PREFERRED_PROVIDER_", "") - if pkg.endswith("-native") or pkg.endswith("-nativesdk"): + if pkg.endswith("-native") or pkg.startswith("nativesdk-"): continue virt = "" if pkg.startswith("virtual/"): @@ -218,7 +218,7 @@ def preferred_ml_updates(d): mp = (d.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split() extramp = [] for p in mp: - if p.endswith("-native") or p.endswith("-nativesdk"): + if p.endswith("-native") or p.startswith("nativesdk-"): continue virt = "" if p.startswith("virtual/"): @@ -359,15 +359,18 @@ python () { subs = a.split("/", 1)[1] newappends.append("virtual/" + prefix + subs + extension) else: - newappends.append(prefix + a + extension) + if a.startswith(prefix): + newappends.append(a + extension) + else: + newappends.append(prefix + a + extension) return newappends def appendVar(varname, appends): if not appends: return if varname.find("DEPENDS") != -1: - if pn.endswith("-nativesdk"): - appends = expandFilter(appends, "-nativesdk", "") + if pn.startswith("nativesdk-"): + appends = expandFilter(appends, "", "nativesdk-") if pn.endswith("-native"): appends = expandFilter(appends, "-native", "") if mlprefix: @@ -456,7 +459,7 @@ python () { dont_want_license = d.getVar('INCOMPATIBLE_LICENSE', True) - 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"): + 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-"): # Internally, we'll use the license mapping. This way INCOMPATIBLE_LICENSE = "GPLv2" and # INCOMPATIBLE_LICENSE = "GPLv2.0" will pick up all variations of GPL-2.0 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} \ -Wl,-rpath-link,${STAGING_LIBDIR}/.. \ -Wl,-rpath,${libdir}/.. " -DEPENDS_GETTEXT = "gettext-native gettext-nativesdk" +DEPENDS_GETTEXT = "gettext-native nativesdk-gettext" # Path mangling needed by the cross packaging # 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() { localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) bb.data.update_data(localdata) - if pn.find("-nativesdk") != -1: - pnstripped = pn.split("-nativesdk") + if pn.find("nativesdk-") != -1: + pnstripped = pn.replace("nativesdk-", "") bb.note("Native Split: %s" % pnstripped) - localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) + localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES', True)) bb.data.update_data(localdata) 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): Check for ".so" library symlinks in non-dev packages """ - if not name.endswith("-dev") and not name.endswith("-dbg") and not name.endswith("-nativesdk") and path.endswith(".so") and os.path.islink(path): + if not name.endswith("-dev") and not name.endswith("-dbg") and not name.startswith("nativesdk-") and path.endswith(".so") and os.path.islink(path): messages.append("non -dev/-dbg/-nativesdk package contains symlink .so: %s path '%s'" % \ (name, package_qa_clean_path(path,d))) @@ -726,7 +726,7 @@ Rerun configure task after fixing this. The path was '%s'""" % root) 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): gt = "gettext-native" elif bb.data.inherits_class('cross-canadian', d): - gt = "gettext-nativesdk" + gt = "nativesdk-gettext" else: gt = "virtual/" + ml + "gettext" 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" export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig" export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" -PKGSUFFIX = "-nativesdk" - python nativesdk_virtclass_handler () { if not isinstance(e, bb.event.RecipePreFinalise): 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 () { targetsys = d.getVar('TARGET_SYS', True) targetvendor = d.getVar('TARGET_VENDOR', True) package_arch = d.getVar('PACKAGE_ARCH', True) or "" - if package_arch not in "all any noarch".split(): + if package_arch not in "all any noarch".split() and not package_arch.endswith("-nativesdk"): ml_prefix = (d.getVar('MLPREFIX', True) or "").replace("-", "_") d.setVar('PACKAGE_ARCH_EXTEND', ml_prefix + package_arch) 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 " PKGCONFIGRDEP = "pkgconfig" PKGCONFIGRDEP_virtclass-native = "" -PKGCONFIGRDEP_virtclass-nativesdk = "pkgconfig-nativesdk" +PKGCONFIGRDEP_virtclass-nativesdk = "nativesdk-pkgconfig" RDEPENDS_${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 @@ inherit populate_sdk_base addtask populate_sdk after do_install before do_build + 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" SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${MULTIMACH_TARGET_SYS}" -TOOLCHAIN_HOST_TASK ?= "task-sdk-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}" +TOOLCHAIN_HOST_TASK ?= "nativesdk-task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}" TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= "" TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg" TOOLCHAIN_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}" # Base package name # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" # otherwise it is the same as PN and P -SPECIAL_PKGSUFFIX = "-native -cross -initial -intermediate -nativesdk -crosssdk -cross-canadian" +SPECIAL_PKGSUFFIX = "-native -cross -initial -intermediate -crosssdk -cross-canadian" BPN = "${@base_prune_suffix(d.getVar('PN', True), d.getVar('SPECIAL_PKGSUFFIX', True).split(), d)}" BP = "${BPN}-${PV}" @@ -250,7 +250,7 @@ PROVIDES = "" PROVIDES_prepend = "${P} ${PF} ${PN} " RPROVIDES = "" -MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/libintl-nativesdk virtual/xserver virtual/update-alternatives-native virtual/update-alternatives" +MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/nativesdk-libintl virtual/xserver virtual/update-alternatives-native virtual/update-alternatives" SOLIBS = ".so.*" SOLIBS_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" PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf" PREFERRED_PROVIDER_libgcc ?= "libgcc" -PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk" +PREFERRED_PROVIDER_nativesdk-libgcc ?= "nativesdk-libgcc" PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" -PREFERRED_PROVIDER_linux-libc-headers-nativesdk ?= "linux-libc-headers-nativesdk" +PREFERRED_PROVIDER_nativesdk-linux-libc-headers ?= "nativesdk-linux-libc-headers" PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" PREFERRED_PROVIDER_opkg ?= "opkg" PREFERRED_PROVIDER_opkg-native ?= "opkg-native" -PREFERRED_PROVIDER_opkg-nativesdk ?= "opkg-nativesdk" +PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" PREFERRED_PROVIDER_console-tools ?= "kbd" PREFERRED_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" OVERRIDES .= "${LIBCOVERRIDE}" PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" -PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk" +PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-eglibc" PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" PREFERRED_PROVIDER_virtual/libc ?= "eglibc" -PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "eglibc-nativesdk" +PREFERRED_PROVIDER_virtual/nativesdk-libc ?= "nativesdk-eglibc" PREFERRED_PROVIDER_virtual/libc-locale ?= "eglibc-locale" CXXFLAGS += "-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" # Default libc config PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${TCLIBC}-nativesdk" +PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc ?= "nativesdk-${TCLIBC}" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk = "${TCLIBC}-initial-nativesdk" +PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial = "nativesdk-${TCLIBC}-initial" PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "4.7%" @@ -33,20 +33,20 @@ PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}" PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${SDKGCCVERSION}" PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-runtime-nativesdk ?= "${SDKGCCVERSION}" +PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" -PREFERRED_VERSION_libgcc-nativesdk ?= "${SDKGCCVERSION}" +PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}" PREFERRED_VERSION_binutils ?= "${BINUVERSION}" PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}" PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}" PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${BINUVERSION}" PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" -PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}" +PREFERRED_VERSION_nativesdk-linux-libc-headers ?= "${LINUXLIBCVERSION}" PREFERRED_VERSION_eglibc ?= "${EGLIBCVERSION}" PREFERRED_VERSION_eglibc-locale ?= "${EGLIBCVERSION}" -PREFERRED_VERSION_eglibc-nativesdk ?= "${EGLIBCVERSION}" +PREFERRED_VERSION_nativesdk-eglibc ?= "${EGLIBCVERSION}" PREFERRED_VERSION_eglibc-initial ?= "${EGLIBCVERSION}" -PREFERRED_VERSION_eglibc-initial-nativesdk ?= "${EGLIBCVERSION}" +PREFERRED_VERSION_nativesdk-eglibc-initial ?= "${EGLIBCVERSION}" PREFERRED_VERSION_cross-localedef-native ?= "${EGLIBCVERSION}" PREFERRED_VERSION_uclibc ?= "${UCLIBCVERSION}" PREFERRED_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): def isCross(x): return x.endswith("-cross") or x.endswith("-cross-initial") or x.endswith("-cross-intermediate") def isNativeSDK(x): - return x.endswith("-nativesdk") + return x.startswith("nativesdk-") def isKernel(fn): inherits = " ".join(dataCache.inherits[fn]) 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 \ X11DEPENDS = "virtual/libx11 libsm" DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" DEPENDS_virtclass-native = "expat-native virtual/libintl-native" -DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk virtual/libx11" +DEPENDS_virtclass-nativesdk = "nativesdk-expat virtual/nativesdk-libintl virtual/libx11" INC_PR = "r3" 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" # default to disabled ENABLE_BINARY_LOCALE_GENERATION ?= "0" -ENABLE_BINARY_LOCALE_GENERATION_pn-eglibc-locale-nativesdk = "0" +ENABLE_BINARY_LOCALE_GENERATION_pn-nativesdk-eglibc-locale = "0" #enable locale generation on these arches # BINARY_LOCALE_ARCHES is a space separated list of regular expressions @@ -29,16 +29,13 @@ LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" PR = "r22" -PKGSUFFIX = "" -PKGSUFFIX_virtclass-nativesdk = "-nativesdk" +PROVIDES = "virtual/libc-locale" -PROVIDES = "virtual/libc-locale${PKGSUFFIX}" - -PACKAGES = "localedef${PKGSUFFIX} ${PN}-dbg" +PACKAGES = "localedef ${PN}-dbg" PACKAGES_DYNAMIC = "locale-base-* \ eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \ - glibc-gconv-*${PKGSUFFIX} glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" + glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-*" # Create a eglibc-binaries package ALLOW_EMPTY_${BPN}-binaries = "1" @@ -67,7 +64,7 @@ DESCRIPTION_localedef = "eglibc: compile locale definition files" # Explicitly add ${MLPREFIX} for FILES_eglibc-gconv. FILES_${MLPREFIX}eglibc-gconv = "${libdir}/gconv/*" FILES_${PN}-dbg += "${libdir}/gconv/.debug/*" -FILES_localedef${PKGSUFFIX} = "${bindir}/localedef" +FILES_localedef = "${bindir}/localedef" LOCALETREESRC = "${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}" @@ -93,6 +90,6 @@ do_install () { inherit libc-package -do_install[depends] += "virtual/${MLPREFIX}libc${PKGSUFFIX}:do_populate_sysroot" +do_install[depends] += "virtual/${MLPREFIX}libc:do_populate_sysroot" BBCLASSEXTEND = "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 () { # Set this to zero if you don't want ldconfig in the output package USE_LDCONFIG ?= "1" -PKGSUFFIX = "" -PKGSUFFIX_virtclass-nativesdk = "-nativesdk" - -PACKAGES = "${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}" +PACKAGES = "${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" # The ld.so in this eglibc supports the GNU_HASH -RPROVIDES_${PN} = "glibc${PKGSUFFIX} rtld(GNU_HASH)" -RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils" -RPROVIDES_${PN}-mtrace = "glibc${PKGSUFFIX}-mtrace libc-mtrace" -RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic" -RPROVIDES_${PN}-dev = "glibc${PKGSUFFIX}-dev" -RPROVIDES_${PN}-staticdev = "glibc${PKGSUFFIX}-staticdev" -RPROVIDES_${PN}-doc = "glibc${PKGSUFFIX}-doc" -RPROVIDES_eglibc-extra-nss${PKGSUFFIX} = "glibc-extra-nss${PKGSUFFIX}" -RPROVIDES_eglibc-thread-db${PKGSUFFIX} = "glibc-thread-db${PKGSUFFIX}" -RPROVIDES_${PN}-pcprofile = "glibc${PKGSUFFIX}-pcprofile" -RPROVIDES_${PN}-dbg = "glibc-dbg${PKGSUFFIX}" +RPROVIDES_${PN} = "glibc rtld(GNU_HASH)" +RPROVIDES_${PN}-utils = "glibc-utils" +RPROVIDES_${PN}-mtrace = "glibc-mtrace libc-mtrace" +RPROVIDES_${PN}-pic = "glibc-pic" +RPROVIDES_${PN}-dev = "glibc-dev" +RPROVIDES_${PN}-staticdev = "glibc-staticdev" +RPROVIDES_${PN}-doc = "glibc-doc" +RPROVIDES_eglibc-extra-nss = "glibc-extra-nss" +RPROVIDES_eglibc-thread-db = "glibc-thread-db" +RPROVIDES_${PN}-pcprofile = "glibc-pcprofile" +RPROVIDES_${PN}-dbg = "glibc-dbg" libc_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" FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}" -FILES_ldd${PKGSUFFIX} = "${bindir}/ldd" -FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*" -FILES_libcidn${PKGSUFFIX} = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" -FILES_libmemusage${PKGSUFFIX} = "${base_libdir}/libmemusage.so" -FILES_eglibc-extra-nss${PKGSUFFIX} = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" -FILES_sln${PKGSUFFIX} = "/sbin/sln" +FILES_ldd = "${bindir}/ldd" +FILES_libsegfault = "${base_libdir}/libSegFault*" +FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" +FILES_libmemusage = "${base_libdir}/libmemusage.so" +FILES_eglibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" +FILES_sln = "/sbin/sln" FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" -FILES_libsotruss${PKGSUFFIX} = "${libdir}/audit/sotruss-lib.so" +FILES_libsotruss = "${libdir}/audit/sotruss-lib.so" FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" FILES_${PN}-dev += "${bindir}/rpcgen ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" -FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" +FILES_nscd = "${sbindir}/nscd*" FILES_${PN}-mtrace = "${bindir}/mtrace" FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" -FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" -RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" +FILES_catchsegv = "${bindir}/catchsegv" +RDEPENDS_catchsegv = "libsegfault" RDEPENDS_${PN}-utils += "bash" RDEPENDS_${PN}-mtrace += "perl" FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so" -FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" +FILES_eglibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" RPROVIDES_${PN}-dev += "libc-dev" RPROVIDES_${PN}-staticdev += "libc-staticdev" @@ -65,8 +62,8 @@ SUMMARY_sln = "The static ln." DESCRIPTION_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." SUMMARY_nscd = "Name service cache daemon" DESCRIPTION_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." -SUMMARY_eglibc-extra-nss${PKGSUFFIX} = "hesiod, NIS and NIS+ nss libraries" -DESCRIPTION_eglibc-extra-nss${PKGSUFFIX} = "eglibc: nis, nisplus and hesiod search services." +SUMMARY_eglibc-extra-nss = "hesiod, NIS and NIS+ nss libraries" +DESCRIPTION_eglibc-extra-nss = "eglibc: nis, nisplus and hesiod search services." SUMMARY_ldd = "print shared library dependencies" DESCRIPTION_ldd = "/usr/bin/ldd prints shared library dependencies for each program or shared library specified on the command line." SUMMARY_${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" DEPENDS += "libffi python-argparse-native zlib" DEPENDS_virtclass-native += "libffi-native python-argparse-native" -DEPENDS_virtclass-nativesdk += "libffi-nativesdk python-argparse-native zlib-nativesdk ${BPN}-native" +DEPENDS_virtclass-nativesdk += "nativesdk-libffi python-argparse-native nativesdk-zlib ${BPN}-native" SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" 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" DEPENDS = "glib-2.0-native zip virtual/libiconv" DEPENDS_virtclass-native = "pkgconfig-native gettext-native" -DEPENDS_virtclass-nativesdk = "libtool-nativesdk" +DEPENDS_virtclass-nativesdk = "nativesdk-libtool" PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen" LEAD_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" IPKG_HOST = "opkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}" TOOLCHAIN_HOST_TASK ?= "\ - python-nativesdk-core \ - python-nativesdk-textutils \ - python-nativesdk-sqlite3 \ - python-nativesdk-pickle \ - python-nativesdk-logging \ - python-nativesdk-elementtree \ - python-nativesdk-curses \ - python-nativesdk-compile \ - python-nativesdk-compiler \ - python-nativesdk-fcntl \ - python-nativesdk-shell \ - python-nativesdk-misc \ - python-nativesdk-multiprocessing \ - python-nativesdk-subprocess \ - python-nativesdk-xmlrpc \ - python-nativesdk-netclient \ - python-nativesdk-netserver \ - python-nativesdk-distutils \ - chrpath-nativesdk \ + nativesdk-python-core \ + nativesdk-python-textutils \ + nativesdk-python-sqlite3 \ + nativesdk-python-pickle \ + nativesdk-python-logging \ + nativesdk-python-elementtree \ + nativesdk-python-curses \ + nativesdk-python-compile \ + nativesdk-python-compiler \ + nativesdk-python-fcntl \ + nativesdk-python-shell \ + nativesdk-python-misc \ + nativesdk-python-multiprocessing \ + nativesdk-python-subprocess \ + nativesdk-python-xmlrpc \ + nativesdk-python-netclient \ + nativesdk-python-netserver \ + nativesdk-python-distutils \ + nativesdk-chrpath \ " TOOLCHAIN_OUTPUTNAME ?= "python-nativesdk-standalone-${SDKMACHINE}" diff --git a/meta/recipes-core/tasks/nativesdk-task-sdk-host.bb b/meta/recipes-core/tasks/nativesdk-task-sdk-host.bb new file mode 100644 index 0000000000..ea054bc9c9 --- /dev/null +++ b/meta/recipes-core/tasks/nativesdk-task-sdk-host.bb @@ -0,0 +1,35 @@ +# +# Copyright (C) 2007 OpenedHand Ltd +# + +DESCRIPTION = "Host packages for the standalone SDK or external toolchain" +PR = "r11" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +inherit nativesdk + +PACKAGES = "${PN}" + +RDEPENDS_${PN} = "\ + nativesdk-pkgconfig \ + nativesdk-qemu \ + nativesdk-qemu-helper \ + nativesdk-pseudo \ + nativesdk-unfs-server \ + nativesdk-opkg \ + nativesdk-libtool \ + nativesdk-autoconf \ + nativesdk-automake \ + " + +RDEPENDS_${PN}_darwin8 = "\ + odcctools-cross-canadian \ + llvm-cross-canadian \ + nativesdk-pkgconfig \ + nativesdk-opkg \ + nativesdk-libtool \ + " diff --git a/meta/recipes-core/tasks/task-sdk-host-nativesdk.bb b/meta/recipes-core/tasks/task-sdk-host-nativesdk.bb deleted file mode 100644 index 920f359eea..0000000000 --- a/meta/recipes-core/tasks/task-sdk-host-nativesdk.bb +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd -# - -DESCRIPTION = "Host packages for the standalone SDK or external toolchain" -PR = "r11" -LICENSE = "MIT" -ALLOW_EMPTY = "1" - -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -inherit nativesdk - -PACKAGES = "${PN}" - -RDEPENDS_${PN} = "\ - pkgconfig-nativesdk \ - qemu-nativesdk \ - qemu-helper-nativesdk \ - pseudo-nativesdk \ - unfs-server-nativesdk \ - opkg-nativesdk \ - libtool-nativesdk \ - autoconf-nativesdk \ - automake-nativesdk \ - " - -RDEPENDS_${PN}_darwin8 = "\ - odcctools-cross-canadian \ - llvm-cross-canadian \ - pkgconfig-nativesdk \ - opkg-nativesdk \ - libtool-nativesdk \ - " 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/" SECTION = "devel" DEPENDS += "m4-native" DEPENDS_virtclass-native = "m4-native gnu-config-native" -DEPENDS_virtclass-nativesdk = "m4-nativesdk gnu-config-nativesdk" +DEPENDS_virtclass-nativesdk = "nativesdk-m4 nativesdk-gnu-config" RDEPENDS_${PN} = "m4 gnu-config" RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native" -RDEPENDS_${PN}_virtclass-nativesdk = "m4-nativesdk gnu-config-nativesdk" +RDEPENDS_${PN}_virtclass-nativesdk = "nativesdk-m4 nativesdk-gnu-config" SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz \ 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} += "\ perl-module-vars " RDEPENDS_${PN}_virtclass-native = "autoconf-native perl-native-runtime" -RDEPENDS_${PN}_virtclass-nativesdk = "autoconf-nativesdk" +RDEPENDS_${PN}_virtclass-nativesdk = "nativesdk-autoconf" PATHFIXPATCH = "file://path_prog_fixes.patch" PATHFIXPATCH_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_ PN = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" BPN = "binutils" -DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/libc-nativesdk zlib-nativesdk gettext-nativesdk" +DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/nativesdk-libc nativesdk-zlib nativesdk-gettext" EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ " do_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} PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" BPN = "gcc" -DEPENDS = "virtual/${HOST_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc gettext-nativesdk" +DEPENDS = "virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc gettext" 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 require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" -RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" +DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils" +RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc nativesdk-elfutils" SYSTEMHEADERS = "/usr/include" SYSTEMLIBS = "${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}/" GCCMULTILIB = "--disable-multilib" -DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc-nativesdk gettext-native" +DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk virtual/nativesdk-${TARGET_PREFIX}libc-for-gcc gettext-native" PROVIDES = "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" DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" -PKGSUFFIX = "" -PKGSUFFIX_virtclass-nativesdk = "-nativesdk" - PACKAGES = "\ ${PN} \ ${PN}-dev \ ${PN}-dbg \ - libgcov${PKGSUFFIX}-dev \ + libgcov-dev \ " FILES_${PN} = "${base_libdir}/libgcc*.so.*" @@ -19,7 +16,7 @@ FILES_${PN}-dev = " \ ${base_libdir}/libgcc*.so \ ${libdir}/${TARGET_SYS}/${BINV}/*crt* \ ${libdir}/${TARGET_SYS}/${BINV}/libgcc*" -FILES_libgcov${PKGSUFFIX}-dev = " \ +FILES_libgcov-dev = " \ ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \ " FILES_${PN}-dbg += "${base_libdir}/.debug/" @@ -72,4 +69,4 @@ do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package" BBCLASSEXTEND = "nativesdk" INSANE_SKIP_${PN}-dev = "staticdev" -INSANE_SKIP_${MLPREFIX}libgcov${PKGSUFFIX}-dev = "staticdev" +INSANE_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" PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" BPN = "gdb" -DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk readline-nativesdk python-nativesdk" -RDEPENDS += "python-nativesdk-core python-nativesdk-lang python-nativesdk-re \ - python-nativesdk-codecs python-nativesdk-netclient" +DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext nativesdk-readline nativesdk-python" +RDEPENDS += "nativesdk-python-core nativesdk-python-lang nativesdk-python-re \ + nativesdk-python-codecs nativesdk-python-netclient" EXTRA_OECONF_append = "--with-python=${WORKDIR}/python" @@ -30,3 +30,4 @@ EOF do_install_append() { rm -rf ${D}${exec_prefix}/lib } + 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 () { sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \ -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize # In the native case we want the system perl as perl-native can't have built yet - if [ "${PN}" != "gnu-config-native" -a "${PN}" != "gnu-config-nativesdk" ]; then + if [ "${PN}" != "gnu-config-native" -a "${PN}" != "nativesdk-gnu-config" ]; then sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize fi 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 () { sed -e 's,@gnu-configdir@,${datadir}/gnu-config,g' \ -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize # In the native case we want the system perl as perl-native can't have built yet - if [ "${PN}" != "gnu-config-native" -a "${PN}" != "gnu-config-nativesdk" ]; then + if [ "${PN}" != "gnu-config-native" -a "${PN}" != "nativesdk-gnu-config" ]; then sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize fi 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 BASE_HOSTSDK_PKGNAMES="pseudo opkg pkgconfig libtool autoconf automake" for pkg in $BASE_HOSTSDK_PKGNAMES; do echo_info "Installing ${pkg} nativesdk ...\n" - $OPKG_INSTALL_NATIVE_CMD ${pkg}-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE + $OPKG_INSTALL_NATIVE_CMD nativesdk-${pkg} &>> $YOCTOADT_INSTALL_LOG_FILE check_result done @@ -142,15 +142,15 @@ done if [ "$YOCTOADT_QEMU" == "Y" ] || [ "$YOCTOADT_QEMU" = "y" ]; then echo_info "\nInstalling qemu native ..." - $OPKG_INSTALL_NATIVE_CMD qemu-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE + $OPKG_INSTALL_NATIVE_CMD nativesdk-qemu &>> $YOCTOADT_INSTALL_LOG_FILE check_result - $OPKG_INSTALL_NATIVE_CMD qemu-helper-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE + $OPKG_INSTALL_NATIVE_CMD nativesdk-qemu-helper &>> $YOCTOADT_INSTALL_LOG_FILE check_result fi if [ "$YOCTOADT_NFS_UTIL" == "Y" ] || [ "$YOCTOADT_NFS_UTIL" == "y" ]; then echo_info "\nInstalling unfs ..." - $OPKG_INSTALL_NATIVE_CMD unfs-server-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE + $OPKG_INSTALL_NATIVE_CMD nativesdk-unfs-server &>> $YOCTOADT_INSTALL_LOG_FILE check_result fi 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+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://src/opkg-cl.c;beginline=1;endline=20;md5=321f658c3f6b6c832e25c8850b5dffba" DEPENDS_virtclass-native = "curl-native" -DEPENDS_virtclass-nativesdk = "curl-nativesdk" +DEPENDS_virtclass-nativesdk = "nativesdk-curl" PE = "1" INC_PR = "r10" @@ -41,12 +41,12 @@ RDEPENDS_${PN}_virtclass-nativesdk = "" PACKAGE_ARCH_update-alternatives-cworth = "all" RREPLACES_${PN} = "opkg-nogpg" -PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX}-staticdev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" +PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg update-alternatives-cworth" -FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives" -FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.la ${libdir}/*.so" -FILES_libopkg${PKGSUFFIX}-staticdev = "${libdir}/*.a" -FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" +FILES_update-alternatives-cworth = "${bindir}/update-alternatives" +FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so" +FILES_libopkg-staticdev = "${libdir}/*.a" +FILES_libopkg = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" # We need to create the lock directory do_install_append() { @@ -75,9 +75,6 @@ ALTERNATIVE_TARGET[opkg] = "${bindir}/opkg-cl" BBCLASSEXTEND = "native nativesdk" -PKGSUFFIX = "" -PKGSUFFIX_virtclass-nativesdk = "-nativesdk" - # Define a variable to allow distros to run configure earlier. # (for example, to enable loading of ethernet kernel modules before networking starts) POSTINSTALL_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 () { } PACKAGES_DYNAMIC = "perl-module-*" +PACKAGES_DYNAMIC_virtclass-nativesdk = "nativesdk-perl-module-*" RPROVIDES_perl-lib = "perl-lib" @@ -311,3 +312,4 @@ require perl-rprovides_${PV}.inc SSTATE_SCAN_FILES += "*.pm *.pod *.h *.pl *.sh" +BBCLASSEXTEND = "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 RPROVIDES_${PN}-core = "${PN}" RRECOMMENDS_${PN}-core = "${PN}-readline" RRECOMMENDS_${PN}-crypt = "openssl" -RRECOMMENDS_${PN}-crypt_virtclass-nativesdk = "openssl-nativesdk" +RRECOMMENDS_${PN}-crypt_virtclass-nativesdk = "nativesdk-openssl" # package libpython2 -PACKAGES =+ "lib${BPN}2${PKGSUFFIX}" -FILES_lib${BPN}2${PKGSUFFIX} = "${libdir}/libpython*.so.*" +PACKAGES =+ "lib${BPN}2" +FILES_lib${BPN}2 = "${libdir}/libpython*.so.*" # catch debug extensions (isn't that already in python-core-dbg?) FILES_${PN}-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug" @@ -166,6 +166,3 @@ PACKAGES += "${PN}-man" FILES_${PN}-man = "${datadir}/man" BBCLASSEXTEND = "nativesdk" - -PKGSUFFIX = "" -PKGSUFFIX_virtclass-nativesdk = "-nativesdk" diff --git a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb new file mode 100644 index 0000000000..fbf9e771df --- /dev/null +++ b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb @@ -0,0 +1,49 @@ +SUMMARY = "Qemu helper scripts" +DESCRIPTION = "Qemu helper scripts" +LICENSE = "GPLv2" +RDEPENDS_${PN} = "nativesdk-qemu" +PR = "r9" + +FILESPATH = "${FILE_DIRNAME}/qemu-helper" + +LIC_FILES_CHKSUM = "file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999 \ + file://${COREBASE}/scripts/runqemu;endline=18;md5=77fbe442a88b1bcdc29c3ba67733b21b" + + +SRC_URI = "file://${COREBASE}/scripts/runqemu \ + file://${COREBASE}/scripts/runqemu-internal \ + file://${COREBASE}/scripts/runqemu-addptable2image \ + file://${COREBASE}/scripts/runqemu-gen-tapdevs \ + file://${COREBASE}/scripts/runqemu-ifup \ + file://${COREBASE}/scripts/runqemu-ifdown \ + file://${COREBASE}/scripts/oe-find-native-sysroot \ + file://${COREBASE}/scripts/runqemu-extract-sdk \ + file://${COREBASE}/scripts/runqemu-export-rootfs \ + file://tunctl.c \ + file://raw2flash.c \ + " + +S = "${WORKDIR}" + +inherit nativesdk + +do_compile() { + ${CC} tunctl.c -o tunctl + ${CC} raw2flash.c -o raw2flash.spitz + ${CC} raw2flash.c -o flash2raw.spitz -Dflash2raw +} + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}${COREBASE}/scripts/oe-* ${D}${bindir}/ + install -m 0755 ${WORKDIR}${COREBASE}/scripts/runqemu* ${D}${bindir}/ + install tunctl ${D}${bindir}/ + install raw2flash.spitz ${D}${bindir}/ + install flash2raw.spitz ${D}${bindir}/ + ln -fs raw2flash.spitz ${D}${bindir}/raw2flash.akita + ln -fs raw2flash.spitz ${D}${bindir}/raw2flash.borzoi + ln -fs raw2flash.spitz ${D}${bindir}/raw2flash.terrier + ln -fs flash2raw.spitz ${D}${bindir}/flash2raw.akita + ln -fs flash2raw.spitz ${D}${bindir}/flash2raw.borzoi + ln -fs flash2raw.spitz ${D}${bindir}/flash2raw.terrier +} diff --git a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb b/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb deleted file mode 100644 index df0cae068e..0000000000 --- a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "Qemu helper scripts" -DESCRIPTION = "Qemu helper scripts" -LICENSE = "GPLv2" -RDEPENDS_${PN} = "qemu-nativesdk" -PR = "r9" - -FILESPATH = "${FILE_DIRNAME}/qemu-helper" - -LIC_FILES_CHKSUM = "file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999 \ - file://${COREBASE}/scripts/runqemu;endline=18;md5=77fbe442a88b1bcdc29c3ba67733b21b" - - -SRC_URI = "file://${COREBASE}/scripts/runqemu \ - file://${COREBASE}/scripts/runqemu-internal \ - file://${COREBASE}/scripts/runqemu-addptable2image \ - file://${COREBASE}/scripts/runqemu-gen-tapdevs \ - file://${COREBASE}/scripts/runqemu-ifup \ - file://${COREBASE}/scripts/runqemu-ifdown \ - file://${COREBASE}/scripts/oe-find-native-sysroot \ - file://${COREBASE}/scripts/runqemu-extract-sdk \ - file://${COREBASE}/scripts/runqemu-export-rootfs \ - file://tunctl.c \ - file://raw2flash.c \ - " - -S = "${WORKDIR}" - -inherit nativesdk - -do_compile() { - ${CC} tunctl.c -o tunctl - ${CC} raw2flash.c -o raw2flash.spitz - ${CC} raw2flash.c -o flash2raw.spitz -Dflash2raw -} - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}${COREBASE}/scripts/oe-* ${D}${bindir}/ - install -m 0755 ${WORKDIR}${COREBASE}/scripts/runqemu* ${D}${bindir}/ - install tunctl ${D}${bindir}/ - install raw2flash.spitz ${D}${bindir}/ - install flash2raw.spitz ${D}${bindir}/ - ln -fs raw2flash.spitz ${D}${bindir}/raw2flash.akita - ln -fs raw2flash.spitz ${D}${bindir}/raw2flash.borzoi - ln -fs raw2flash.spitz ${D}${bindir}/raw2flash.terrier - ln -fs flash2raw.spitz ${D}${bindir}/flash2raw.akita - ln -fs flash2raw.spitz ${D}${bindir}/flash2raw.borzoi - ln -fs flash2raw.spitz ${D}${bindir}/flash2raw.terrier -} 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 do_configure() { # Handle distros such as CentOS 5 32-bit that do not have kvm support KVMOPTS="--disable-kvm" - if [ "${PN}" != "qemu-native" -a "${PN}" != "qemu-nativesdk" ] \ + if [ "${PN}" != "qemu-native" -a "${PN}" != "nativesdk-qemu" ] \ || [ -f /usr/include/linux/kvm.h ] ; then KVMOPTS="--enable-kvm" fi @@ -41,8 +41,8 @@ do_install () { PACKAGECONFIG ??= "" DEPENDS_virtclass-native = "zlib-native alsa-lib-native glib-2.0-native" -DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk glib-2.0-nativesdk" -RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk" +DEPENDS_virtclass-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0" +RDEPENDS_virtclass-nativesdk = "nativesdk-libsdl" EXTRA_OECONF_virtclass-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls \ --disable-curl \ " 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" RDEPENDS_${PN} = "pseudo" RDEPENDS_${PN}_virtclass-native = "pseudo-native" -RDEPENDS_${PN}_virtclass-nativesdk = "pseudo-nativesdk" +RDEPENDS_${PN}_virtclass-nativesdk = "nativesdk-pseudo" BASEPV = "2.2beta47" PR = "r1" @@ -73,6 +73,6 @@ python __anonymous () { import re pn = d.getVar("PN", True) - if not pn.endswith('-native') and not pn.endswith('-nativesdk'): + if not pn.endswith('-native') and not pn.startswith('nativesdk-'): raise bb.parse.SkipPackage("unfs-server is intended for native/nativesdk builds only") } 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 SRC_URI[patch010.md5sum] = "0a51602b535ef661ee707be6c8bdb373" SRC_URI[patch010.sha256sum] = "acfc5482c25e6923116fcf4b4f7f6345b80f75ad7299749db4b736ad67aa43dc" +BBCLASSEXTEND = "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" RDEPENDS_libbz2-staticdev = "libbz2-dev (= ${EXTENDPKGV})" PROVIDES_append_virtclass-native = " bzip2-replacement-native" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" + 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)} \ ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ tslib" -DEPENDS_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk', '', d)}" +DEPENDS_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" PR = "r0" 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" do_install () { install -d ${D}${libdir}/ - if [ "${PN}" != "qemugl-nativesdk" ]; then + if [ "${PN}" != "nativesdk-qemugl" ]; then install -m 0755 ${S}/libGL.so.1.2 ${D}${libdir}/libGL-qemu.so.1.2 else 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 DEPENDS = "elfutils sqlite3 systemtap-native" DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native" -DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk" +DEPENDS_virtclass-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext" PR = "r0" 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" EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no " -PKGSUFFIX = "" -PKGSUFFIX_virtclass-nativesdk = "-nativesdk" - -PACKAGES =+ "alsa-server${PKGSUFFIX} libasound${PKGSUFFIX} alsa-conf-base${PKGSUFFIX} alsa-conf${PKGSUFFIX} alsa-doc${PKGSUFFIX} alsa-dev${PKGSUFFIX}" +PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" FILES_${PN} += "${libdir}/${BPN}/smixer/*.so" FILES_${PN}-dbg += "${libdir}/${BPN}/smixer/.debug" FILES_${PN}-dev += "${libdir}/${BPN}/smixer/*.la" -FILES_libasound${PKGSUFFIX} = "${libdir}/libasound.so.*" -FILES_alsa-server${PKGSUFFIX} = "${bindir}/*" -FILES_alsa-conf${PKGSUFFIX} = "${datadir}/alsa/" -FILES_alsa-dev${PKGSUFFIX} += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" -FILES_alsa-conf-base${PKGSUFFIX} = "\ +FILES_libasound = "${libdir}/libasound.so.*" +FILES_alsa-server = "${bindir}/*" +FILES_alsa-conf = "${datadir}/alsa/" +FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" +FILES_alsa-conf-base = "\ ${datadir}/alsa/alsa.conf \ ${datadir}/alsa/cards/aliases.conf \ ${datadir}/alsa/pcm/default.conf \ ${datadir}/alsa/pcm/dmix.conf \ ${datadir}/alsa/pcm/dsnoop.conf" -RDEPENDS_libasound${PKGSUFFIX} = "alsa-conf-base${PKGSUFFIX}" +RDEPENDS_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 @@ # Qt Embedded toolchain PR = "r5" -TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}" +TOOLCHAIN_HOST_TASK = "nativesdk-task-qte-toolchain-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}" TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target" TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}" 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 @@ -Remove "const" usage that causes compile failure building qt4-tools-nativesdk +Remove "const" usage that causes compile failure building nativesdk-qt4-tools Upstream-Status: Denied [possible retry] diff --git a/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb new file mode 100644 index 0000000000..e17a8ad808 --- /dev/null +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb @@ -0,0 +1,8 @@ +require qt4-tools-nativesdk.inc + +PR = "${INC_PR}.1" + +SRC_URI += "file://qmake_pri_fixes.patch" + +SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff" +SRC_URI[sha256sum] = "ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8" diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb deleted file mode 100644 index e17a8ad808..0000000000 --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require qt4-tools-nativesdk.inc - -PR = "${INC_PR}.1" - -SRC_URI += "file://qmake_pri_fixes.patch" - -SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff" -SRC_URI[sha256sum] = "ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8" 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 @@ +require recipes-core/tasks/nativesdk-task-sdk-host.bb + +DESCRIPTION = "Host packages for Qt Embedded SDK" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +RDEPENDS_${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 @@ -require recipes-core/tasks/task-sdk-host-nativesdk.bb - -DESCRIPTION = "Host packages for Qt Embedded SDK" -LICENSE = "MIT" -ALLOW_EMPTY = "1" - -RDEPENDS_${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 DEPENDS = "zlib gnutls" DEPENDS_virtclass-native = "zlib-native openssl-native" -DEPENDS_virtclass-nativesdk = "zlib-nativesdk" +DEPENDS_virtclass-nativesdk = "nativesdk-zlib" PR = "r1" SRC_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}" export config_TARGET_CFLAGS = "${CFLAGS}" export config_TARGET_LFLAGS = "${LDFLAGS}" -PKGSUFFIX = "" -PKGSUFFIX_virtclass-nativesdk = "-nativesdk" - -PACKAGES = "lib${BPN}${PKGSUFFIX} lib${BPN}${PKGSUFFIX}-dev lib${BPN}${PKGSUFFIX}-doc ${PN}-dbg lib${BPN}${PKGSUFFIX}-staticdev ${PN}" +PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN}-dbg lib${BPN}-staticdev ${PN}" FILES_${PN} = "${bindir}/*" -FILES_lib${BPN}${PKGSUFFIX} = "${libdir}/*.so.*" -FILES_lib${BPN}${PKGSUFFIX}-dev = "${libdir}/*.la ${libdir}/*.so \ +FILES_lib${BPN} = "${libdir}/*.so.*" +FILES_lib${BPN}-dev = "${libdir}/*.la ${libdir}/*.so \ ${libdir}/pkgconfig ${includedir}" -FILES_lib${BPN}${PKGSUFFIX}-doc = "${docdir} ${mandir} ${infodir}" -FILES_lib${BPN}${PKGSUFFIX}-staticdev = "${libdir}/lib*.a" -AUTO_LIBNAME_PKGS = "lib${BPN}${PKGSUFFIX}" +FILES_lib${BPN}-doc = "${docdir} ${mandir} ${infodir}" +FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" +AUTO_LIBNAME_PKGS = "lib${BPN}" BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3