Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

5 files changed, 17 insertions, 8 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 9ecad8d40f..7ba31c72ca 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1330,6 +1330,10 @@ sha256=8fc06effaf8a4e4333308eedcdc6840f1c8056f2e924210f151dfc076bcd4045
 md5=19efa18fb1ef20c58b9b44e94258b814
 sha256=8fc06effaf8a4e4333308eedcdc6840f1c8056f2e924210f151dfc076bcd4045
 
+[ftp://ftp.debian.org/debian/pool/main/a/apt/apt_0.7.19.tar.gz]
+md5=0ef50176aea36cb0cce633a9b62dc7eb
+sha256=c928f5eb2baffb50e7ccf02d07a16daf867945c8aa542d500bbbbaff7bbcef42
+
 [ftp://ftp.nl.debian.org/debian/pool/main/a/apt/apt_0.7.2.tar.gz]
 md5=c66f943203fa24e85ed8c48f6ac5ad1e
 sha256=e7d58e2b202713b4df8cd5fd58bc20ba8d31c0da6e5e3b3c89a138dbf0b24ad9
@@ -4098,6 +4102,10 @@ sha256=a525f321e875a8c16f5b6942bc02ac66b0d284cc6c61704f93e74789ef89d817
 md5=dad1a4a08c475b31a6b62e7dc92fe9d2
 sha256=5287e943265b9efe5bd59cd1f3145d3fbf9e266df28938ad78e2107fde3c1587
 
+[ftp://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_1.14.23.tar.gz]
+md5=9c1744d32ceed71cbe1db863f64d329d
+sha256=7d27f2389e05b8727c6a7126c0b65d67749c170ba143e648912a88f2fe707bca
+
 [http://xorg.freedesktop.org/releases/individual/proto/dri2proto-1.1.tar.bz2]
 md5=1d70f0653b0b3a837853262dc5d34da4
 sha256=69def6d1f64b3699ec9c729596d8b096623a62bdda6bbea78ed690421d174c11
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 49fc4ac034..7a052ab4b9 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -71,11 +71,11 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
 PREFERRED_VERSION_linux-libc-headers 	= "2.6.23"
 
-#Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing.
+#Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
 PREFERRED_VERSION_glibc 		?= "2.6.1"
 PREFERRED_VERSION_glibc-initial 	?= "2.6.1"
-PREFERRED_VERSION_uclibc 		?= "0.9.29"
-PREFERRED_VERSION_uclibc-initial 	?= "0.9.29"
+PREFERRED_VERSION_uclibc        	?= "0.9.30"
+PREFERRED_VERSION_uclibc-initial	?= "0.9.30"
 
 PREFERRED_PROVIDER_avahi = "avahi"
 
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index f6afab61e9..bc5785343f 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -25,7 +25,5 @@ PREFERRED_VERSION_pkgconfig	= "0.23"
 PREFERRED_VERSION_pkgconfig-native = "0.23"
 PREFERRED_VERSION_pulseaudio 	= "0.9.10"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
-PREFERRED_VERSION_uclibc-initial = "0.9.30"
-PREFERRED_VERSION_uclibc        = "0.9.30"
 PREFERRED_VERSION_udev 		= "124"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 25dee11ff2..189e7123d5 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -32,6 +32,8 @@ require conf/distro/include/angstrom-${ANGSTROMLIBC}.inc
 # We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc
 ANGSTROM_ARM_INSTRUCTION_SET ?= "arm"
 ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb"
+ANGSTROM_ARM_INSTRUCTION_SET_armv5te = "thumb"
+
 
 ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}"
 # "arm" "thumb"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index a94e5ba40b..966f2e2f57 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -39,10 +39,11 @@ SRCREV_pn-essential-dialer ?= "60"
 SRCREV_pn-exalt ?= "79"
 SRCREV_pn-exalt-daemon ?= "78"
 SRCREV_pn-exalt-module ?= "78"
-SRCREV_pn-ezx-boot-usb-native ?= "2367"
+SRCREV_pn-ezx-boot-usb-native ?= "2371"
 SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
+SRCREV_pn-epydial ?= "215"
 SRCREV_pn-etk-theme-ninja ?= "5"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-flashrom ?= "3682"
@@ -88,10 +89,10 @@ SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-lightmediascanner ?= "68"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
-SRCREV_pn-linux-ixp4xx ?= "1084"
+SRCREV_pn-linux-ixp4xx ?= "1085"
 SRCREV_pn-linux-openmoko ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
 SRCREV_pn-linux-openmoko-devel ?= "75e0b08ee55b32b996d491809ce60b63287dadf5"
-SRCREV_pn-linux-eten ?= "bb4b5f4bb55736259216a957a14a1e0d33dbc232"
+SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"