diff options
| author | Phil Blundell <philb@gnu.org> | 2007-01-28 16:14:43 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2007-01-28 16:14:43 +0000 |
| commit | 25fd37ef987368dd32eba359273c5af98158a364 (patch) | |
| tree | 5f2320dd99ebfb6fd219bd57a9395ebddeee6537 /conf/distro/include | |
| parent | b099d3ec077475cf9e24c271fdbd4c1ddbbb70b1 (diff) | |
| parent | 6baa6c1f96b3137abdaf5d50af955115844197ae (diff) | |
merge of '7a32604865cb7ad63fbc7f14acda9e02229b44b5'
and '9ab9482d0ea26dbc9267d10e1eb42cc1a7546b6b'
Diffstat (limited to 'conf/distro/include')
| -rw-r--r-- | conf/distro/include/angstrom-glibc.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-uclibc.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 28e3b3eddd..ee41420cac 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -3,7 +3,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" +TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" #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-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 149b8ed9d8..9c3274e58f 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -6,7 +6,7 @@ PREFERRED_PROVIDER_virtual/libintl ?= "gettext" USE_NLS ?= "no" -TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}" +TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" #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/slugos.inc b/conf/distro/include/slugos.inc index 89ea08a157..4c849d095d 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -11,7 +11,6 @@ # slugos-[bl][at][gu] - a specific configuration encoded as follows: # # b or l - big or little endian -# set IXP4XX_MACHINE_ENDIAN to match # # a or t - ARM or Thumb instructions in the low level libraries # set ARM_INSTRUCTION_SET to match @@ -45,7 +44,6 @@ DISTRO_FEED ?= "unstable" # The following must also be set, they define the basic format of the build # -#IXP4XX_MACHINE_ENDIAN "be" or "le" #ARM_INSTRUCTION_SET "arm" or "thumb" #TARGET_OS "linux" or "linux-uclibc" #SLUGOS_IMAGESEX "big-endian" or "little-endian" (JFFS2 format) @@ -55,7 +53,7 @@ DISTRO_FEED ?= "unstable" USE_NLS ?= "no" # To make errors easier to identify: -DISTRO_NAME ?= "INVALID-${IXP4XX_MACHINE_ENDIAN}-${ARM_INSTRUCTION_SET}-${TARGET_OS}" +DISTRO_NAME ?= "INVALID-${SITEINFO_ENDIANESS}-${ARM_INSTRUCTION_SET}-${TARGET_OS}" DISTRO_TYPE ?= "INVALID" # The following must not be changed. |