merge of '8ccf578d98540e0fe880015d1158e3f2e2d5fada'

     and 'ffc6a1cb8a5c35ab9fdca8add26efc64679665b5'

6 files changed, 10 insertions, 7 deletions

diff --git a/conf/distro/angstrom-2007.1-legacy.conf b/conf/distro/angstrom-2007.1-legacy.conf
index a22a35d204..298c8589e3 100644
--- a/conf/distro/angstrom-2007.1-legacy.conf
+++ b/conf/distro/angstrom-2007.1-legacy.conf
@@ -4,6 +4,6 @@
 #      * no sysfs
 #      * no EABI for ARM
 
-require conf/distro/angstrom-2007.1-oabi.conf
+require conf/distro/angstrom-2007.1.conf
 
 # We'll have to fill this in as we go.
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 39783154db..32aab045ad 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -13,7 +13,7 @@ DISTRO_REVISION = "46"
 require conf/distro/include/sane-srcdates.inc
 
 #This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
-ARM_ABI = "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad']]}"
+ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 require conf/distro/include/angstrom${ARM_ABI}.inc
 
 #Images built can have to modes:
@@ -50,10 +50,12 @@ FEED_ARCH_aximx50	= "armv5te"
 FEED_ARCH_akita		= "armv5te"
 FEED_ARCH_at91sam9263ek = "armv5te"
 FEED_ARCH_c7x0		= "armv5te"
+FEED_ARCH_compulab-pxa270 = "armv5te"
 FEED_ARCH_h2200		= "armv5te"
 FEED_ARCH_h3900		= "armv5te"
 FEED_ARCH_h4000		= "armv5te"
 FEED_ARCH_h5000		= "armv5te"
+FEED_ARCH_htctornado    = "armv5te"
 FEED_ARCH_htcuniversal 	= "armv5te"
 FEED_ARCH_hx2000	= "armv5te"
 FEED_ARCH_hx4700	= "armv5te"
@@ -88,6 +90,7 @@ FEED_ARCH_collie        = "arm-oabi"
 FEED_ARCH_h3600         = "arm-oabi"
 FEED_ARCH_h3800         = "arm-oabi"
 FEED_ARCH_simpad        = "arm-oabi"
+FEED_ARCH_htcwallaby    = "arm-oabi"
 
 #Tweak packaging for strongarm machines since they can't use EABI
 
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index fdc814c49c..957042d7e4 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) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad']]}"
+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']]}"
 
 #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 0f20e9c29d..59d40957d5 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -7,7 +7,7 @@ PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
 
-TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad']]}"
+TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][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 = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d)  in ['bfin']]}"
 
 #mess with compiler flags to use -Os instead of -O2
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 75e8b86e4d..6409263830 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -43,7 +43,7 @@ SRCDATE_zaurusd ?= "20060628"
 # GPE
 SRCDATE_dasher-gpe  ?= "20060814"
 SRCDATE_rosetta ?= "20060804"
-SRCDATE_gpesyncd ?= "20061128"
+SRCDATE_gpesyncd ?= "20070701"
 
 # GNOME
 SRCDATE_gconf-dbus ?= "20070512"
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 38ec778b7a..fd01d21397 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -6,7 +6,7 @@
 #@REQUIREMENTS: Rename arm-linux-gcc|g++ to arm-linux-gcc-2.95 and rename arm-linux-ld to arm-linux-ld-2.11.2.
 #@REQUIREMENTS: /usr/local/arm/2.95.3/bin must be in your path, like "export PATH=$PATH:/usr/local/arm/2.95.3/bin/"
 
-INHERIT += " package_ipk debian"
+INHERIT += " package_ipk debian sanity"
 
 #
 # Zaurus
@@ -29,7 +29,7 @@ export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
 # Base
 #
 DISTRO_NAME = "SharpROM"
-DISTRO_VERSION = "3.1 compatible"
+DISTRO_VERSION = "3.1-compatible"
 DISTRO_TYPE = "debug"
 
 PREFERRED_PROVIDER_virtual/arm-linux-gcc-2.95 = "sharprom-toolchain-native"