Merge commit 'origin/org.openembedded.dev' into holger/openmoko-merges

Conflicts:

	packages/tasks/task-openmoko-feed.bb

6 files changed, 49 insertions, 1 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 1bda49ad39..c252c3c1f1 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -6,6 +6,10 @@ sha256=b3dbf01563dd60d63cff543ea8cd0c885381e78ecbbab8ff176e46df3f198a88
 md5=bfc2c45be253a5f25576587f61faff1b
 sha256=bc5b7766318ef6676defdf0103d1b53b48a3fee6b819fbe2076461caa9f94ec9
 
+[http://www.bat.org/~tomba/git/0001-debug-prints.patch]
+md5=92a71b8976ea869c66520e365f2cd2aa
+sha256=b488e1960ca873f1b853eae5f98a41401391572c079aafdbed4f119a1bcbc52f
+
 [http://www.nopcode.org/0xFFFF/get/0xFFFF-0.1.tar.gz]
 md5=666fce75c418d7b72e2c9dc225fce3be
 sha256=2419708f8e0d7cd6875f4555da9c8a2bf9503374eb7c0bea08fed0841baa4655
@@ -2890,6 +2894,14 @@ sha256=16d4a9ef3a2c62f879c688b7949f4d0b834b26c9905d16fee7d76432df29d8fd
 md5=646fea69bfa82be5f507e72e055957b6
 sha256=16d4a9ef3a2c62f879c688b7949f4d0b834b26c9905d16fee7d76432df29d8fd
 
+[http://www.penguin.cz/~utx/ftp/claws-mail/claws-mail-3.6.1-po-update.patch]
+md5=e8ff3fabf1ed47f3b11a9cdc36b026bd
+sha256=767258dd7c966e14ed519affe4c0da93e8fff66ee5fe9158413c8d163af72db8
+
+[http://downloads.sourceforge.net/sylpheed-claws/claws-mail-3.6.1.tar.bz2]
+md5=761b8ae2d574588460a0fb1ea4931ccb
+sha256=67337a4a1a5a5ce09f2a38422b7a6fc481e4747f74d4ddedd130d4fb06fc3907
+
 [http://downloads.sourceforge.net/clearlooks/clearlooks-0.6.2.tar.bz2]
 md5=451ef33d1bffa261c5cbe01182199f97
 sha256=be080113c9e9d137ee14eaf7f731c5ae58d24924748aaa725d0f061d59265f3b
@@ -3922,6 +3934,10 @@ sha256=677a8cd27d05b1401ddef152270a498fc4d34cb9ba94779c571f2f2794b20811
 md5=a2d7803976f82db3edeb374109cba6df
 sha256=8ae0026054fb9f437d59a3bb932628fc2915af6697e430325e0950e960ca6c34
 
+[http://install.tarball.in.source.dir/dsplink_1_60.tar.gz]
+md5=e23c494004773b281ea0fc2b52355a1e
+sha256=15dd793e32fc9aba1266c2ccb8e98856c61be2e9de214285aa09152a47da1836
+
 [http://install.tarball.in.source.dir/dsplink_1_60_00_04.tar.gz]
 md5=2b53c067c683266379dddbb38e65cb45
 sha256=b1a0508444241c61585321eaadc32f476ef441f267636fbd0fb2f0c7ebf0fcbb
@@ -10662,6 +10678,10 @@ sha256=dddf7b94e3547436beca1ed5ed22616f350d7e79cd1d72c83b122c1707237525
 md5=0214de45b1b92277fbfc6c9a00af5316
 sha256=f4547fae43a30265dd1d1e7f88c556d067a3ba67ca7ec0d46e540e6dc561a010
 
+[http://downloads.sourceforge.net/libetpan/libetpan-0.57.tar.gz]
+md5=8ce8c6c071e81884a475b12b7f9a9cc0
+sha256=1f3fda5c9e2961d1a6298dc8aadae321493d37727d8db45bc2e8d58f20547011
+
 [http://monkey.org/~provos/libevent-1.1a.tar.gz]
 md5=6cc776458ecaf9247550863702a44d7c
 sha256=1725cd3dd9ec87a68316c36a50ab653c7e9581c91f9b1b7e9af42a9c7c499d8e
@@ -18610,6 +18630,10 @@ sha256=c913105c740fe9cbbf7ab49f663acf5640b812995c2f9c716294f6b44a3185c4
 md5=45e9e89775613b0afb732fbc11c73d26
 sha256=72a6ab7c8a0baf0d1d432929c19a7d096335ba4adc43e40488b6a77e5995a0f5
 
+[http://sylpheed.good-day.net/sylpheed/v2.5/sylpheed-2.5.0.tar.bz2]
+md5=a6fc9e9c2a33876fddb33f25f40b820f
+sha256=d18a8dc51126e25c7677dd649b7499756278e1d82b7b888d37a10fb1d8d38761
+
 [http://www.logarithmic.net/pfh-files/synaesthesia/synaesthesia-2.4.tar.gz]
 md5=784105cbeed3ab209231675f0e029497
 sha256=48505975e809ebadf416dc3e35a528ef87f01b117f2f1c5498d728ead8786493
@@ -18734,6 +18758,14 @@ sha256=0ff805bb8dbf72a45d347f2310f7e5c86e2e7419a069d546e53cf5f221c196ab
 md5=eace48f8340a95d7134632bad6287100
 sha256=6b368373f9a01f3f33f77ac25c170cbd052b29d6910f72308e55dc0a39af7722
 
+[http://tango.freedesktop.org/releases/tango-icon-theme-0.7.2.tar.gz]
+md5=eace48f8340a95d7134632bad6287100
+sha256=6b368373f9a01f3f33f77ac25c170cbd052b29d6910f72308e55dc0a39af7722
+
+[http://tango.freedesktop.org/releases/tango-icon-theme-0.8.1.tar.gz]
+md5=32d5258f448b5982af9cfa4364f31d41
+sha256=17e64f2f5d7d8a358136a7003604cb60acaef47b083123956b12eb0ed9293055
+
 [http://tango-project.org/releases/tango-icon-theme-extras-0.1.0.tar.gz]
 md5=caaceaec7b61f1cbda0db9842f9db281
 sha256=b9252179ea2c546e6bb065281d51373f0ae06081e5a98d4255249af4fa8b33db
@@ -19394,6 +19426,10 @@ sha256=c8bc5383eafaa299e9874ae50acc6549f8b54bc29ed64a9a3387b3e4cd7f4bcb
 md5=61dc55f43b17a38a074f347e74095b20
 sha256=ca70501ae859cd86b387bb196908838275b4b06e6f4d692f9aa51b8a633334a7
 
+[http://www.uclibc.org/downloads/uClibc-0.9.30.tar.bz2]
+md5=e5766e2566e0297adebebbcc0aba1f2d
+sha256=67e7e6b983cd2caa163f177d5196282434ae1e18b7270495cd6c65f5c1549555
+
 [http://www.uclinux.org/pub/uClinux/uClinux-2.4.x/uClinux-2.4.24-uc0.diff.gz]
 md5=cd8a3b23299305761c5b3b3f81dd017a
 sha256=c409609ce3bdf5bc4c040aa17ec28c6c214695a6aaaa408643edbda704142fcf
@@ -19730,6 +19766,10 @@ sha256=4154c5a3830bba25bd63b175f4fba07867ef029124d8c9470fac45235569dde5
 md5=5ec548c343de435b94a7b39f5c853292
 sha256=10263676cb872ca48d8d605be44eb1e6260419675409732e7e5a76eb41843cee
 
+[http://people.igalia.com/berto/files/vagalume/source/vagalume_0.7.orig.tar.gz]
+md5=97e1497eed21ef0ac82514ead94c5ee4
+sha256=82b42534276018809aec934b572845e495ea19fc0c6abf6b6ef1e8571b91ccee
+
 [http://download.gnome.org/sources/vala/0.1/vala-0.1.5.tar.bz2]
 md5=4e082ecb7f60ebdc49f3bd19ae7ebca2
 sha256=20c577c9130f114dda24fd5a1c19cd477679553c4e2e7c8362471ae1f21b6836
@@ -20010,6 +20050,10 @@ sha256=b8e200ae66c20897c9aaa80b0044e638a0016d3bdb6e67560fd61f1ef162f305
 md5=09b7b76d4a4eedf502f38df9d551d827
 sha256=ce4b00b85fd26cbb7b7362b405648f422d3c228df4236eac8ce2f464182cf750
 
+[http://heanet.dl.sourceforge.net/wesnoth/wesnoth-1.4.5.tar.bz2]
+md5=09b7b76d4a4eedf502f38df9d551d827
+sha256=ce4b00b85fd26cbb7b7362b405648f422d3c228df4236eac8ce2f464182cf750
+
 [ftp://ftp.gnu.org/gnu/wget/wget-1.9.1.tar.gz]
 md5=e6051f1e1487ec0ebfdbda72bedc70ad
 sha256=69044b87c517b986dbc17a5f7e4de430cb56e605330c19c6bb0d384d5c37e638
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index e58eb40519..0832f31f25 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -26,5 +26,7 @@ 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-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index 8993a6ae38..c26613b9e0 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -32,6 +32,7 @@ BUILD_OPTIMIZATION = "-Os"
 #Note that this testing was done without the gcc-pr32889.patch.
 FULL_OPTIMIZATION_avr32 = "-Os -fomit-frame-pointer"
 
+TARGET_LINK_HASH_STYLE = "-Wl,--hash-style=gnu"
 
 CXXFLAGS += "-fvisibility-inlines-hidden"
 
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index e0f6423849..8d7a98cc45 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -1,5 +1,6 @@
 SRCREV_pn-frameworkd = "${AUTOREV}"
 SRCREV_pn-frameworkd-devel = "${AUTOREV}"
+SRCREV_pn-fsod = "${AUTOREV}"
 SRCREV_pn-fso-gpsd = "${AUTOREV}"
 SRCREV_pn-fso-sounds = "${AUTOREV}"
 SRCREV_pn-gsm0710muxd = "${AUTOREV}"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index c89b650033..37010096dd 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -854,7 +854,6 @@ PREFERRED_VERSION_libelf ?= "0.8.6"
 PREFERRED_VERSION_liberror-perl ?= "0.17004"
 PREFERRED_VERSION_liberror-perl-native ?= "0.17004"
 PREFERRED_VERSION_libesmtp ?= "1.0.4"
-PREFERRED_VERSION_libetpan ?= "0.52"
 PREFERRED_VERSION_libevent ?= "1.1a"
 PREFERRED_VERSION_libeventdb ?= "0.90"
 PREFERRED_VERSION_libevnet ?= "0.3.1"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index c0946a784e..80ae0a6767 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -49,6 +49,7 @@ SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-flashrom ?= "3682"
 SRCREV_pn-frameworkd ?= "b4fc84fef759999e9e0cb73902e4b42fbbc8351d"
 SRCREV_pn-frameworkd-devel ?= "e8ad25f2e36e31e0a8afe08fbe11e54b9305aa8f"
+SRCREV_pn-fsod ?= "9ab5e9884839c9745ecd878a9cf562a1c1b73411"
 SRCREV_pn-fso-gpsd ?= "8f82d35ae83fdc00f2c4786257e98551b9dea995"
 SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2"
 SRCREV_pn-fstests ?= "204"