diff options
| author | Khem Raj <raj.khem@gmail.com> | 2009-10-08 16:03:58 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-10-10 00:58:56 -0700 |
| commit | af8c8d14ffa9daf9f6ec19fa2d49c687cf5cff64 (patch) | |
| tree | cc7896d7977f17aa9bb4be369bc0b75736a5c31d /conf/distro | |
| parent | 1b703ecdda89afd3ce1f44545356a201ddb65d07 (diff) | |
conf: Decosmetize TARGET_OS
* This patch reverts the cosmetic change which used linux-gnu instead of linux
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Tested-by: Holger Freyther <zecke@selfish.org>
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/include/angstrom-eglibc.inc | 4 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-glibc.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-toolchain.inc | 13 |
3 files changed, 11 insertions, 8 deletions
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index ab3606dcca..47147a1d85 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -1,12 +1,12 @@ # eglibc: require conf/distro/include/eglibc.inc -TARGET_OS = "linux-gnu" +TARGET_OS = "linux" TARGET_OS .= "${@['','eabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" TARGET_OS .= "${@['','spe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'powerpc'] and bb.data.getVar('MACHINE',d) in ['calamari']]}" -#TARGET_OS = "linux-gnuspe" +#TARGET_OS = "linux-spe" #mess with compiler flags to use -Os instead of -O2 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 544ee4a013..28c31e35b0 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -3,7 +3,7 @@ require conf/distro/include/glibc.inc PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" -TARGET_OS = "linux-gnu" +TARGET_OS = "linux" TARGET_OS .= "${@['','eabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" #mess with compiler flags to use -Os instead of -O2 diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index 9351187fe1..561c97aeec 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -157,16 +157,16 @@ def detect_arm_abi (d): def compute_os_portion_of_target_triplet (d): import bb arm_eabi_supporting_arches = "armv6 armv6-novfp \ - armv5te iwmmxt armv7a armv7 armv6 armv5teb armv4t" + armv5te iwmmxt armv7a armv7 armv5teb armv4t" ppc_spe_supporting_arches = "ppce500v2 ppce500" if bb.data.getVar("LIBC", d, 1) == "uclibc": libc_suffix = "uclibc" else: - libc_suffix = "gnu" + libc_suffix = "" if bb.data.getVar('TARGET_ARCH',d,1) in ['bfin']: - if libc_suffix == "gnu": + if libc_suffix is not "uclibc": bb.fatal("bfin is not supported on glibc/eglibc. Please choose uclibc") else: os_suffix = "uclinux" @@ -182,7 +182,7 @@ def compute_os_portion_of_target_triplet (d): bb.fatal("DISTRO requested EABI but selected machine does not support EABI") abi_suffix = "" else: - abi_suffix = "eabi" + abi_suffix = "gnueabi" elif bparch in ppc_spe_supporting_arches.split(): abi_suffix = "spe" else: @@ -190,7 +190,10 @@ def compute_os_portion_of_target_triplet (d): else: bb.note("DISTRO_FEATURES is not set abi suffix not set") abi_suffix = "" - return os_suffix + "-" + libc_suffix + abi_suffix + if libc_suffix is not "" or abi_suffix is not "": + return os_suffix + "-" + libc_suffix + abi_suffix + else: + return os_suffix # This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} ARM_ABI = "${@detect_arm_abi(d)}" |