summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro/include
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 /meta/conf/distro/include
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>
Diffstat (limited to 'meta/conf/distro/include')
-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
3 files changed, 12 insertions, 12 deletions
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}"