Merge branch 'org.openembedded.dev' of new.openembedded.org:openembedded into org.openembedded.dev

6 files changed, 6 insertions, 17 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 25aaeb4417..06517288cb 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -8454,10 +8454,6 @@ sha256=c3b8b7b57019927dad40870c379eecfa6389443f7e2096aa0157a0224d400da1
 md5=e1a41daf3bfc221afaf56751dc506f95
 sha256=e6bff5c00d7d93bade78535573494673f581118c38a8ca13c3afd63809335ba0
 
-[http://www.boutell.com/gd/http/gd-2.0.33.tar.gz]
-md5=be0a6d326cd8567e736fbc75df0a5c45
-sha256=2ba10c830e24781ec2e0594c6e49353e512e8bda782bc9a1851e70a5e8ced93e
-
 [http://downloads.sourceforge.net/gdado/gdado-2.2.tar.gz]
 md5=b84114df6ca8b20560524afed0e21b25
 sha256=cc272f097832e074804bf405f2c013b4f941ad57f0f5f5ec6c08edecc9ad17fa
@@ -27926,10 +27922,6 @@ sha256=08d588ce0731d0c0e55a1cac35acf019e1b735d0f75f16962adfeb4fefd69441
 md5=80d3ae3bbae2a488d433d86b8fd64777
 sha256=4f1f6ba6410e5f2aeb473d0a09caaa528cc926866735ab66e05cdff9c5093a37
 
-[http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.1.1.tar.gz]
-md5=47845fd76f5f2354a3619c4097575487
-sha256=617b4aa69e600c215b34fa3fd5764bc1d9d205d9d7d9fe7812bde7ec956fcaad
-
 [http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-0.3.2.tar.gz]
 md5=aaccdffc5656095a45dfe87c5bf612cb
 sha256=55702637d377d73e6f323462779aeb02f5049d71c7ea4e3bbe564566d9a8d488
@@ -28162,10 +28154,6 @@ sha256=a4f15c73e2b67c888cbedfaa8093661dff6cb859357c197c60f3026baddb939e
 md5=05fada181e12bfa94b52f0b10395b28c
 sha256=a4f15c73e2b67c888cbedfaa8093661dff6cb859357c197c60f3026baddb939e
 
-[http://downloads.sourceforge.net/wireshark/wireshark-1.0.5.tar.bz2]
-md5=4c6a93e00123d8bb7af48a009519aca4
-sha256=4f923e24d674ac62ded3da402a4de6d402886d80e3d7cac91cf026921f32fcf7
-
 [http://djwillis.openpandora.org/pandora/wifi/wl1251-wireless-2009-08-30-2158.zip]
 md5=b69ee5a5ffc825ff6d7970a62dcae46a
 sha256=6641a438972acdc8113957c25a17db55d6d9c3ce037ed3ac5337ac6ee153d73f
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index c4562cba14..225e218a5a 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -84,8 +84,8 @@ PREFERRED_VERSION_linux-libc-headers 	= "2.6.31"
 #Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
 PREFERRED_VERSION_glibc 		?= "2.9"
 PREFERRED_VERSION_glibc-initial 	?= "2.9"
-PREFERRED_VERSION_uclibc        	?= "0.9.30.1"
-PREFERRED_VERSION_uclibc-initial	?= "0.9.30.1"
+PREFERRED_VERSION_uclibc        	?= "0.9.30.2"
+PREFERRED_VERSION_uclibc-initial	?= "0.9.30.2"
 
 #powerpc needs additional patches to gcc
 ANGSTROM_GCC_VERSION_ppc405 		?= "4.1.1"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 04e028e488..fe278925bd 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -47,6 +47,7 @@ PREFERRED_VERSION_samba		= "3.3.9"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
 
 PREFERRED_VERSION_udev 		= "151"
+PREFERRED_VERSION_udev_libc-uclibc = "141"
 UDEV_GE_141 = "1"
 
 PREFERRED_VERSION_usbutils = "0.86"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index d7677e54fc..385dd28cdb 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -56,7 +56,7 @@ SRCREV_pn-e-wm-theme-illume-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-theme-illume-sixteen ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-ebrainy ?= "21"
 SRCREV_pn-eds-dbus ?= "736"
-SRCREV_pn-elementary-theme-gry ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
+SRCREV_pn-elementary-theme-gry ?= "2b62d1c9b02da047071105a7b5695acd6c6dbcca"
 SRCREV_pn-elementary-theme-niebiee ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
 SRCREV_pn-elementary-theme-sixteen ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
 SRCREV_pn-elf2flt ?= "1786"
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index a262059d45..f3f491c275 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r32"
+MACHINE_KERNEL_PR = "r33"
 
 TARGET_ARCH = "arm"
 
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index d43cb36e23..632540345b 100644
--- a/conf/machine/include/kirkwood.inc
+++ b/conf/machine/include/kirkwood.inc
@@ -11,7 +11,7 @@ USE_DEVFS = "0"
 PREFERRED_PROVIDER_virtual/bootloader = ""
 PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
 
-MACHINE_KERNEL_PR = "r17"
+MACHINE_KERNEL_PR = "r18"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 SERIAL_CONSOLE = "ttyS0 115200"