[oe-commits] Graeme Gregory : angstrom-*libc.inc : fix the TARGET_OS definitions for non eabi/spe targets.

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 11bbf20b6c4636b27ac1f24b00ff99e5c14c2d3a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=11bbf20b6c4636b27ac1f24b00ff99e5c14c2d3a

Author: Graeme Gregory <dp at xora.org.uk>
Date:   Wed Oct  7 12:02:12 2009 +0100

angstrom-*libc.inc : fix the TARGET_OS definitions for non eabi/spe targets.

This is required because of changes in class/siteinfo.bbclass

---

 conf/distro/include/angstrom-eglibc.inc |    6 +++---
 conf/distro/include/angstrom-glibc.inc  |    3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 2a1b7b0..ab3606d 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -1,10 +1,10 @@
 # eglibc:
 require conf/distro/include/eglibc.inc
 
-TARGET_OS = "linux"
+TARGET_OS = "linux-gnu"
 
-TARGET_OS .= "${@['','-gnueabi'][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 .= "${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'powerpc'] and bb.data.getVar('MACHINE',d) in ['calamari']]}"
+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"
 
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 287bd9b..544ee4a 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -3,7 +3,8 @@ require conf/distro/include/glibc.inc
 
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
 
-TARGET_OS = "linux${@['','-gnueabi'][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 = "linux-gnu"
+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
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info