summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-22 17:54:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-25 14:36:30 +0100
commit819f18f8bc000f13b644edc194d2a12b4ea5fecf (patch)
tree663a684f7a3ae0133bddd46cf5984ec8369c22a9 /meta/conf
parent255719f0232df9186a0acbb9994f1fdec8dcb263 (diff)
downloadpoky-819f18f8bc000f13b644edc194d2a12b4ea5fecf.tar.gz
Move architecture specific TARGET_OS mangling into tune files
(From OE-Core rev: f10a3457cdfbb4a94978da998d178d4254632fa7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf4
-rw-r--r--meta/conf/distro/include/tclibc-eglibc.inc5
-rw-r--r--meta/conf/distro/include/tclibc-glibc.inc5
-rw-r--r--meta/conf/distro/include/tclibc-uclibc.inc5
-rw-r--r--meta/conf/machine/include/arm/arch-arm.inc2
-rw-r--r--meta/conf/machine/include/powerpc/arch-powerpc.inc2
6 files changed, 10 insertions, 13 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 380da1c5bb..46a9a82198 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -85,9 +85,11 @@ TUNE_ARCH ??= "INVALID"
85TUNE_CCARGS ??= "" 85TUNE_CCARGS ??= ""
86TUNE_FEATURES ??= "${TUNE_FEATURES_tune-${DEFAULTTUNE}}" 86TUNE_FEATURES ??= "${TUNE_FEATURES_tune-${DEFAULTTUNE}}"
87PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE} ??= "${TARGET_ARCH}" 87PACKAGE_EXTRA_ARCHS_tune-${DEFAULTTUNE} ??= "${TARGET_ARCH}"
88LIBCEXTENSION ??= ""
89ABIEXTENSION ??= ""
88 90
89TARGET_ARCH = "${TUNE_ARCH}" 91TARGET_ARCH = "${TUNE_ARCH}"
90TARGET_OS = "INVALID" 92TARGET_OS = "linux${LIBCEXTENSION}${ABIEXTENSION}"
91TARGET_VENDOR = "-oe" 93TARGET_VENDOR = "-oe"
92TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}" 94TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}"
93TARGET_PREFIX = "${TARGET_SYS}-" 95TARGET_PREFIX = "${TARGET_SYS}-"
diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc
index 9fab4dc678..8ef3cebb9a 100644
--- a/meta/conf/distro/include/tclibc-eglibc.inc
+++ b/meta/conf/distro/include/tclibc-eglibc.inc
@@ -2,10 +2,7 @@
2# eglibc specific configuration 2# eglibc specific configuration
3# 3#
4 4
5TARGET_OS = "linux" 5LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}"
6TARGET_OS_arm = "linux-gnueabi"
7TARGET_OS_armeb = "linux-gnueabi"
8TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]}"
9 6
10# Add glibc overrides to the overrides for eglibc. 7# Add glibc overrides to the overrides for eglibc.
11OVERRIDES .= ":libc-glibc" 8OVERRIDES .= ":libc-glibc"
diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc
index 0370dfa822..823195c2ad 100644
--- a/meta/conf/distro/include/tclibc-glibc.inc
+++ b/meta/conf/distro/include/tclibc-glibc.inc
@@ -2,10 +2,7 @@
2# glibc specific configuration 2# glibc specific configuration
3# 3#
4 4
5TARGET_OS = "linux" 5LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}"
6TARGET_OS_arm = "linux-gnueabi"
7TARGET_OS_armeb = "linux-gnueabi"
8TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]}"
9 6
10# Add glibc to the overrides. 7# Add glibc to the overrides.
11OVERRIDES =. "libc-glibc:" 8OVERRIDES =. "libc-glibc:"
diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc
index 7c06654ba5..e0f50a0567 100644
--- a/meta/conf/distro/include/tclibc-uclibc.inc
+++ b/meta/conf/distro/include/tclibc-uclibc.inc
@@ -2,10 +2,7 @@
2# uclibc specific configuration 2# uclibc specific configuration
3# 3#
4 4
5TARGET_OS = "linux-uclibc" 5LIBCEXTENSION = "-uclibc"
6TARGET_OS_arm = "linux-uclibceabi"
7TARGET_OS_armeb = "linux-uclibceabi"
8TARGET_OS_powerpc = "linux-uclibc${@['','spe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]}"
9 6
10# Add uclibc overrides to the overrides. 7# Add uclibc overrides to the overrides.
11OVERRIDES =. "libc-uclibc:" 8OVERRIDES =. "libc-uclibc:"
diff --git a/meta/conf/machine/include/arm/arch-arm.inc b/meta/conf/machine/include/arm/arch-arm.inc
index e773d14c2a..c517df6334 100644
--- a/meta/conf/machine/include/arm/arch-arm.inc
+++ b/meta/conf/machine/include/arm/arch-arm.inc
@@ -1 +1,3 @@
1TUNE_ARCH = "arm" 1TUNE_ARCH = "arm"
2
3ABIEXTENSION = "eabi"
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
index 5ab81d4156..17ace32a42 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
@@ -1 +1,3 @@
1TUNE_ARCH = "powerpc" 1TUNE_ARCH = "powerpc"
2
3ABIEXTENSION = "${@['','spe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]}"