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

Conflicts: packages/tasks/task-openmoko-feed.bb
author: Holger Hans Peter Freyther <zecke@selfish.org> 2008-11-16 16:35:39 +0100
committer: Holger Hans Peter Freyther <zecke@selfish.org> 2008-11-16 16:35:39 +0100
commit: 52abe8d77cbfed9c91a9cae7ed0a7e60aaf50b34 (patch)
tree: 7f3b125c3485041c0488adf60390a1fdb230bf6c
parent: 9eaf1493b3c777d688ad992b9ecedd1cc18cf147 (diff)
parent: ce5b19f9784561fb506bc564082e7a3d888a0c90 (diff)
download: openembedded-52abe8d77cbfed9c91a9cae7ed0a7e60aaf50b34.tar.gz
122 files changed, 5175 insertions, 344 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"
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 653d0b941f..a65517e4fd 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -174,7 +174,9 @@ do
 		      nmm \
 		      notecase \
 		      numptyphysics \
-	          openmoko-browser2 \
+	          opencv \
+              opencv-samples \
+              openmoko-browser2 \
 		      openredalert \
 		      openvpn \
 		      opie-notes \
diff --git a/packages/accelges/accelges_svn.bb b/packages/accelges/accelges_svn.bb
index 73c274a3d7..27abf44806 100644
--- a/packages/accelges/accelges_svn.bb
+++ b/packages/accelges/accelges_svn.bb
@@ -3,8 +3,9 @@ HOMEPAGE = "http://code.google.com/p/accelges/"
 AUTHOR = "Paul V. Borza"
 LICENSE = "GPL"
 DEPENDS = "libnotify"
-PV = "0.2+svn${SRCREV}"
+PV = "0.2+svnr${SRCREV}"
 PR = "r1"
+PE = "1"
 
 SRC_URI = "svn://accelges.googlecode.com/svn/;module=trunk;proto=http"
 S = "${WORKDIR}/trunk"
diff --git a/packages/alsa/alsa-scenario_git.bb b/packages/alsa/alsa-scenario_git.bb
index 02edd31619..74c25c247e 100644
--- a/packages/alsa/alsa-scenario_git.bb
+++ b/packages/alsa/alsa-scenario_git.bb
@@ -3,8 +3,9 @@ HOMEPAGE = "http://opensource.wolfsonmicro.com/node/22"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
-PV = "0.1+git${SRCREV}"
+PV = "0.1+gitr${SRCREV}"
 PR = "r0"
+PE = "1"
 
 SRC_URI = "git://opensource.wolfsonmicro.com/alsa-scenario;branch=master;protocol=git"
 S = "${WORKDIR}/git"
diff --git a/packages/boost/boost_1.33.0.bb b/packages/boost/boost_1.33.0.bb
deleted file mode 100644
index 520cf43a8d..0000000000
--- a/packages/boost/boost_1.33.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-include boost.inc
-
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2"
-#SRC_URI += "file://unit_test_log10f.patch;patch=1"
-SRC_URI += "file://linux-uclibc.patch;patch=1"
-
diff --git a/packages/boost/boost_1.33.1.bb b/packages/boost/boost_1.33.1.bb
index 840be8b784..71b8fc15b3 100644
--- a/packages/boost/boost_1.33.1.bb
+++ b/packages/boost/boost_1.33.1.bb
@@ -1,9 +1,11 @@
 include boost.inc
+PR = "r3"
 
-PR = "r2"
+SRC_URI = "\
+  ${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \
+  file://linux-uclibc.patch;patch=1 \
+  file://atomic_count_gcc_atomicity.patch;patch=1 \
+  file://gcc43.patch;patch=1 \
+  file://gcc41.patch;patch=1 \
+"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2"
-#SRC_URI += "file://unit_test_log10f.patch;patch=1"
-SRC_URI += "file://linux-uclibc.patch;patch=1"
-SRC_URI += "file://atomic_count_gcc_atomicity.patch;patch=1"
-SRC_URI += "file://gcc43.patch;patch=1"
diff --git a/packages/boost/files/gcc41.patch b/packages/boost/files/gcc41.patch
new file mode 100644
index 0000000000..f91d1adf2b
--- /dev/null
+++ b/packages/boost/files/gcc41.patch
@@ -0,0 +1,14 @@
+diff -ur boost_1_33_1.orig/boost/bind.hpp boost_1_33_1/boost/bind.hpp
+--- boost_1_33_1.orig/boost/bind.hpp	2008-10-11 10:30:03.000000000 +0200
++++ boost_1_33_1/boost/bind.hpp	2008-10-11 10:41:25.000000000 +0200
+@@ -28,6 +28,10 @@
+ #include <boost/bind/arg.hpp>
+ #include <boost/detail/workaround.hpp>
+ 
++#if __GNUC__ == 4 && __GNUC_MINOR__ == 1
++#  include <boost/visit_each.hpp>
++#endif
++
+ // Borland-specific bug, visit_each() silently fails to produce code
+ 
+ #if defined(__BORLANDC__)
diff --git a/packages/cacao/cacao.inc b/packages/cacao/cacao.inc
index 7df6c3712e..c22bbffd50 100644
--- a/packages/cacao/cacao.inc
+++ b/packages/cacao/cacao.inc
@@ -14,6 +14,8 @@ RPROVIDES_cacao = "java2-runtime"
 
 inherit java autotools update-alternatives
 
+ARM_INSTRUCTION_SET = "arm"
+
 # Configure options compatible with Cacao >= 0.99 only!
 EXTRA_OECONF = "\
 	${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \
diff --git a/packages/clutter/moblin-proto_git.bb b/packages/clutter/moblin-proto_git.bb
index 25e0418b5d..3f61f496c5 100644
--- a/packages/clutter/moblin-proto_git.bb
+++ b/packages/clutter/moblin-proto_git.bb
@@ -1,7 +1,8 @@
 DEPENDS = "clutter-box2d"
 
-PV = "0.0+git${SRCREV}"
+PV = "0.0+gitr${SRCREV}"
 PR = "r1"
+PE = "1"
 
 SRC_URI = "git://git.moblin.org/repos/users/pippin/prototype.git/;protocol=http \
            file://paths.patch;patch=1"
diff --git a/packages/connman/connman_git.bb b/packages/connman/connman_git.bb
index 5e2ab2ea68..bc5840fb4c 100644
--- a/packages/connman/connman_git.bb
+++ b/packages/connman/connman_git.bb
@@ -1,7 +1,8 @@
 HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php"
 SUMMARY  = "Moblin Connection Manager"
-PV       = "0.0+git${SRCREV}"
+PV       = "0.0+gitr${SRCREV}"
 PR       = "r4.02"
+PE       = "1"
 S        = "${WORKDIR}/git"
 LICENSE  = "GPL"
 
diff --git a/packages/dsplink/dsplink_1.60.00.04.bb b/packages/dsplink/dsplink_1.60.bb
index d5f3e973cd..12027770a9 100644
--- a/packages/dsplink/dsplink_1.60.00.04.bb
+++ b/packages/dsplink/dsplink_1.60.bb
@@ -7,11 +7,11 @@ PV = "160"
 
 # Get dsplink tarball from TI website, place in sources and calculate
 # md5sum
-# Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/link/index.html
+# Look for tarball at https://www-a.ti.com/downloads/sds_support/targetcontent/link/link_1_60/index.html
 
-SRC_URI = "http://install.tarball.in.source.dir/dsplink_1_60_00_04.tar.gz \
+SRC_URI = "http://install.tarball.in.source.dir/dsplink_1_60.tar.gz \
 		file://Makefile.dsplink \
 "
 
-S = "${WORKDIR}/dsplink_1_60_00_04/dsplink"
+S = "${WORKDIR}/dsplink_1_60/dsplink"
 
diff --git a/packages/freesmartphone/fsod_git.bb b/packages/freesmartphone/fsod_git.bb
new file mode 100644
index 0000000000..278331326e
--- /dev/null
+++ b/packages/freesmartphone/fsod_git.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "The C/Vala implementation of the freesmartphone.org framework APIs"
+HOMEPAGE = "http://www.freesmartphone.org/"
+AUTHOR = "Sudharshan S"
+SECTION = "console/network"
+DEPENDS = "dbus dbus-glib libnl vala-native"
+LICENSE = "LGPL"
+PV = "0.1+gitr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "\
+  ${FREESMARTPHONE_GIT}/openmoko-gsoc2008.git;protocol=git;branch=master \
+#  file://fsod \
+"
+S = "${WORKDIR}/git/fsod"
+
+inherit autotools pkgconfig update-rc.d
+
+INITSCRIPT_NAME = "fsod"
+INITSCRIPT_PARAMS = "defaults 21"
+
+do_install_append() {
+#        install -d ${D}${sysconfdir}/init.d
+#        install -m 0755 ${WORKDIR}/fsod ${D}${sysconfdir}/init.d/
+}
+
+RCONFLICTS_${PN} = "frameworkd"
+RREPLACES_${PN} = "frameworkd"
+
+FILES_${PN} += "${sysconfdir}"
+FILES_${PN}-dbg += "\
+  ${libdir}/fsod/subsystems/.debug \
+  ${libdir}/fsod/subsystems/*/.debug \
+"
+
diff --git a/packages/freesmartphone/pylgrim_svn.bb b/packages/freesmartphone/pylgrim_svn.bb
index e70c839da8..beeb44c110 100644
--- a/packages/freesmartphone/pylgrim_svn.bb
+++ b/packages/freesmartphone/pylgrim_svn.bb
@@ -5,7 +5,8 @@ LICENSE = "GPL"
 SECTION = "x11/navigation"
 DEPENDS = "edje-native"
 RDEPENDS = "task-python-efl python-textutils"
-PV = "0.0+svn${SRCREV}"
+PV = "0.0+svnr${SRCREV}"
+PE = "1"
 
 SRC_URI = "svn://neo1973-germany.de/svn;module=pylgrim;proto=http"
 S = "${WORKDIR}/pylgrim"
diff --git a/packages/gimp/babl_svn.bb b/packages/gimp/babl_svn.bb
index a98cb0a057..332595ee6b 100644
--- a/packages/gimp/babl_svn.bb
+++ b/packages/gimp/babl_svn.bb
@@ -2,8 +2,9 @@ DESCRIPTION = "Babl is a dynamic, any to any, pixel format conversion library."
 LICENSE = "LGPL"
 
 SRCREV = "349"
-PV = "0.0.23+svn${SRCREV}"
+PV = "0.0.23+svnr${SRCREV}"
 PR = "r1"
+PE = "1"
 
 inherit gnome
 
diff --git a/packages/gimp/gegl_svn.bb b/packages/gimp/gegl_svn.bb
index 7cdc86ae21..134e699425 100644
--- a/packages/gimp/gegl_svn.bb
+++ b/packages/gimp/gegl_svn.bb
@@ -3,7 +3,8 @@ LICENSE = "LGPL"
 DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual/libsdl"
 
 SRCREV = "2543"
-PV = "0.0.19+svn${SRCREV}"
+PV = "0.0.19+svnr${SRCREV}"
+PE = "1"
 
 inherit gnome
 
diff --git a/packages/hal/ohm_git.bb b/packages/hal/ohm_git.bb
index a747c2ff1c..ffdbb07b88 100644
--- a/packages/hal/ohm_git.bb
+++ b/packages/hal/ohm_git.bb
@@ -8,7 +8,8 @@ SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git \
            file://fix_configure.patch;patch=1"
 
 SRCREV = "edfe25d49d67884bf004de7ae0724c162bb5e65e"
-PV = "0.1.2+${PR}+git${SRCREV}"
+PV = "0.1.2+${PR}+gitr${SRCREV}"
+PE = "1"
 
 S = "${WORKDIR}/git"
 
diff --git a/packages/hicolor-icon-theme/hicolor-icon-theme_0.5.bb b/packages/hicolor-icon-theme/hicolor-icon-theme_0.5.bb
deleted file mode 100644
index 491afd99cf..0000000000
--- a/packages/hicolor-icon-theme/hicolor-icon-theme_0.5.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-SECTION = "unknown"
-LICENSE = "GPL"
-inherit gnome
-
-SRC_URI = "http://freedesktop.org/software/icon-theme/releases/hicolor-icon-theme-${PV}.tar.gz"
-
-FILES_${PN} += "${datadir}/icons"
diff --git a/packages/hicolor-icon-theme/hicolor-icon-theme_0.9.bb b/packages/hicolor-icon-theme/hicolor-icon-theme_0.9.bb
deleted file mode 100644
index f50f8f8a32..0000000000
--- a/packages/hicolor-icon-theme/hicolor-icon-theme_0.9.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SECTION = "unknown"
-LICENSE = "GPL"
-inherit gnome
-
-PR = "r1"
-
-SRC_URI = "http://icon-theme.freedesktop.org/releases/${P}.tar.gz"
-
-PACKAGE_ARCH = "all"
-
-FILES_${PN} += "${datadir}/icons"
diff --git a/packages/images/fso-illume-image.bb b/packages/images/fso-illume-image.bb
index a2bdda5e47..1984ca55af 100644
--- a/packages/images/fso-illume-image.bb
+++ b/packages/images/fso-illume-image.bb
@@ -4,8 +4,8 @@
 
 require fso-image.bb
 
-PV = "1.0"
-PR = "r1"
+PV = "1.1"
+PR = "r0"
 
 # no languages for now
 IMAGE_LINGUAS = ""
@@ -45,7 +45,8 @@ AUDIO_INSTALL = "\
 "
 
 GTK_INSTALL = "\
-  xterm \
+  tango-icon-theme \
+  vala-terminal \
   gpe-scap \
 "
 
diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
index b97eb5c89b..a7552122f3 100644
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -2,8 +2,8 @@
 # freesmartphone.org Image Recipe
 #------------------------------------------------------
 
-PV = "1.0"
-PR = "r2"
+PV = "1.1"
+PR = "r0"
 
 # no languages for now
 IMAGE_LINGUAS = ""
@@ -43,6 +43,7 @@ AUDIO_INSTALL = "\
 "
 
 GTK_INSTALL = "\
+  tango-icon-theme \
   openmoko-calculator2 \
   vala-terminal \
   gpe-scap \
@@ -122,6 +123,7 @@ fso_rootfs_postprocess() {
     # minimal gtk theme foo
     mkdir -p ./etc/gtk-2.0/
     echo 'gtk-font-name = "Sans 5"' >> ./etc/gtk-2.0/gtkrc
+    echo 'gtk-icon-theme-name = "Tango"' >> ./etc/gtk-2.0/gtkrc
     # fix strange iconv/gconf bug
     ln -s libc.so.6 ./lib/libc.so
     # set sensible DNS entries
diff --git a/packages/libetpan/files/libetpan-autoreconf.patch b/packages/libetpan/files/libetpan-autoreconf.patch
new file mode 100644
index 0000000000..d05967da31
--- /dev/null
+++ b/packages/libetpan/files/libetpan-autoreconf.patch
@@ -0,0 +1,12 @@
+Index: libetpan-0.57/configure.ac
+===================================================================
+--- libetpan-0.57.orig/configure.ac	2008-10-08 19:54:20.000000000 +0000
++++ libetpan-0.57/configure.ac	2008-11-11 16:34:33.000000000 +0000
+@@ -106,6 +106,7 @@
+ 
+ # Check the C compiler.
+ AC_PROG_CC
++AC_PROG_CXX
+ 
+ # Compiler flags.
+ AC_ARG_ENABLE(debug,   [  --enable-debug          setup flags (gcc) for debugging (default=no)],
diff --git a/packages/libetpan/libetpan_0.52.bb b/packages/libetpan/libetpan_0.57.bb
index 77b2cca39b..e0108f9fbd 100644
--- a/packages/libetpan/libetpan_0.52.bb
+++ b/packages/libetpan/libetpan_0.57.bb
@@ -6,7 +6,8 @@ DEPENDS = "gnutls"
 LICENSE = "BSD"
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
+	   file://libetpan-autoreconf.patch;patch=1"
 
 inherit autotools pkgconfig gettext binconfig
 
diff --git a/packages/libw100/libw100_svn.bb b/packages/libw100/libw100_svn.bb
index 4f33c625ca..462163e115 100644
--- a/packages/libw100/libw100_svn.bb
+++ b/packages/libw100/libw100_svn.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "Acceleration library for ATI imageon chipsets (w100 and w3220)"
 LICENSE = "GPLv2"
 
-PV = "0.0.2+svn${SRCREV}"
+PV = "0.0.2+svnr${SRCREV}"
+PE = "1"
 SRC_URI = "svn://libw100.svn.sourceforge.net/svnroot/libw100;module=trunk;proto=https"
 
 S = "${WORKDIR}/trunk"
diff --git a/packages/lightmediascanner/lightmediascanner_svn.bb b/packages/lightmediascanner/lightmediascanner_svn.bb
index 702dcbe3f3..145d2c15a4 100644
--- a/packages/lightmediascanner/lightmediascanner_svn.bb
+++ b/packages/lightmediascanner/lightmediascanner_svn.bb
@@ -4,7 +4,8 @@ HOMEPAGE = "http://lms.garage.maemo.org/"
 AUTHOR = "Gustavo Barbieri"
 LICENSE = "LGPL"
 DEPENDS = "sqlite3"
-PV = "0.1.0+svn${SRCREV}"
+PV = "0.1.0+svnr${SRCREV}"
+PE = "1"
 
 SRC_URI = "svn://garage.maemo.org/svn/lms/;module=lightmediascanner;proto=https"
 S = "${WORKDIR}/lightmediascanner"
diff --git a/packages/linux/linux-kaiser_2.6.24+git.bb b/packages/linux/linux-kaiser_2.6.24+git.bb
index 73eb1e3b46..1fd64bfb9e 100644
--- a/packages/linux/linux-kaiser_2.6.24+git.bb
+++ b/packages/linux/linux-kaiser_2.6.24+git.bb
@@ -1,7 +1,8 @@
 require linux.inc
 
-PV = "2.6.24+git${SRCREV}"
+PV = "2.6.24+gitr${SRCREV}"
 PR = "r1"
+PE = "1"
 
 COMPATIBLE_MACHINE = "htckaiser|htcpolaris"
 
diff --git a/packages/linux/linux-neuros_git.bb b/packages/linux/linux-neuros_git.bb
index 883bb69a2a..97e32cdac4 100644
--- a/packages/linux/linux-neuros_git.bb
+++ b/packages/linux/linux-neuros_git.bb
@@ -4,8 +4,9 @@ DESCRIPTION = "Linux kernel for Neuros OSD devices"
 
 SRCREV = "2eaa4a30d599203ceed1b5a42d713b29151a39eb"
 
-PV = "2.6.23-${PR}+git${SRCREV}"
+PV = "2.6.23-${PR}+gitr${SRCREV}"
 PR = "r13"
+PE = "1"
 
 COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)"
 
diff --git a/packages/linux/linux-omap/omap3evm/defconfig b/packages/linux/linux-omap/omap3evm/defconfig
index f4431728cd..9de9b434c1 100644
--- a/packages/linux/linux-omap/omap3evm/defconfig
+++ b/packages/linux/linux-omap/omap3evm/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-omap1
-# Sun Oct 26 14:48:42 2008
+# Linux kernel version: 2.6.28-rc4-omap1
+# Fri Nov 14 18:19:09 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -22,9 +22,8 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_SUPPORTS_AOUT=y
-CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_OPROFILE_ARMV7=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
@@ -81,24 +80,20 @@ CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
+CONFIG_AIO=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
 CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
 # CONFIG_MARKERS is not set
 CONFIG_OPROFILE=y
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
-# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
-# CONFIG_HAVE_IOREMAP_PROT is not set
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-# CONFIG_USE_GENERIC_SMP_HELPERS is not set
 CONFIG_HAVE_CLK=y
-CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
@@ -131,6 +126,7 @@ CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_CLASSIC_RCU=y
+CONFIG_FREEZER=y
 
 #
 # System Type
@@ -171,7 +167,7 @@ CONFIG_CLASSIC_RCU=y
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_DAVINCI is not set
 CONFIG_ARCH_OMAP=y
-# CONFIG_ARCH_MSM7X00A is not set
+# CONFIG_ARCH_MSM is not set
 
 #
 # TI OMAP Implementations
@@ -204,6 +200,15 @@ CONFIG_OMAP_DM_TIMER=y
 CONFIG_OMAP_LL_DEBUG_UART1=y
 # CONFIG_OMAP_LL_DEBUG_UART2 is not set
 # CONFIG_OMAP_LL_DEBUG_UART3 is not set
+CONFIG_OMAP2_DSS=y
+CONFIG_OMAP2_DSS_DEBUG=y
+# CONFIG_OMAP2_DSS_RFBI is not set
+CONFIG_OMAP2_DSS_VENC=y
+# CONFIG_OMAP2_DSS_SDI is not set
+CONFIG_OMAP2_DSS_DSI=y
+# CONFIG_OMAP2_DSS_USE_DSI_PLL is not set
+# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set
+CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=1
 CONFIG_ARCH_OMAP34XX=y
 CONFIG_ARCH_OMAP3430=y
 
@@ -268,26 +273,30 @@ CONFIG_TICK_ONESHOT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PREEMPT=y
 CONFIG_HZ=128
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
 CONFIG_ARCH_FLATMEM_HAS_HOLES=y
-# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
 CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
 CONFIG_LEDS=y
 CONFIG_ALIGNMENT_TRAP=y
 
@@ -302,7 +311,7 @@ CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
 
 #
-# CPU Frequency scaling
+# CPU Power Management
 #
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=y
@@ -319,6 +328,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+# CONFIG_CPU_IDLE is not set
 
 #
 # Floating point emulation
@@ -336,6 +346,8 @@ CONFIG_ARM_ERRATUM_451034=y
 # Userspace binary formats
 #
 CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
 CONFIG_BINFMT_AOUT=m
 CONFIG_BINFMT_MISC=y
 
@@ -417,6 +429,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
 # CONFIG_VLAN_8021Q is not set
 # CONFIG_DECNET is not set
 # CONFIG_LLC2 is not set
@@ -460,12 +473,11 @@ CONFIG_BT_HCIBPA10X=y
 # CONFIG_BT_HCIH4P is not set
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
+# CONFIG_PHONET is not set
+CONFIG_WIRELESS=y
 CONFIG_CFG80211=y
 CONFIG_NL80211=y
+CONFIG_WIRELESS_OLD_REGULATORY=y
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_MAC80211=y
@@ -474,7 +486,9 @@ CONFIG_MAC80211=y
 # Rate control algorithm selection
 #
 CONFIG_MAC80211_RC_PID=y
+# CONFIG_MAC80211_RC_MINSTREL is not set
 CONFIG_MAC80211_RC_DEFAULT_PID=y
+# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
 CONFIG_MAC80211_RC_DEFAULT="pid"
 # CONFIG_MAC80211_MESH is not set
 CONFIG_MAC80211_LEDS=y
@@ -547,6 +561,7 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_INTELEXT is not set
 # CONFIG_MTD_CFI_AMDSTD is not set
 # CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
@@ -580,6 +595,7 @@ CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_ECC_SMC is not set
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_GPIO is not set
 CONFIG_MTD_NAND_OMAP2=y
 CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
@@ -716,6 +732,9 @@ CONFIG_SMC911X=y
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
 # CONFIG_IBM_NEW_EMAC_TAH is not set
 # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
 # CONFIG_B44 is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
@@ -729,6 +748,7 @@ CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 # CONFIG_LIBERTAS_SDIO is not set
 # CONFIG_LIBERTAS_DEBUG is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
 CONFIG_USB_ZD1201=m
 # CONFIG_USB_NET_RNDIS_WLAN is not set
 # CONFIG_RTL8187 is not set
@@ -754,6 +774,7 @@ CONFIG_USB_USBNET=y
 CONFIG_USB_NET_AX8817X=y
 CONFIG_USB_NET_CDCETHER=y
 CONFIG_USB_NET_DM9601=m
+# CONFIG_USB_NET_SMSC95XX is not set
 CONFIG_USB_NET_GL620A=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
@@ -823,6 +844,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
 CONFIG_MOUSE_PS2_LIFEBOOK=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_APPLETOUCH is not set
@@ -845,7 +867,6 @@ CONFIG_TOUCHSCREEN_ADS7846=y
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 # CONFIG_TOUCHSCREEN_TSC2102 is not set
 # CONFIG_TOUCHSCREEN_TSC210X is not set
-# CONFIG_TOUCHSCREEN_UCB1400 is not set
 # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
 # CONFIG_INPUT_MISC is not set
@@ -1032,6 +1053,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_MAX1111 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
@@ -1054,6 +1076,8 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_TSC210X is not set
 CONFIG_SENSORS_OMAP34XX=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 
@@ -1088,6 +1112,9 @@ CONFIG_TWL4030_POWER=y
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_MFD_TC6393XB is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM8350_I2C is not set
 
 #
 # Multimedia devices
@@ -1129,6 +1156,7 @@ CONFIG_VIDEO_TVEEPROM=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS53L32A=m
@@ -1141,8 +1169,8 @@ CONFIG_VIDEO_CX2341X=m
 # CONFIG_VIDEO_CPIA2 is not set
 # CONFIG_VIDEO_SAA5246A is not set
 # CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_TUNER_3036 is not set
 # CONFIG_VIDEO_AU0828 is not set
+# CONFIG_SOC_CAMERA is not set
 CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
@@ -1171,12 +1199,10 @@ CONFIG_USB_PWC=m
 CONFIG_USB_ZR364XX=m
 # CONFIG_USB_STKWEBCAM is not set
 # CONFIG_USB_S2255 is not set
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_VIDEO_SH_MOBILE_CEU is not set
 CONFIG_RADIO_ADAPTERS=y
-# CONFIG_RADIO_TEA5761 is not set
 # CONFIG_USB_DSBR is not set
 # CONFIG_USB_SI470X is not set
+# CONFIG_USB_MR800 is not set
 CONFIG_DVB_CAPTURE_DRIVERS=y
 # CONFIG_TTPCI_EEPROM is not set
 
@@ -1206,11 +1232,12 @@ CONFIG_DVB_USB_OPERA1=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
 # CONFIG_DVB_USB_DW2102 is not set
+# CONFIG_DVB_USB_CINERGY_T2 is not set
 # CONFIG_DVB_USB_ANYSEE is not set
+# CONFIG_DVB_USB_DTV5100 is not set
+# CONFIG_DVB_USB_AF9015 is not set
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
-CONFIG_DVB_CINERGYT2=m
-# CONFIG_DVB_CINERGYT2_TUNING is not set
 # CONFIG_DVB_SIANO_SMS1XXX is not set
 
 #
@@ -1234,6 +1261,8 @@ CONFIG_DVB_CX24110=m
 CONFIG_DVB_CX24123=m
 CONFIG_DVB_MT312=m
 CONFIG_DVB_S5H1420=m
+# CONFIG_DVB_STV0288 is not set
+# CONFIG_DVB_STB6000 is not set
 CONFIG_DVB_STV0299=m
 CONFIG_DVB_TDA8083=m
 CONFIG_DVB_TDA10086=m
@@ -1241,6 +1270,8 @@ CONFIG_DVB_VES1X93=m
 CONFIG_DVB_TUNER_ITD1000=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
+# CONFIG_DVB_CX24116 is not set
+# CONFIG_DVB_SI21XX is not set
 
 #
 # DVB-T (terrestrial) frontends
@@ -1293,6 +1324,13 @@ CONFIG_DVB_TUNER_DIB0070=m
 CONFIG_DVB_LNBP21=m
 # CONFIG_DVB_ISL6405 is not set
 CONFIG_DVB_ISL6421=m
+# CONFIG_DVB_LGS8GL5 is not set
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+# CONFIG_DVB_AF9013 is not set
 # CONFIG_DAB is not set
 
 #
@@ -1303,6 +1341,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_DDC is not set
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
@@ -1323,15 +1362,27 @@ CONFIG_FB_TILEBLITTING=y
 #
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set
-CONFIG_FB_OMAP=y
-CONFIG_FB_OMAP_VIDEO_MODE=""
-# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set
-# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
-CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=8
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=14
+CONFIG_FB_OMAP2=y
+# CONFIG_FB_OMAP2_DEBUG is not set
+# CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE is not set
+
+#
+# OMAP2/3 Display Device Drivers
+#
+CONFIG_PANEL_DVI=y
+# CONFIG_PANEL_DVI_640X480 is not set
+# CONFIG_PANEL_DVI_800X600 is not set
+CONFIG_PANEL_DVI_1024X768=y
+# CONFIG_PANEL_DVI_1280X1024 is not set
+CONFIG_PANEL_SHARP_LS037V7DW01=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_LTV350QV=y
 CONFIG_LCD_ILI9320=y
+# CONFIG_LCD_TDO24M is not set
 CONFIG_LCD_VGG2432A4=y
 CONFIG_LCD_PLATFORM=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -1359,6 +1410,7 @@ CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
+CONFIG_SOUND_OSS_CORE=y
 CONFIG_SND=y
 CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=y
@@ -1382,12 +1434,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_MTPAV is not set
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_MPU401 is not set
-CONFIG_SND_ARM=y
-# CONFIG_SND_OMAP_AIC23 is not set
-# CONFIG_SND_OMAP_TSC2101 is not set
-# CONFIG_SND_SX1 is not set
-# CONFIG_SND_OMAP_TSC2102 is not set
-# CONFIG_SND_OMAP24XX_EAC is not set
+# CONFIG_SND_ARM is not set
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=y
@@ -1395,6 +1442,7 @@ CONFIG_SND_USB_CAIAQ=m
 CONFIG_SND_USB_CAIAQ_INPUT=y
 CONFIG_SND_SOC=y
 CONFIG_SND_OMAP_SOC=y
+# CONFIG_SND_SOC_ALL_CODECS is not set
 # CONFIG_SOUND_PRIME is not set
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
@@ -1405,9 +1453,36 @@ CONFIG_HID_DEBUG=y
 # USB Input Devices
 #
 CONFIG_USB_HID=y
-# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-# CONFIG_HID_FF is not set
+# CONFIG_HID_PID is not set
 # CONFIG_USB_HIDDEV is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
+CONFIG_HID_A4TECH=y
+CONFIG_HID_APPLE=y
+CONFIG_HID_BELKIN=y
+CONFIG_HID_BRIGHT=y
+CONFIG_HID_CHERRY=y
+CONFIG_HID_CHICONY=y
+CONFIG_HID_CYPRESS=y
+CONFIG_HID_DELL=y
+CONFIG_HID_EZKEY=y
+CONFIG_HID_GYRATION=y
+CONFIG_HID_LOGITECH=y
+# CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+CONFIG_HID_MICROSOFT=y
+CONFIG_HID_MONTEREY=y
+CONFIG_HID_PANTHERLORD=y
+# CONFIG_PANTHERLORD_FF is not set
+CONFIG_HID_PETALYNX=y
+CONFIG_HID_SAMSUNG=y
+CONFIG_HID_SONY=y
+CONFIG_HID_SUNPLUS=y
+# CONFIG_THRUSTMASTER_FF is not set
+# CONFIG_ZEROPLUS_FF is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1427,6 +1502,8 @@ CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_MON=y
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
 
 #
 # USB Host Controller Drivers
@@ -1438,6 +1515,7 @@ CONFIG_USB_MON=y
 # CONFIG_USB_OHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_HWA_HCD is not set
 CONFIG_USB_MUSB_HDRC=y
 CONFIG_USB_MUSB_SOC=y
 
@@ -1460,6 +1538,7 @@ CONFIG_USB_INVENTRA_DMA=y
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_WDM=m
+# CONFIG_USB_TMC is not set
 
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1556,6 +1635,7 @@ CONFIG_USB_SERIAL_DEBUG=m
 CONFIG_USB_EMI62=m
 CONFIG_USB_EMI26=m
 # CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_SEVSEG is not set
 # CONFIG_USB_RIO500 is not set
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LCD=m
@@ -1572,24 +1652,27 @@ CONFIG_USB_LED=m
 # CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_VST is not set
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_AT91 is not set
 # CONFIG_USB_GADGET_ATMEL_USBA is not set
 # CONFIG_USB_GADGET_FSL_USB2 is not set
-# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
 # CONFIG_USB_GADGET_PXA25X is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
 CONFIG_USB_GADGET_M66592=y
 CONFIG_USB_M66592=y
-# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_QE is not set
+# CONFIG_USB_GADGET_NET2280 is not set
 # CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_S3C2410 is not set
-# CONFIG_USB_GADGET_AT91 is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
 # CONFIG_USB_ZERO is not set
@@ -1606,7 +1689,7 @@ CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 
 #
-# MMC/SD Card Drivers
+# MMC/SD/SDIO Card Drivers
 #
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_BOUNCE=y
@@ -1614,11 +1697,13 @@ CONFIG_SDIO_UART=y
 # CONFIG_MMC_TEST is not set
 
 #
-# MMC/SD Host Controller Drivers
+# MMC/SD/SDIO Host Controller Drivers
 #
 # CONFIG_MMC_SDHCI is not set
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_SPI=y
+# CONFIG_MEMSTICK is not set
+# CONFIG_ACCESSIBILITY is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 
@@ -1638,6 +1723,7 @@ CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
@@ -1679,31 +1765,28 @@ CONFIG_RTC_DRV_TWL4030=y
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
 
 #
 # Platform RTC drivers
 #
 # CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1286 is not set
 # CONFIG_RTC_DRV_DS1511 is not set
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
 # CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
 # CONFIG_RTC_DRV_V3020 is not set
 
 #
 # on-CPU RTC drivers
 #
 # CONFIG_DMADEVICES is not set
-
-#
-# Voltage and Current regulators
-#
 # CONFIG_REGULATOR is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
-# CONFIG_REGULATOR_BQ24022 is not set
 # CONFIG_UIO is not set
 
 #
@@ -1719,12 +1802,13 @@ CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
-# CONFIG_EXT4DEV_FS is not set
+# CONFIG_EXT4_FS is not set
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
+CONFIG_FILE_LOCKING=y
 CONFIG_XFS_FS=m
 # CONFIG_XFS_QUOTA is not set
 # CONFIG_XFS_POSIX_ACL is not set
@@ -1771,6 +1855,7 @@ CONFIG_NTFS_FS=m
 #
 CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
@@ -1825,6 +1910,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_REGISTER_V4 is not set
 CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
@@ -1939,32 +2025,44 @@ CONFIG_DEBUG_INFO=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_LATENCYTOP=y
-CONFIG_HAVE_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_TRACER_MAX_TRACE=y
+CONFIG_RING_BUFFER=y
 CONFIG_TRACING=y
-# CONFIG_FTRACE is not set
+
+#
+# Tracers
+#
+# CONFIG_FUNCTION_TRACER is not set
 # CONFIG_IRQSOFF_TRACER is not set
 CONFIG_PREEMPT_TRACER=y
 # CONFIG_SCHED_TRACER is not set
 # CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_BOOT_TRACER is not set
+# CONFIG_STACK_TRACER is not set
 # CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_ERRORS is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_LL is not set
+CONFIG_DEBUG_LL=y
+# CONFIG_DEBUG_ICEDCC is not set
 
 #
 # Security options
 #
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
@@ -1975,10 +2073,12 @@ CONFIG_CRYPTO=y
 #
 # Crypto core or helper
 #
+# CONFIG_CRYPTO_FIPS is not set
 CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD=y
 CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=m
@@ -2052,14 +2152,17 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
 #
 CONFIG_CRYPTO_DEFLATE=m
 # CONFIG_CRYPTO_LZO is not set
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_HW=y
 
 #
 # Library routines
 #
 CONFIG_BITREVERSE=y
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb
index b3af0204d9..c2b7d232d2 100644
--- a/packages/linux/linux-omap_git.bb
+++ b/packages/linux/linux-omap_git.bb
@@ -45,6 +45,7 @@ SRC_URI_append = " \
            file://0011-DSS-Support-for-OMAP3-EVM-board.patch;patch=1 \
 #           file://fix-asoc.diff;patch=1 \
            file://fix-mmc.diff;patch=1 \
+		http://www.bat.org/~tomba/git/0001-debug-prints.patch;patch=1 \
 "
 
 
diff --git a/packages/linux/linux-xilinx-slab_git.bb b/packages/linux/linux-xilinx-slab_git.bb
index df71fee865..2900ad9516 100644
--- a/packages/linux/linux-xilinx-slab_git.bb
+++ b/packages/linux/linux-xilinx-slab_git.bb
@@ -8,7 +8,8 @@ LICENSE = "GPL"
 SRCREV = "d7ed933b578d9c4dec0e23a5a6f78c464b31c47c"
 
 PR = "r3"
-PV = "2.6.25+2.6.26+${PR}+git${SRCREV}"
+PV = "2.6.25+2.6.26+${PR}+gitr${SRCREV}"
+PE = "1"
 
 COMPATIBLE_MACHINE = "xilinx-ml403"
 
diff --git a/packages/mesa/mesa-dri_git.bb b/packages/mesa/mesa-dri_git.bb
index d9e61d8a5c..ec4557f426 100644
--- a/packages/mesa/mesa-dri_git.bb
+++ b/packages/mesa/mesa-dri_git.bb
@@ -5,8 +5,9 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
-PV = "7.2+git${SRCREV}"
+PV = "7.2+gitr${SRCREV}"
 PR = "r1"
+PE = "1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/mplayer/mplayer-maemo_svn.bb b/packages/mplayer/mplayer-maemo_svn.bb
index 5fb3425e64..4e794d0fbe 100644
--- a/packages/mplayer/mplayer-maemo_svn.bb
+++ b/packages/mplayer/mplayer-maemo_svn.bb
@@ -6,7 +6,8 @@ DEPENDS = "virtual/libsdl xsp libmad zlib libpng jpeg liba52 freetype fontconfig
 
 DEFAULT_PREFERENCE_avr32 = "-1"
 
-PV = "0.0+1.0rc1+svn${SRCREV}"
+PV = "0.0+1.0rc1+svnr${SRCREV}"
+PE = "1"
 
 RCONFLICTS_${PN} = "mplayer"
 
diff --git a/packages/opencv/opencv-samples_cvs.bb b/packages/opencv/opencv-samples_cvs.bb
new file mode 100644
index 0000000000..139fc57f5f
--- /dev/null
+++ b/packages/opencv/opencv-samples_cvs.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Opencv : The Open Computer Vision Library"
+HOMEPAGE = "http://sourceforge.net/projects/opencvlibrary"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+
+PR = "r0"
+
+DEPENDS = "opencv"
+
+SRC_URI = "cvs://anonymous@opencvlibrary.cvs.sourceforge.net/cvsroot/opencvlibrary;module=opencv \
+"
+SRCDATE = "20081115"
+PV = "1.0.0+cvs${SRCDATE}"
+
+S = "${WORKDIR}/opencv"
+
+do_compile() {
+    cd samples/c
+	install -d ${D}/${bindir}
+
+    for i in *.c; do
+        echo "compiling $i"
+        ${CXX} -ggdb `pkg-config --cflags opencv` -o `basename $i .c` $i `pkg-config --libs opencv`;
+		install -m 0755 `basename $i .c` ${D}/${bindir}
+	done
+    for i in *.cpp; do
+        echo "compiling $i"
+        ${CXX} -ggdb `pkg-config --cflags opencv` -o `basename $i .cpp` $i `pkg-config --libs opencv`;
+		install -m 0755 `basename $i .cpp` ${D}/${bindir}    
+	done
+}
+
diff --git a/packages/opencv/opencv/acinclude.m4 b/packages/opencv/opencv/acinclude.m4
new file mode 100644
index 0000000000..53518fb2eb
--- /dev/null
+++ b/packages/opencv/opencv/acinclude.m4
@@ -0,0 +1,90 @@
+## this one is commonly used with AM_PATH_PYTHONDIR ...
+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
+dnl Check if a module containing a given symbol is visible to python.
+AC_DEFUN(AM_CHECK_PYMOD,
+[AC_REQUIRE([AM_PATH_PYTHON])
+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
+ifelse([$2],[], [prog="
+import sys
+try:
+        import $1
+except ImportError:
+        sys.exit(1)
+except:
+        sys.exit(0)
+sys.exit(0)"], [prog="
+import $1
+$1.$2"])
+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+  then
+    eval "py_cv_mod_$py_mod_var=yes"
+  else
+    eval "py_cv_mod_$py_mod_var=no"
+  fi
+])
+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
+if test "x$py_val" != xno; then
+  AC_MSG_RESULT(yes)
+  ifelse([$3], [],, [$3
+])dnl
+else
+  AC_MSG_RESULT(no)
+  ifelse([$4], [],, [$4
+])dnl
+fi
+])
+
+dnl a macro to check for ability to create python extensions
+dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+dnl function also defines PYTHON_INCLUDES
+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+[AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING(for headers required to compile python extensions)
+dnl deduce PYTHON_INCLUDES
+AC_ARG_WITH(python-includes,
+	[  --with-python-includes=DIR  path to Python includes], py_exec_prefix=$withval)
+if test x$py_exec_prefix != x; then
+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+else
+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+if test "$py_prefix" != "$py_exec_prefix"; then
+  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+fi
+fi
+AC_SUBST(PYTHON_INCLUDES)
+dnl check if the headers exist:
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+AC_TRY_CPP([#include <Python.h>],dnl
+[AC_MSG_RESULT(found)
+$1],dnl
+[AC_MSG_RESULT(not found)
+$2])
+CPPFLAGS="$save_CPPFLAGS"
+])
+
+dnl
+dnl JH_ADD_CFLAG(FLAG)
+dnl checks whether the C compiler supports the given flag, and if so, adds
+dnl it to $CFLAGS.  If the flag is already present in the list, then the
+dnl check is not performed.
+AC_DEFUN([JH_ADD_CFLAG],
+[
+case " $CFLAGS " in
+*@<:@\	\ @:>@$1@<:@\	\ @:>@*)
+  ;;
+*)
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $1"
+  AC_MSG_CHECKING([whether [$]CC understands $1])
+  AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
+  AC_MSG_RESULT($jh_has_option)
+  if test $jh_has_option = no; then
+    CFLAGS="$save_CFLAGS"
+  fi
+  ;;
+esac])
diff --git a/packages/opencv/opencv_cvs.bb b/packages/opencv/opencv_cvs.bb
new file mode 100644
index 0000000000..cc97a715a0
--- /dev/null
+++ b/packages/opencv/opencv_cvs.bb
@@ -0,0 +1,56 @@
+DESCRIPTION = "Opencv : The Open Computer Vision Library"
+HOMEPAGE = "http://sourceforge.net/projects/opencvlibrary"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+
+PR = "r0"
+
+DEPENDS = "libtool swig swig-native python jpeg zlib libpng tiff glib-2.0"
+
+SRC_URI = "cvs://anonymous@opencvlibrary.cvs.sourceforge.net/cvsroot/opencvlibrary;module=opencv \
+           file://acinclude.m4"
+
+SRCDATE = "20081115"
+PV = "1.0.0+cvs${SRCDATE}"
+
+S = "${WORKDIR}/opencv"
+
+inherit distutils-base autotools pkgconfig
+
+EXTRA_OECONF = "--disable-debug  --with-gtk --enable-apps --with-python az_python_cspec=${STAGING_INCDIR}/${PYTHON_DIR}"
+
+export BUILD_SYS
+export HOST_SYS
+export PYTHON_CSPEC=${STAGING_INCDIR}/${PYTHON_DIR}
+
+do_configure_prepend() {
+	cp ${WORKDIR}/acinclude.m4 ${S}
+	sed -i -e /AC_CONFIG_MACRO_DIR/d -e /AZ_PYTHON_CSPEC/d ${S}/configure.in
+}
+
+PACKAGES += "${PN}-apps python-opencv"
+
+python populate_packages_prepend () {
+	cv_libdir = bb.data.expand('${libdir}', d)
+	cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d)
+	do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True)
+	do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
+	do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
+	do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True)
+}
+
+FILES_${PN} = ""
+FILES_${PN}-doc += "${datadir}/opencv/"
+FILES_${PN}-apps = "${bindir}/*"
+FILES_${PN}-dbg += "${libdir}/.debug"
+FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig"
+
+DESCRIPTION_python-opencv = "Python bindings to opencv"
+FILES_python-opencv = "${libdir}/*/site-packages/*"
+RDEPENDS_python-opencv = "python-core"
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/openmoko-projects/enlazar_svn.bb b/packages/openmoko-projects/enlazar_svn.bb
index 38fdab4747..4d86dc6a06 100644
--- a/packages/openmoko-projects/enlazar_svn.bb
+++ b/packages/openmoko-projects/enlazar_svn.bb
@@ -3,9 +3,9 @@ HOMEPAGE = "http://enlazar.projects.openmoko.org/"
 LICENSE = "GPL"
 DEPENDS = "evas edje ecore edbus"
 RDEPENDS = "networkmanager"
-PV = "0.1+svn${SRCREV}"
+PV = "0.1+svnr${SRCREV}"
 PR = "r3"
-PE = "1"
+PE = "2"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/enlazar;module=trunk;proto=http"
 
diff --git a/packages/openmoko2/openmoko-calculator2/openmoko-calculator.png b/packages/openmoko2/openmoko-calculator2/openmoko-calculator.png
new file mode 100644
index 0000000000..2811364f83
--- /dev/null
+++ b/packages/openmoko2/openmoko-calculator2/openmoko-calculator.png
diff --git a/packages/python/python-lightmediascanner_svn.bb b/packages/python/python-lightmediascanner_svn.bb
index 003b718d4b..3d81c625de 100644
--- a/packages/python/python-lightmediascanner_svn.bb
+++ b/packages/python/python-lightmediascanner_svn.bb
@@ -4,7 +4,8 @@ HOMEPAGE = "http://lms.garage.maemo.org/"
 AUTHOR = "Gustavo Barbieri"
 LICENSE = "LGPL"
 DEPENDS = "lightmediascanner python-cython-native"
-PV = "0.1.0+svn${SRCREV}"
+PV = "0.1.0+svnr${SRCREV}"
+PE = "1"
 
 SRC_URI = "svn://garage.maemo.org/svn/lms/;module=python-lightmediascanner;proto=https"
 S = "${WORKDIR}/python-lightmediascanner"
diff --git a/packages/python/python-twisted_2.5.0.bb b/packages/python/python-twisted_2.5.0.bb
index ccd3e26101..b9a59f8844 100644
--- a/packages/python/python-twisted_2.5.0.bb
+++ b/packages/python/python-twisted_2.5.0.bb
@@ -5,61 +5,74 @@ HOMEPAGE = "http://www.twistedmatrix.com"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/2.5/Twisted-${PV}.tar.bz2 \
            file://remove-zope-check.patch;patch=1"
-
 S = "${WORKDIR}/Twisted-${PV}"
 
 inherit distutils
 
-PACKAGES += "python-twisted-zsh python-twisted-test python-twisted-protocols \
-             python-twisted-runner-dbg \
-             python-twisted-bin  python-twisted-conch python-twisted-lore \
-             python-twisted-mail python-twisted-names python-twisted-news python-twisted-runner \
-             python-twisted-web  python-twisted-words python-twisted python-twisted-core \
-             "
+PACKAGES += "\
+  ${PN}-zsh \
+  ${PN}-test \
+  ${PN}-protocols \
+  ${PN}-bin \
+  ${PN}-conch \
+  ${PN}-lore \
+  ${PN}-mail \
+  ${PN}-names \
+  ${PN}-news \
+  ${PN}-runner \
+  ${PN}-web \
+  ${PN}-words \
+  ${PN}-core \
+"
 
 RDEPENDS = "python-core python-zopeinterface"
-RDEPENDS_python-twisted += "python-twisted-bin python-twisted-conch python-twisted-core \
-                            python-twisted-lore python-twisted-mail python-twisted-names \
-                            python-twisted-news python-twisted-runner python-twisted-web \
-                            python-twisted-words"
-
+RDEPENDS_${PN} += "\
+  ${PN}-bin \
+  ${PN}-conch \
+  ${PN}-lore \
+  ${PN}-mail \
+  ${PN}-names \
+  ${PN}-news \
+  ${PN}-runner \
+  ${PN}-web \
+  ${PN}-words \
+"
 
 ALLOW_EMPTY = "1"
 FILES_${PN} = ""
-FILES_python-twisted = ""
 
-FILES_python-twisted-test = " \
-  ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/web/test \
+FILES_${PN}-test = " \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/test \
 "
 
-FILES_python-twisted-protocols = " \
+FILES_${PN}-protocols = " \
   ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/ \
 "
 
-FILES_python-twisted-zsh = " \
+FILES_${PN}-zsh = " \
   ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zsh \
   ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.* \
 "
 
-FILES_python-twisted-bin = " \
+FILES_${PN}-bin = " \
   ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols/_c_urlarg.so \
   ${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/cBanana.so \
 "
 
-FILES_python-twisted-conch = " \
+FILES_${PN}-conch = " \
   ${bindir}/ckeygen \
   ${bindir}/tkconch \
   ${bindir}/conch \
   ${bindir}/conchftp \
-  ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py \
+  ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_conch.py* \
   ${libdir}/${PYTHON_DIR}/site-packages/twisted/conch  \
 "
 
-FILES_python-twisted-core = " \
+FILES_${PN}-core = " \
 ${bindir}/manhole \
 ${bindir}/mktap \
 ${bindir}/twistd \
@@ -68,17 +81,17 @@ ${bindir}/tap2rpm \
 ${bindir}/tapconvert \
 ${bindir}/tkmktap \
 ${bindir}/trial \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__init__.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/notestplugin.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/testplugin.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_ftp.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_inet.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_manhole.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_portforward.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_socks.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_telnet.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_trial.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/*.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/__init__.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/notestplugin.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/testplugin.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_ftp.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_inet.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_manhole.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_portforward.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_socks.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_telnet.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_trial.py* \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/dropin.cache \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/application \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/cred \
@@ -89,95 +102,96 @@ ${libdir}/${PYTHON_DIR}/site-packages/twisted/manhole \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/persisted \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/protocols\
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/python\
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/timeoutqueue.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/filepath.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dxprofile.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/plugin.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/htmlizer.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__init__.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dispatch.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/hook.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadpool.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/otp.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/usage.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/roots.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/versions.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/urlpath.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/util.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/components.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/logfile.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/runtime.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/reflect.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/context.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadable.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/rebuild.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/failure.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/lockfile.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/formmethod.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/finalize.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/win32.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dist.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/shortcut.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zipstream.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/release.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/syslog.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/log.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/compat.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/procutils.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/python/text.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/timeoutqueue.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/filepath.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dxprofile.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/plugin.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/htmlizer.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/__init__.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dispatch.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/hook.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadpool.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/otp.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/usage.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/roots.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/versions.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/urlpath.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/util.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/components.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/logfile.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/runtime.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/reflect.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/context.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/threadable.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/rebuild.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/failure.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/lockfile.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/formmethod.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/finalize.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/win32.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/dist.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/shortcut.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zipstream.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/release.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/syslog.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/log.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/compat.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/zshcomp.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/procutils.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/python/text.py* \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/python/_twisted_zsh_stub \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/scripts/ \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/spread/ \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/tap/ \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/trial/ \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/__init__.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/_version.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/copyright.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/im.py \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugin.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/__init__.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/_version.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/copyright.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/im.py* \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugin.py* \
 "
 
-FILES_python-twisted-lore = " \
+FILES_${PN}-lore = " \
 ${bindir}/bookify \
 ${bindir}/lore \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_lore.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_lore.py* \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/lore \
 "
 
-FILES_python-twisted-mail = " \
+FILES_${PN}-mail = " \
 ${bindir}/mailmail \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_mail.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_mail.py* \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/mail \
 "
 
-FILES_python-twisted-names = " \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_names.py \
+FILES_${PN}-names = " \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_names.py* \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/names \
 "
 
-FILES_python-twisted-news = " \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_news.py \
+FILES_${PN}-news = " \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_news.py* \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/news \
 "
 
-FILES_python-twisted-runner = " \
+FILES_${PN}-runner = " \
 ${libdir}/site-packages/twisted/runner/portmap.so \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/runner\
 "
 
-FILES_python-twisted-web = " \
+FILES_${PN}-web = " \
 ${bindir}/websetroot \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_web.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_web.py* \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/web\
 "
 
-FILES_python-twisted-words = " \
+FILES_${PN}-words = " \
 ${bindir}/im \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_words.py \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/plugins/twisted_words.py* \
 ${libdir}/${PYTHON_DIR}/site-packages/twisted/words\
 "
 
-FILES_python-twisted-runner-dbg += " \
-${libdir}/${PYTHON_DIR}/site-packages/twisted/runner/.debug"
-
+FILES_${PN}-dbg += " \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/*/.debug \
+${libdir}/${PYTHON_DIR}/site-packages/twisted/*/*/.debug \
+"
diff --git a/packages/qt/qt-x11-free_3.3.7.bb b/packages/qt/qt-x11-free_3.3.7.bb
index d5df55cbb4..a2f5c0bcbf 100644
--- a/packages/qt/qt-x11-free_3.3.7.bb
+++ b/packages/qt/qt-x11-free_3.3.7.bb
@@ -1,4 +1,4 @@
-DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa"
+DEPENDS = "uicmoc3-native freetype virtual/libx11 libxmu xft libxext libxrender libxrandr libxcursor mysql mesa"
 PROVIDES = "qt3x11"
 PR = "r1"
 
diff --git a/packages/quake/quake2_svn.bb b/packages/quake/quake2_svn.bb
index 5ce56dc93b..31491ad419 100644
--- a/packages/quake/quake2_svn.bb
+++ b/packages/quake/quake2_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Icculus.org quake2 engine"
 LICENSE = "GPL"
 
-DEPENDS = "libsdl-x11" 
+DEPENDS = "libsdl-x11 libxxf86dga" 
 
 SRCREV = "205"
 PV = "0.16.1+svnr${SRCREV}"
diff --git a/packages/remoko/remoko-server_svn.bb b/packages/remoko/remoko-server_svn.bb
index 6e049d7c70..d246e1d2c5 100644
--- a/packages/remoko/remoko-server_svn.bb
+++ b/packages/remoko/remoko-server_svn.bb
@@ -3,7 +3,8 @@ HOMEPAGE = "http://code.google.com/p/remoko/"
 AUTHOR = "Valério Valério"
 LICENSE = "GPL"
 SECTION = "console/network"
-PV = "0.2+svn${SRCREV}"
+PV = "0.2+svnr${SRCREV}"
+PE = "1"
 
 SRC_URI = "svn://remoko.googlecode.com/svn/trunk;module=BT_HID_Server;proto=http"
 S = "${WORKDIR}/BT_HID_Server"
diff --git a/packages/remoko/remoko_svn.bb b/packages/remoko/remoko_svn.bb
index 551a54b79e..475e3cc81e 100644
--- a/packages/remoko/remoko_svn.bb
+++ b/packages/remoko/remoko_svn.bb
@@ -4,7 +4,8 @@ AUTHOR = "Valério Valério"
 LICENSE = "GPL"
 SECTION = "console/network"
 DEPENDS = "edje-native"
-PV = "0.3.1+svn${SRCREV}"
+PV = "0.3.1+svnr${SRCREV}"
+PE = "1"
 
 SRC_URI = "svn://remoko.googlecode.com/svn/trunk;module=BT_HID_UI;proto=http"
 S = "${WORKDIR}/BT_HID_UI"
diff --git a/packages/smpeg/smpeg_svn.bb b/packages/smpeg/smpeg_svn.bb
index e6c0f6444a..656980f8cf 100644
--- a/packages/smpeg/smpeg_svn.bb
+++ b/packages/smpeg/smpeg_svn.bb
@@ -4,7 +4,8 @@ LICENSE = "LGPL"
 SECTION = "libs/multimedia"
 DEPENDS = "virtual/libsdl"
 PROVIDES = "smpeg"
-PV = "0.4.5+rsvn${SRCREV}"
+PV = "0.4.5+svnr${SRCREV}"
+PE = "1"
 SRCREV = "370"
 
 SRC_URI = "svn://svn.icculus.org/smpeg/;module=trunk  \
diff --git a/packages/sylpheed/claws-mail_3.3.0.bb b/packages/sylpheed/claws-mail_3.3.0.bb
deleted file mode 100644
index 29e7a5bc63..0000000000
--- a/packages/sylpheed/claws-mail_3.3.0.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-SECTION = "x11/network"
-DESCRIPTION = "Mail user agent"
-DEPENDS = "gtk+ libetpan openssl aspell"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "\
-	${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2	\
-	file://desktop.patch;patch=1				\
-	"
-
-FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
-
-EXTRA_OECONF = "--disable-aspell-test 		\
-		--enable--aspell 		\
-		--disable-manual		\
-		--disable-crash-dialog		\
-		--disable-jpilot		\
-		--disable-trayicon-plugin	\
-		--disable-spamassassin-plugin	\
-		--disable-bogofilter-plugin	\
-		--disable-pgpcore-plugin	\
-		--disable-pgpmime-plugin	\
-		--disable-pgpinline-plugin	\
-  		--disable-dillo-viewer-plugin	\
-		--disable-clamav-plugin		\
-		--disable-gnomeprint		\
-		--disable-valgrind		\
-		"
-
-inherit autotools pkgconfig
-
-do_install_append() {
-	install -d ${D}${datadir}/applications
-	install -m 0644 claws-mail.desktop ${D}${datadir}/applications/
-	install -d ${D}${datadir}/pixmaps
-	install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/
-}
-
-do_stage () {
-	autotools_stage_all
-}
-
diff --git a/packages/sylpheed/claws-mail_3.6.1.bb b/packages/sylpheed/claws-mail_3.6.1.bb
new file mode 100644
index 0000000000..ac0ff1bd26
--- /dev/null
+++ b/packages/sylpheed/claws-mail_3.6.1.bb
@@ -0,0 +1,51 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent"
+DEPENDS = "gtk+ libetpan openssl aspell"
+LICENSE = "GPL"
+PR = "r0"
+
+inherit autotools pkgconfig
+
+# translation patch: http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=1774
+SRC_URI = "\
+	${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2 \
+	http://www.penguin.cz/~utx/ftp/claws-mail/claws-mail-${PV}-po-update.patch;patch=1 \
+	file://desktop.patch;patch=1 \
+	file://claws-mail-g_strcmp0.patch;patch=1 \
+	"
+
+do_configure_append() {
+	cd po ; for PO in *.po ; do MO=`echo $PO | sed s/\\.po//`.gmo ; if ! test -f $MO ; then msgfmt $PO -o $MO ; fi ; done
+}
+
+# FIXME: maemo builds may want --enable-maemo
+# FIXME: some platforms may want --enable-generic-umpc
+EXTRA_OECONF = "--disable-aspell-test 		\
+		--enable-aspell 		\
+		--disable-manual		\
+		--disable-crash-dialog		\
+		--disable-jpilot		\
+		--disable-trayicon-plugin	\
+		--disable-spamassassin-plugin	\
+		--disable-bogofilter-plugin	\
+		--disable-pgpcore-plugin	\
+		--disable-pgpmime-plugin	\
+		--disable-pgpinline-plugin	\
+  		--disable-dillo-viewer-plugin	\
+		--disable-clamav-plugin		\
+		--disable-gnomeprint		\
+		--disable-valgrind		\
+		"
+
+# Remove enchant references:
+do_install_prepend() {
+	sed -i -e 's:${STAGING_INCDIR}:${includedir}:g;s:${STAGING_LIBDIR}:${libdir}:g' claws-mail.pc
+}
+
+# Work-around broken GPE icon lookup:
+do_install_append() {
+	rm -r ${D}${datadir}/icons
+	install -d ${D}${datadir}/pixmaps
+	install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/
+	sed -i 's/Icon=[^.]*$/&.png/' ${D}${datadir}/applications/claws-mail.desktop
+}
diff --git a/packages/sylpheed/files/claws-mail-g_strcmp0.patch b/packages/sylpheed/files/claws-mail-g_strcmp0.patch
new file mode 100644
index 0000000000..17c213d732
--- /dev/null
+++ b/packages/sylpheed/files/claws-mail-g_strcmp0.patch
@@ -0,0 +1,575 @@
+http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=1773
+
+However using if (g_utf8_collate(foo1, foo2)) works and gives good results (at
+least if glibc or locale data are not broken), this usage is bad.
+
+If you need to just compare strings to get equal/non-equal return value, than
+using of four-pass locale wise lexicographic collating is purely superfluous.
+
+Using simpler functions like strcmp() or g_strcmp0() will give the same result
+5-50 times faster.
+
+In attached patch, I replaces all occurrences of upper mentioned use case.
+
+Stanislav Brabec
+
+diff -ur claws-mail-3.6.1.orig/src/addrcustomattr.c claws-mail-3.6.1/src/addrcustomattr.c
+--- claws-mail-3.6.1.orig/src/addrcustomattr.c	2008-07-25 23:01:29.000000000 +0200
++++ claws-mail-3.6.1/src/addrcustomattr.c	2008-11-14 14:27:12.000000000 +0100
+@@ -353,7 +353,7 @@
+ 	gchar *attr;
+ 	gtk_tree_model_get(model, iter, CUSTOM_ATTR_NAME, &attr, -1);
+ 
+-	if (g_utf8_collate(data->attr, attr)==0) {
++	if (g_strcmp0(data->attr, attr)==0) {
+ 		data->path = path; /* signal we found it */
+ 		data->iter = *iter;
+ 		return TRUE;
+diff -ur claws-mail-3.6.1.orig/src/addressbook_foldersel.c claws-mail-3.6.1/src/addressbook_foldersel.c
+--- claws-mail-3.6.1.orig/src/addressbook_foldersel.c	2008-09-09 19:10:50.000000000 +0200
++++ claws-mail-3.6.1/src/addressbook_foldersel.c	2008-11-14 14:27:12.000000000 +0100
+@@ -392,12 +392,19 @@
+        corresponds to what we received */
+ 
+ 	if ( path != NULL ) {
+-		if ( g_utf8_collate(path, _("Any")) == 0 || strcasecmp(path, "Any") ==0 || *path == '\0' )
++		/* FIXME: Do we really need to recognize "anY" (and translated form)? */
++		/* It's a bit more complicated than g_utf8_collate, but still much faster */
++		char *tmp1, *tmp2;
++		tmp1 = g_utf8_casefold(path, -1);
++		tmp2 = g_utf8_casefold(_("Any"), -1); /* FIXME: This should be done only once. */
++		if ( g_strcmp0(tmp1, tmp2) == 0 || g_ascii_strcasecmp(path, "Any") ==0 || *path == '\0' )
+ 			/* consider "Any" (both translated or untranslated forms) and ""
+ 			   as valid addressbook roots */
+ 			folder_path_match.matched = TRUE;
+ 		else
+ 			folder_path_match.folder_path = g_strsplit( path, "/", 256 );
++		g_free(tmp1);
++		g_free(tmp2);
+ 	}
+ 
+ 	addressbook_foldersel_load_data( addrIndex, &folder_path_match );
+diff -ur claws-mail-3.6.1.orig/src/addrgather.c claws-mail-3.6.1/src/addrgather.c
+--- claws-mail-3.6.1.orig/src/addrgather.c	2008-09-09 19:10:50.000000000 +0200
++++ claws-mail-3.6.1/src/addrgather.c	2008-11-14 14:27:12.000000000 +0100
+@@ -507,7 +507,7 @@
+ 	for (i = 0; i < NUM_FIELDS; i++) {
+ 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(addrgather_dlg.checkHeader[i]),
+ 					     FALSE);
+-		if (g_utf8_collate(_harv_headerNames_[i], HEADER_FROM) == 0)
++		if (g_strcmp0(_harv_headerNames_[i], HEADER_FROM) == 0)
+ 			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(addrgather_dlg.checkHeader[i]),
+ 						    TRUE);
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/common/mgutils.c claws-mail-3.6.1/src/common/mgutils.c
+--- claws-mail-3.6.1.orig/src/common/mgutils.c	2007-10-15 19:19:53.000000000 +0200
++++ claws-mail-3.6.1/src/common/mgutils.c	2008-11-14 14:27:12.000000000 +0100
+@@ -356,7 +356,7 @@
+ 		if( strlen( str ) > 0 ) {
+ 			node = list;
+ 			while( node ) {
+-				if( g_utf8_collate( str, node->data ) == 0 )
++				if( g_strcmp0( str, node->data ) == 0 )
+ 					return FALSE;
+ 				node = g_slist_next( node );
+ 			}
+@@ -380,7 +380,7 @@
+ 		if( strlen( str ) > 0 ) {
+ 			node = list;
+ 			while( node ) {
+-				if( g_utf8_collate( str, node->data ) == 0 )
++				if( g_strcmp0( str, node->data ) == 0 )
+ 					return FALSE;
+ 				node = g_list_next( node );
+ 			}
+diff -ur claws-mail-3.6.1.orig/src/compose.c claws-mail-3.6.1/src/compose.c
+--- claws-mail-3.6.1.orig/src/compose.c	2008-10-04 12:58:45.000000000 +0200
++++ claws-mail-3.6.1/src/compose.c	2008-11-14 14:27:12.000000000 +0100
+@@ -2399,7 +2399,7 @@
+ 	for (h_list = compose->header_list; h_list != NULL; h_list = h_list->next) {
+ 		entry = GTK_ENTRY(((ComposeHeaderEntry *)h_list->data)->entry);
+ 		if (gtk_entry_get_text(entry) && 
+-		    !g_utf8_collate(gtk_entry_get_text(entry), mailto)) {
++		    !g_strcmp0(gtk_entry_get_text(entry), mailto)) {
+ 			if (yellow_initialised) {
+ 				gtk_widget_modify_base(
+ 					GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
+@@ -4858,7 +4858,7 @@
+ 		headerentry = ((ComposeHeaderEntry *)list->data);
+ 		headerentryname = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((headerentry->combo)))));
+ 
+-		if (g_utf8_collate(headerentryname, to_hdr) == 0) {
++		if (g_strcmp0(headerentryname, to_hdr) == 0) {
+ 			const gchar *entstr = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+ 			Xstrdup_a(str, entstr, return -1);
+ 			g_strstrip(str);
+@@ -4886,7 +4886,7 @@
+ 		headerentry = ((ComposeHeaderEntry *)list->data);
+ 		headerentryname = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((headerentry->combo)))));
+ 
+-		if (g_utf8_collate(headerentryname, cc_hdr) == 0) {
++		if (g_strcmp0(headerentryname, cc_hdr) == 0) {
+ 			const gchar *strg = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+ 			Xstrdup_a(str, strg, return -1);
+ 			g_strstrip(str);
+@@ -5760,7 +5760,7 @@
+     		headerentry = ((ComposeHeaderEntry *)list->data);
+ 		headerentryname = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((headerentry->combo)))));
+ 
+-		if (!g_utf8_collate(trans_fieldname, headerentryname)) {
++		if (!g_strcmp0(trans_fieldname, headerentryname)) {
+ 			str = gtk_editable_get_chars(GTK_EDITABLE(headerentry->entry), 0, -1);
+ 			g_strstrip(str);
+ 			if (str[0] != '\0') {
+diff -ur claws-mail-3.6.1.orig/src/customheader.c claws-mail-3.6.1/src/customheader.c
+--- claws-mail-3.6.1.orig/src/customheader.c	2007-07-11 18:33:01.000000000 +0200
++++ claws-mail-3.6.1/src/customheader.c	2008-11-14 14:27:12.000000000 +0100
+@@ -83,7 +83,7 @@
+ 
+ 	for (cur = header_list; cur != NULL; cur = cur->next) {
+ 		chdr = (CustomHeader *)cur->data;
+-		if (!g_utf8_collate(chdr->name, header))
++		if (!g_strcmp0(chdr->name, header))
+ 			return chdr;
+ 	}
+ 
+diff -ur claws-mail-3.6.1.orig/src/exportldif.c claws-mail-3.6.1/src/exportldif.c
+--- claws-mail-3.6.1.orig/src/exportldif.c	2007-10-04 19:36:26.000000000 +0200
++++ claws-mail-3.6.1/src/exportldif.c	2008-11-14 14:27:12.000000000 +0100
+@@ -275,7 +275,7 @@
+ 		UserAttribute *attrib = node->data;
+ 
+ 		node = g_list_next( node );
+-		if( g_utf8_collate( attrib->name, LDIF_TAG_DN ) == 0 ) {
++		if( g_strcmp0( attrib->name, LDIF_TAG_DN ) == 0 ) {
+ 			retVal = g_strdup( attrib->value );
+ 			break;
+ 		}
+diff -ur claws-mail-3.6.1.orig/src/gtk/combobox.c claws-mail-3.6.1/src/gtk/combobox.c
+--- claws-mail-3.6.1.orig/src/gtk/combobox.c	2008-08-29 10:37:19.000000000 +0200
++++ claws-mail-3.6.1/src/gtk/combobox.c	2008-11-14 14:27:12.000000000 +0100
+@@ -101,7 +101,7 @@
+ 	const gchar *curdata;
+ 
+ 	gtk_tree_model_get (GTK_TREE_MODEL(model), iter, 0, &curdata, -1);
+-	if (!g_utf8_collate(data, curdata)) {
++	if (!g_strcmp0(data, curdata)) {
+ 		gtk_combo_box_set_active_iter(combobox, iter);
+ 		return TRUE;
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/jpilot.c claws-mail-3.6.1/src/jpilot.c
+--- claws-mail-3.6.1.orig/src/jpilot.c	2008-10-01 09:10:29.000000000 +0200
++++ claws-mail-3.6.1/src/jpilot.c	2008-11-14 14:27:12.000000000 +0100
+@@ -1322,7 +1322,7 @@
+ 					}
+ 				}
+ 
+-				if( g_utf8_collate( labelName, lbl ) == 0 ) {
++				if( g_strcmp0( labelName, lbl ) == 0 ) {
+ 					ind = i;
+ 					break;
+ 				}
+@@ -1640,7 +1640,7 @@
+ 	if( labelName ) {
+ 		node = pilotFile->customLabels;
+ 		while( node ) {
+-			if( g_utf8_collate( labelName, ( gchar * ) node->data ) == 0 ) {
++			if( g_strcmp0( labelName, ( gchar * ) node->data ) == 0 ) {
+ 				retVal = TRUE;
+ 				break;
+ 			}
+diff -ur claws-mail-3.6.1.orig/src/ldapserver.c claws-mail-3.6.1/src/ldapserver.c
+--- claws-mail-3.6.1.orig/src/ldapserver.c	2007-08-22 18:08:33.000000000 +0200
++++ claws-mail-3.6.1/src/ldapserver.c	2008-11-14 14:27:12.000000000 +0100
+@@ -437,7 +437,7 @@
+ 	/* Search backwards for query */
+ 	while( node ) {
+ 		LdapQuery *qry = node->data;
+-		if( g_utf8_collate( ADDRQUERY_SEARCHVALUE(qry), searchTerm ) == 0 ) {
++		if( g_strcmp0( ADDRQUERY_SEARCHVALUE(qry), searchTerm ) == 0 ) {
+ 			if( qry->agedFlag ) continue;
+ 			if( qry->completed ) {
+ 				/* Found */
+diff -ur claws-mail-3.6.1.orig/src/ldif.c claws-mail-3.6.1/src/ldif.c
+--- claws-mail-3.6.1.orig/src/ldif.c	2008-08-06 21:38:36.000000000 +0200
++++ claws-mail-3.6.1/src/ldif.c	2008-11-14 14:27:12.000000000 +0100
+@@ -536,19 +536,19 @@
+ 	}
+ 	g_strstrip( val );
+ 
+-	if( g_utf8_collate( nm, LDIF_TAG_COMMONNAME ) == 0 ) {
++	if( g_strcmp0( nm, LDIF_TAG_COMMONNAME ) == 0 ) {
+ 		rec->listCName = g_slist_append( rec->listCName, val );
+ 	}
+-	else if( g_utf8_collate( nm, LDIF_TAG_FIRSTNAME ) == 0 ) {
++	else if( g_strcmp0( nm, LDIF_TAG_FIRSTNAME ) == 0 ) {
+ 		rec->listFName = g_slist_append( rec->listFName, val );
+ 	}
+-	else if( g_utf8_collate( nm, LDIF_TAG_LASTNAME ) == 0 ) {
++	else if( g_strcmp0( nm, LDIF_TAG_LASTNAME ) == 0 ) {
+ 		rec->listLName = g_slist_append( rec->listLName, val );
+ 	}
+-	else if( g_utf8_collate( nm, LDIF_TAG_NICKNAME ) == 0 ) {
++	else if( g_strcmp0( nm, LDIF_TAG_NICKNAME ) == 0 ) {
+ 		rec->listNName = g_slist_append( rec->listNName, val );
+ 	}
+-	else if( g_utf8_collate( nm, LDIF_TAG_EMAIL ) == 0 ) {
++	else if( g_strcmp0( nm, LDIF_TAG_EMAIL ) == 0 ) {
+ 		rec->listAddress = g_slist_append( rec->listAddress, val );
+ 	}
+ 	else {
+@@ -759,27 +759,27 @@
+ 			gchar *key = g_strdup( tag );
+ 
+ 			rec = ldif_create_fieldrec( tag );
+-			if( g_utf8_collate( tag, LDIF_TAG_DN ) == 0 ) {
++			if( g_strcmp0( tag, LDIF_TAG_DN ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( "dn" );
+ 			}
+-			else if( g_utf8_collate( tag, LDIF_TAG_COMMONNAME ) == 0 ) {
++			else if( g_strcmp0( tag, LDIF_TAG_COMMONNAME ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( _( "Display Name" ) );
+ 			}
+-			else if( g_utf8_collate( tag, LDIF_TAG_FIRSTNAME ) == 0 ) {
++			else if( g_strcmp0( tag, LDIF_TAG_FIRSTNAME ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( _( "First Name" ) );
+ 			}
+-			else if( g_utf8_collate( tag, LDIF_TAG_LASTNAME ) == 0 ) {
++			else if( g_strcmp0( tag, LDIF_TAG_LASTNAME ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( _( "Last Name" ) );
+ 			}
+-			else if( g_utf8_collate( tag, LDIF_TAG_NICKNAME ) == 0 ) {
++			else if( g_strcmp0( tag, LDIF_TAG_NICKNAME ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( _( "Nick Name" ) );
+ 			}
+-			else if( g_utf8_collate( tag, LDIF_TAG_EMAIL ) == 0 ) {
++			else if( g_strcmp0( tag, LDIF_TAG_EMAIL ) == 0 ) {
+ 				rec->reserved = rec->selected = TRUE;
+ 				rec->userName = g_strdup( _( "Email Address" ) );
+ 			}
+@@ -894,7 +894,7 @@
+ 					/* Add tag to list */
+ 					listTags = g_slist_append( listTags, tagName );
+ 
+-					if( g_utf8_collate(
++					if( g_strcmp0(
+ 						tagName, LDIF_TAG_EMAIL ) == 0 )
+ 					{
+ 						flagMail = TRUE;
+diff -ur claws-mail-3.6.1.orig/src/plugins/bogofilter/bogofilter_gtk.c claws-mail-3.6.1/src/plugins/bogofilter/bogofilter_gtk.c
+--- claws-mail-3.6.1.orig/src/plugins/bogofilter/bogofilter_gtk.c	2008-09-09 19:10:52.000000000 +0200
++++ claws-mail-3.6.1/src/plugins/bogofilter/bogofilter_gtk.c	2008-11-14 14:27:12.000000000 +0100
+@@ -296,7 +296,7 @@
+ 					config->whitelist_ab_folder);
+ 		else
+ 		/* backward compatibility (when translated "Any" was stored) */
+-		if (g_utf8_collate(config->whitelist_ab_folder, _("Any")) == 0)
++		if (g_strcmp0(config->whitelist_ab_folder, _("Any")) == 0)
+ 			gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
+ 					config->whitelist_ab_folder);
+ 		else
+@@ -373,7 +373,7 @@
+ 	config->whitelist_ab_folder = gtk_editable_get_chars(
+ 				GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((page->whitelist_ab_folder_combo)))), 0, -1);
+ 	/* store UNtranslated "Any" */
+-	if (g_utf8_collate(config->whitelist_ab_folder, _("Any")) == 0) {
++	if (g_strcmp0(config->whitelist_ab_folder, _("Any")) == 0) {
+ 		g_free(config->whitelist_ab_folder);
+ 		config->whitelist_ab_folder = g_strdup("Any");
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/plugins/dillo_viewer/dillo_prefs.c claws-mail-3.6.1/src/plugins/dillo_viewer/dillo_prefs.c
+--- claws-mail-3.6.1.orig/src/plugins/dillo_viewer/dillo_prefs.c	2008-08-07 18:38:59.000000000 +0200
++++ claws-mail-3.6.1/src/plugins/dillo_viewer/dillo_prefs.c	2008-11-14 14:27:12.000000000 +0100
+@@ -209,7 +209,7 @@
+ 					_("Any"));
+ 		else
+ 		/* backward compatibility (when translated "Any" was stored) */
+-		if (g_utf8_collate(dillo_prefs.whitelist_ab_folder, _("Any")) == 0)
++		if (g_strcmp0(dillo_prefs.whitelist_ab_folder, _("Any")) == 0)
+ 			gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
+ 					dillo_prefs.whitelist_ab_folder);
+ 		else
+@@ -272,7 +272,7 @@
+ 	dillo_prefs.whitelist_ab_folder = gtk_editable_get_chars(
+ 				GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((prefs_page->whitelist_ab_folder_combo)))), 0, -1);
+ 	/* store UNtranslated "Any" */
+-	if (g_utf8_collate(dillo_prefs.whitelist_ab_folder, _("Any")) == 0) {
++	if (g_strcmp0(dillo_prefs.whitelist_ab_folder, _("Any")) == 0) {
+ 		g_free(dillo_prefs.whitelist_ab_folder);
+ 		dillo_prefs.whitelist_ab_folder = g_strdup("Any");
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/plugins/spamassassin/spamassassin_gtk.c claws-mail-3.6.1/src/plugins/spamassassin/spamassassin_gtk.c
+--- claws-mail-3.6.1.orig/src/plugins/spamassassin/spamassassin_gtk.c	2008-09-09 19:10:52.000000000 +0200
++++ claws-mail-3.6.1/src/plugins/spamassassin/spamassassin_gtk.c	2008-11-14 14:27:12.000000000 +0100
+@@ -480,7 +480,7 @@
+ 					config->whitelist_ab_folder);
+ 		else
+ 		/* backward compatibility (when translated "Any" was stored) */
+-		if (g_utf8_collate(config->whitelist_ab_folder, _("Any")) == 0)
++		if (g_strcmp0(config->whitelist_ab_folder, _("Any")) == 0)
+ 			gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
+ 					config->whitelist_ab_folder);
+ 		else
+@@ -603,7 +603,7 @@
+ 	config->whitelist_ab_folder = gtk_editable_get_chars(
+ 				GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((page->whitelist_ab_folder_combo)))), 0, -1);
+ 	/* store UNtranslated "Any" */
+-	if (g_utf8_collate(config->whitelist_ab_folder, _("Any")) == 0) {
++	if (g_strcmp0(config->whitelist_ab_folder, _("Any")) == 0) {
+ 		g_free(config->whitelist_ab_folder);
+ 		config->whitelist_ab_folder = g_strdup("Any");
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/prefs_matcher.c claws-mail-3.6.1/src/prefs_matcher.c
+--- claws-mail-3.6.1.orig/src/prefs_matcher.c	2008-10-08 20:23:51.000000000 +0200
++++ claws-mail-3.6.1/src/prefs_matcher.c	2008-11-14 14:27:12.000000000 +0100
+@@ -1484,10 +1484,10 @@
+ 		if (*expr == '\0') {
+ 			gchar *tmp;
+ 
+-			if (g_utf8_collate(header, Q_("Filtering Matcher Menu|All")) == 0)
++			if (g_strcmp0(header, Q_("Filtering Matcher Menu|All")) == 0)
+ 				tmp = g_strdup(_("all addresses in all headers"));
+ 			else
+-			if (g_utf8_collate(header, _("Any")) == 0)
++			if (g_strcmp0(header, _("Any")) == 0)
+ 				tmp = g_strdup(_("any address in any header"));
+ 			else
+ 				tmp = g_strdup_printf(_("the address(es) in header '%s'"), header);
+@@ -1499,12 +1499,12 @@
+ 		    return NULL;
+ 		}
+ 		/* store UNtranslated "Any"/"All" in matcher expressions */
+-		if (g_utf8_collate(header, Q_("Filtering Matcher Menu|All")) == 0)
++		if (g_strcmp0(header, Q_("Filtering Matcher Menu|All")) == 0)
+ 			header = "All";
+ 		else
+-			if (g_utf8_collate(header, _("Any")) == 0)
++			if (g_strcmp0(header, _("Any")) == 0)
+ 				header = "Any";
+-		if (g_utf8_collate(expr, _("Any")) == 0)
++		if (g_strcmp0(expr, _("Any")) == 0)
+ 			expr = "Any";
+ 		break;
+ 	}
+diff -ur claws-mail-3.6.1.orig/src/prefs_toolbar.c claws-mail-3.6.1/src/prefs_toolbar.c
+--- claws-mail-3.6.1.orig/src/prefs_toolbar.c	2008-09-09 19:10:50.000000000 +0200
++++ claws-mail-3.6.1/src/prefs_toolbar.c	2008-11-14 14:27:12.000000000 +0100
+@@ -391,7 +391,7 @@
+ 		gtk_tree_model_get(model_set, &iter,
+ 				   SET_EVENT, &entry, 
+ 				   -1);
+-		if (g_utf8_collate(chosen_action, entry) == 0) 
++		if (g_strcmp0(chosen_action, entry) == 0) 
+ 			result = TRUE;
+ 		g_free(entry);			
+ 	} while (!result && gtk_tree_model_iter_next(model_set, &iter));
+@@ -551,7 +551,7 @@
+ 						prefs_toolbar->item_func_combo));
+ 						
+ 			if (is_duplicate(prefs_toolbar, icon_event)
+-			&& g_utf8_collate(icon_event, set_event) != 0){
++			&& g_strcmp0(icon_event, set_event) != 0){
+ 				alertpanel_error(ERROR_MSG);
+ 				g_free(icon_event);
+ 				g_free(set_event);
+@@ -1179,7 +1179,7 @@
+ 	gtk_button_set_image(GTK_BUTTON(prefs_toolbar->icon_button),
+ 			     gtk_image_new_from_pixbuf(pix));
+ 	
+-	if (g_utf8_collate(toolbar_ret_descr_from_val(A_SEPARATOR), descr) == 0) {
++	if (g_strcmp0(toolbar_ret_descr_from_val(A_SEPARATOR), descr) == 0) {
+ 		gtk_button_set_label(GTK_BUTTON(prefs_toolbar->icon_button),
+ 				    _("None"));
+ 		g_free(prefs_toolbar->item_icon_file);
+@@ -1196,7 +1196,7 @@
+ 	gtk_entry_set_text(GTK_ENTRY(prefs_toolbar->item_text_entry), 
+ 			   icon_text);
+ 
+-	if (g_utf8_collate(toolbar_ret_descr_from_val(A_CLAWS_ACTIONS), descr) == 0) {
++	if (g_strcmp0(toolbar_ret_descr_from_val(A_CLAWS_ACTIONS), descr) == 0) {
+ 		gtk_combo_box_set_active(GTK_COMBO_BOX(
+ 			prefs_toolbar->item_type_combo), ITEM_USER_ACTION);
+ 
+@@ -1205,7 +1205,7 @@
+ 			gchar *item_string;
+ 			get_action_name((gchar *)cur2->data, &item_string);
+ 			
+-			if(g_utf8_collate(item_string, icon_text) == 0) {
++			if(g_strcmp0(item_string, icon_text) == 0) {
+ 				gtk_combo_box_set_active(
+ 					GTK_COMBO_BOX(prefs_toolbar->item_action_combo),
+ 					item_num);
+@@ -1231,7 +1231,7 @@
+ 	for (cur = prefs_toolbar->combo_action_list, item_num = 0; cur != NULL; 
+ 	     cur = cur->next) {
+ 		gchar *item_str = (gchar*)cur->data;
+-		if (g_utf8_collate(item_str, descr) == 0) {
++		if (g_strcmp0(item_str, descr) == 0) {
+ 			gtk_combo_box_set_active(
+ 				GTK_COMBO_BOX(prefs_toolbar->item_func_combo),
+ 				item_num);
+diff -ur claws-mail-3.6.1.orig/src/procmime.c claws-mail-3.6.1/src/procmime.c
+--- claws-mail-3.6.1.orig/src/procmime.c	2008-10-01 09:10:29.000000000 +0200
++++ claws-mail-3.6.1/src/procmime.c	2008-11-14 14:27:12.000000000 +0100
+@@ -1020,14 +1020,6 @@
+ 	return hash_result;
+ }
+ 
+-static gint procmime_str_equal(gconstpointer gptr1, gconstpointer gptr2)
+-{
+-	const char *str1 = gptr1;
+-	const char *str2 = gptr2;
+-
+-	return !g_utf8_collate(str1, str2);
+-}
+-
+ static GHashTable *procmime_get_mime_type_table(void)
+ {
+ 	GHashTable *table = NULL;
+@@ -1040,7 +1032,7 @@
+ 		if (!mime_type_list) return NULL;
+ 	}
+ 
+-	table = g_hash_table_new(procmime_str_hash, procmime_str_equal);
++	table = g_hash_table_new(procmime_str_hash, g_str_equal);
+ 
+ 	for (cur = mime_type_list; cur != NULL; cur = cur->next) {
+ 		gint i;
+diff -ur claws-mail-3.6.1.orig/src/summaryview.c claws-mail-3.6.1/src/summaryview.c
+--- claws-mail-3.6.1.orig/src/summaryview.c	2008-10-09 20:17:53.000000000 +0200
++++ claws-mail-3.6.1/src/summaryview.c	2008-11-14 14:27:12.000000000 +0100
+@@ -4240,7 +4240,7 @@
+ 					g_strdup_printf("%s",
+ 							account->address);
+ 			
+-			if (g_utf8_collate(from_name, msginfo->from) == 0) {
++			if (g_strcmp0(from_name, msginfo->from) == 0) {
+ 				g_free(from_name);
+ 				found = TRUE;
+ 				break;
+diff -ur claws-mail-3.6.1.orig/src/toolbar.c claws-mail-3.6.1/src/toolbar.c
+--- claws-mail-3.6.1.orig/src/toolbar.c	2008-09-13 12:07:43.000000000 +0200
++++ claws-mail-3.6.1/src/toolbar.c	2008-11-14 14:39:07.000000000 +0100
+@@ -236,7 +236,7 @@
+ 	gint i;
+ 
+ 	for (i = 0; i < N_ACTION_VAL; i++) {
+-		if (g_utf8_collate(gettext(toolbar_text[i].descr), descr) == 0)
++		if (g_strcmp0(gettext(toolbar_text[i].descr), descr) == 0)
+ 				return i;
+ 	}
+ 	
+@@ -255,7 +255,7 @@
+ 	gint i;
+ 	
+ 	for (i = 0; i < N_ACTION_VAL; i++) {
+-		if (g_utf8_collate(toolbar_text[i].index_str, text) == 0)
++		if (g_strcmp0(toolbar_text[i].index_str, text) == 0)
+ 				return i;
+ 	}
+ 
+@@ -346,11 +346,11 @@
+ 		name = ((XMLAttr *)attr->data)->name;
+ 		value = ((XMLAttr *)attr->data)->value;
+ 		
+-		if (g_utf8_collate(name, TOOLBAR_ICON_FILE) == 0) 
++		if (g_strcmp0(name, TOOLBAR_ICON_FILE) == 0) 
+ 			item->file = g_strdup (value);
+-		else if (g_utf8_collate(name, TOOLBAR_ICON_TEXT) == 0)
++		else if (g_strcmp0(name, TOOLBAR_ICON_TEXT) == 0)
+ 			item->text = g_strdup (gettext(value));
+-		else if (g_utf8_collate(name, TOOLBAR_ICON_ACTION) == 0)
++		else if (g_strcmp0(name, TOOLBAR_ICON_ACTION) == 0)
+ 			item->index = toolbar_ret_val_from_text(value);
+ 		if (item->index == -1 && !strcmp(value, "A_DELETE")) {
+ 			/* switch button */
+@@ -821,7 +821,7 @@
+ 
+ 				action_p = strstr(action, ": ");
+ 				action_p[0] = 0x00;
+-				if (g_utf8_collate(act->name, action) == 0) {
++				if (g_strcmp0(act->name, action) == 0) {
+ 					found = TRUE;
+ 					g_free(action);
+ 					break;
+diff -ur claws-mail-3.6.1.orig/src/vcard.c claws-mail-3.6.1/src/vcard.c
+--- claws-mail-3.6.1.orig/src/vcard.c	2008-08-06 21:38:43.000000000 +0200
++++ claws-mail-3.6.1/src/vcard.c	2008-11-14 14:27:12.000000000 +0100
+@@ -348,7 +348,7 @@
+ 				str = nodeRemarks->data;
+ 				if( nodeRemarks ) {
+ 					if( str ) {
+-						if( g_utf8_collate( str, "internet" ) != 0 ) {
++						if( g_strcmp0( str, "internet" ) != 0 ) {
+ 							if( *str != '\0' )
+ 								addritem_email_set_remarks( email, str );
+ 						}
+@@ -442,7 +442,7 @@
+ 		/* g_print( "\ttype:  %s\n", tagtype ); */
+ 		/* g_print( "\tvalue: %s\n", tagvalue ); */
+ 
+-		if( g_utf8_collate( tagtype, VCARD_TYPE_QP ) == 0 ) {
++		if( g_strcmp0( tagtype, VCARD_TYPE_QP ) == 0 ) {
+ 			gchar *tmp;
+ 			/* Quoted-Printable: could span multiple lines */
+ 			tagvalue = vcard_read_qp( cardFile, tagvalue );
+@@ -452,26 +452,26 @@
+ 			/* g_print( "QUOTED-PRINTABLE !!! final\n>%s<\n", tagvalue ); */
+ 		}
+ 
+-		if( g_utf8_collate( tagname, VCARD_TAG_START ) == 0 &&
++		if( g_strcmp0( tagname, VCARD_TAG_START ) == 0 &&
+ 			g_ascii_strcasecmp( tagvalue, VCARD_NAME ) == 0 ) {
+ 			/* g_print( "start card\n" ); */
+ 			vcard_free_lists( listName, listAddress, listRemarks, listID );
+ 			listName = listAddress = listRemarks = listID = NULL;
+ 		}
+-		if( g_utf8_collate( tagname, VCARD_TAG_FULLNAME ) == 0 ) {
++		if( g_strcmp0( tagname, VCARD_TAG_FULLNAME ) == 0 ) {
+ 			/* g_print( "- full name: %s\n", tagvalue ); */
+ 			listName = g_slist_append( listName, g_strdup( tagvalue ) );
+ 		}
+-		if( g_utf8_collate( tagname, VCARD_TAG_EMAIL ) == 0 ) {
++		if( g_strcmp0( tagname, VCARD_TAG_EMAIL ) == 0 ) {
+ 			/* g_print( "- address: %s\n", tagvalue ); */
+ 			listAddress = g_slist_append( listAddress, g_strdup( tagvalue ) );
+ 			listRemarks = g_slist_append( listRemarks, g_strdup( tagtype ) );
+ 		}
+-		if( g_utf8_collate( tagname, VCARD_TAG_UID ) == 0 ) {
++		if( g_strcmp0( tagname, VCARD_TAG_UID ) == 0 ) {
+ 			/* g_print( "- id: %s\n", tagvalue ); */
+ 			listID = g_slist_append( listID, g_strdup( tagvalue ) );
+ 		}
+-		if( g_utf8_collate( tagname, VCARD_TAG_END ) == 0 &&
++		if( g_strcmp0( tagname, VCARD_TAG_END ) == 0 &&
+ 			g_ascii_strcasecmp( tagvalue, VCARD_NAME ) == 0 ) {
+ 			/* vCard is complete */
+ 			/* g_print( "end card\n--\n" ); */
+@@ -659,7 +659,7 @@
+ 				tagtemp = NULL;
+ 			}
+ 
+-			if( g_utf8_collate( tagtype, VCARD_TYPE_QP ) == 0 ) {
++			if( g_strcmp0( tagtype, VCARD_TYPE_QP ) == 0 ) {
+ 				gchar *tmp;
+ 				/* Quoted-Printable: could span multiple lines */
+ 				tagvalue = vcard_read_qp( cardFile, tagvalue );
+@@ -667,11 +667,11 @@
+ 				g_free(tagvalue);
+ 				tagvalue=tmp;
+ 			}
+-			if( g_utf8_collate( tagname, VCARD_TAG_START ) == 0 &&
++			if( g_strcmp0( tagname, VCARD_TAG_START ) == 0 &&
+ 				g_ascii_strcasecmp( tagvalue, VCARD_NAME ) == 0 ) {
+ 				haveStart = TRUE;
+ 			}
+-			if( g_utf8_collate( tagname, VCARD_TAG_END ) == 0 &&
++			if( g_strcmp0( tagname, VCARD_TAG_END ) == 0 &&
+ 				g_ascii_strcasecmp( tagvalue, VCARD_NAME ) == 0 ) {
+ 				/* vCard is complete */
+ 				if( haveStart ) cardFile->retVal = MGU_SUCCESS;
diff --git a/packages/sylpheed/sylpheed_2.5.0.bb b/packages/sylpheed/sylpheed_2.5.0.bb
new file mode 100644
index 0000000000..94c51e4fce
--- /dev/null
+++ b/packages/sylpheed/sylpheed_2.5.0.bb
@@ -0,0 +1,32 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent"
+DEPENDS = "gtk+ gpgme gnutls"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.5/sylpheed-${PV}.tar.bz2 \
+	"
+
+FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN}-doc += "${datadir}"
+
+EXTRA_OECONF = "--disable-ssl --enable-gnutls"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+do_configure_prepend() {
+	mkdir -p m4
+	for i in $(find ${S} -name "Makefile.am") ; do
+		sed -i s:'-I$(includedir)'::g $i
+	done
+}
+
+inherit autotools
+
+do_install_append() {
+	install -d ${D}${datadir}/applications
+	install -m 0644 sylpheed.desktop ${D}${datadir}/applications/
+	install -d ${D}${datadir}/pixmaps
+	install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/
+}
+
diff --git a/packages/tango/tango-icon-theme_0.7.2.bb b/packages/tango/tango-icon-theme_0.7.2.bb
index d9158234e9..0fbc7be7a0 100644
--- a/packages/tango/tango-icon-theme_0.7.2.bb
+++ b/packages/tango/tango-icon-theme_0.7.2.bb
@@ -2,7 +2,9 @@ SECTION = "unknown"
 LICENSE = "http://creativecommons.org/licenses/by-sa/2.5/"
 inherit autotools pkgconfig
 
-SRC_URI = "http://tango-project.org/releases/${PN}-${PV}.tar.gz \
+SRC_URI = "http://tango.freedesktop.org/releases/${PN}-${PV}.tar.gz \
 	   file://no-icon-naming-utils.patch;patch=1"
 EXTRA_OECONF = "--disable-icon-framing"
+
+PACKAGE_ARCH = "all"
 FILES_${PN} += "${datadir}/icons"
diff --git a/packages/tango/tango-icon-theme_0.8.1.bb b/packages/tango/tango-icon-theme_0.8.1.bb
new file mode 100644
index 0000000000..0fbc7be7a0
--- /dev/null
+++ b/packages/tango/tango-icon-theme_0.8.1.bb
@@ -0,0 +1,10 @@
+SECTION = "unknown"
+LICENSE = "http://creativecommons.org/licenses/by-sa/2.5/"
+inherit autotools pkgconfig
+
+SRC_URI = "http://tango.freedesktop.org/releases/${PN}-${PV}.tar.gz \
+	   file://no-icon-naming-utils.patch;patch=1"
+EXTRA_OECONF = "--disable-icon-framing"
+
+PACKAGE_ARCH = "all"
+FILES_${PN} += "${datadir}/icons"
diff --git a/packages/u-boot/u-boot-omap3_git.bb b/packages/u-boot/u-boot-omap3_git.bb
index 56ca67bb60..714ca0b0f1 100644
--- a/packages/u-boot/u-boot-omap3_git.bb
+++ b/packages/u-boot/u-boot-omap3_git.bb
@@ -4,8 +4,9 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-omap3-git/${M
 
 SRCREV = "08d7fdcce5dde5c2dc968fac5b2facf17cbabb5"
 
-PV = "2008.10+${PR}+git${SRCREV}"
+PV = "2008.10+${PR}+gitr${SRCREV}"
 PR ="r2"
+PE = "1"
 
 SRC_URI = "git://www.sakoman.net/git/u-boot-omap3.git;branch=common;protocol=git \
           "
diff --git a/packages/uclibc/uclibc-0.9.30/a780/uClibc.machine b/packages/uclibc/uclibc-0.9.30/a780/uClibc.machine
new file mode 100644
index 0000000000..e27931cf6b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/a780/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 23:18:41 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/akita/uClibc.machine b/packages/uclibc/uclibc-0.9.30/akita/uClibc.machine
new file mode 100644
index 0000000000..e27931cf6b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/akita/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 23:18:41 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/arm-linuxthreads.patch b/packages/uclibc/uclibc-0.9.30/arm-linuxthreads.patch
new file mode 100644
index 0000000000..e222668a66
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/arm-linuxthreads.patch
@@ -0,0 +1,218 @@
+Index: uClibc/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/vfork.S
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ uClibc/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/vfork.S	2008-08-28 00:22:06.278340855 +0200
+@@ -0,0 +1,78 @@
++/* Copyright (C) 1999, 2002, 2003, 2005 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++   Contributed by Philip Blundell <philb@gnu.org>.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#include <sysdep-cancel.h>
++#define _ERRNO_H	1
++#include <bits/errno.h>
++#include <kernel-features.h>
++
++/* Clone the calling process, but without copying the whole address space.
++   The calling process is suspended until the new process exits or is
++   replaced by a call to `execve'.  Return -1 for errors, 0 to the new process,
++   and the process ID of the new process to the old process.  */
++
++ENTRY (__vfork)
++
++#ifdef __NR_vfork
++
++#ifdef SHARED
++	ldr	ip, 1f
++	ldr	r0, 2f
++3:	add	ip, pc, ip
++	ldr	r0, [ip, r0]
++#else
++	ldr	r0, 1f
++#endif
++	movs	r0, r0
++	bne	HIDDEN_JUMPTARGET (__fork)
++
++	DO_CALL (vfork, 0)
++	cmn	a1, #4096
++	RETINSTR(cc, lr)
++
++#ifndef __ASSUME_VFORK_SYSCALL
++	/* Check if vfork syscall is known at all.  */
++	cmn	a1, #ENOSYS
++	bne	PLTJMP(C_SYMBOL_NAME(__syscall_error))
++#endif
++
++#endif
++
++#ifndef __ASSUME_VFORK_SYSCALL
++	/* If we don't have vfork, fork is close enough.  */
++	DO_CALL (fork, 0)
++	cmn	a1, #4096
++	RETINSTR(cc, lr)
++#elif !defined __NR_vfork
++# error "__NR_vfork not available and __ASSUME_VFORK_SYSCALL defined"
++#endif
++    	b	PLTJMP(C_SYMBOL_NAME(__syscall_error))
++
++#ifdef SHARED
++1:	.word	_GLOBAL_OFFSET_TABLE_ - 3b - 8
++2:	.word	__libc_pthread_functions(GOTOFF)
++#else
++	.weak	pthread_create
++1:	.word	pthread_create
++#endif
++
++PSEUDO_END (__vfork)
++libc_hidden_def (__vfork)
++
++weak_alias (__vfork, vfork)
+Index: uClibc/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ uClibc/libpthread/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h	2008-08-28 00:28:04.301636993 +0200
+@@ -0,0 +1,130 @@
++/* Copyright (C) 2003, 2005 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++   Contributed by Phil Blundell <pb@nexus.co.uk>, 2003.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#include <tls.h>
++#include <pt-machine.h>
++#ifndef __ASSEMBLER__
++# include <linuxthreads/internals.h>
++#endif
++
++#if !defined NOT_IN_libc || defined IS_IN_libpthread
++
++/* We push lr onto the stack, so we have to use ldmib instead of ldmia
++   to find the saved arguments.  */
++# ifdef PIC
++#  undef DOARGS_5
++#  undef DOARGS_6
++#  undef DOARGS_7
++#  define DOARGS_5 str r4, [sp, $-4]!; ldr r4, [sp, $8];
++#  define DOARGS_6 mov ip, sp; stmfd sp!, {r4, r5}; ldmib ip, {r4, r5};
++#  define DOARGS_7 mov ip, sp; stmfd sp!, {r4, r5, r6}; ldmib ip, {r4, r5, r6};
++# endif
++
++# undef PSEUDO_RET
++# define PSEUDO_RET						        \
++    ldrcc pc, [sp], $4;						        \
++    ldr	lr, [sp], $4;							\
++    b PLTJMP(SYSCALL_ERROR)
++
++# undef PSEUDO
++# define PSEUDO(name, syscall_name, args)				\
++  .section ".text";							\
++    PSEUDO_PROLOGUE;							\
++  ENTRY (name);								\
++    SINGLE_THREAD_P;							\
++    bne .Lpseudo_cancel;						\
++    DO_CALL (syscall_name, args);					\
++    cmn r0, $4096;							\
++    RETINSTR(cc, lr);							\
++    b PLTJMP(SYSCALL_ERROR);						\
++  .Lpseudo_cancel:							\
++    str lr, [sp, $-4]!;							\
++    DOCARGS_##args;	/* save syscall args around CENABLE.  */	\
++    CENABLE;								\
++    mov ip, r0;		/* put mask in safe place.  */			\
++    UNDOCARGS_##args;	/* restore syscall args.  */			\
++    swi SYS_ify (syscall_name);	/* do the call.  */			\
++    str r0, [sp, $-4]!; /* save syscall return value.  */		\
++    mov r0, ip;		/* get mask back.  */				\
++    CDISABLE;								\
++    ldr r0, [sp], $4;	/* retrieve return value.  */			\
++    UNDOC2ARGS_##args;	/* fix register damage.  */			\
++    cmn r0, $4096;
++
++# define DOCARGS_0
++# define UNDOCARGS_0
++# define UNDOC2ARGS_0
++
++# define DOCARGS_1	str r0, [sp, #-4]!;
++# define UNDOCARGS_1	ldr r0, [sp], #4;
++# define UNDOC2ARGS_1
++
++# define DOCARGS_2	str r1, [sp, #-4]!; str r0, [sp, #-4]!;
++# define UNDOCARGS_2	ldr r0, [sp], #4; ldr r1, [sp], #4;
++# define UNDOC2ARGS_2
++
++# define DOCARGS_3	str r2, [sp, #-4]!; str r1, [sp, #-4]!; str r0, [sp, #-4]!;
++# define UNDOCARGS_3	ldr r0, [sp], #4; ldr r1, [sp], #4; ldr r2, [sp], #4
++# define UNDOC2ARGS_3
++
++# define DOCARGS_4	stmfd sp!, {r0-r3}
++# define UNDOCARGS_4	ldmfd sp!, {r0-r3}
++# define UNDOC2ARGS_4
++
++# define DOCARGS_5	stmfd sp!, {r0-r3}
++# define UNDOCARGS_5	ldmfd sp, {r0-r3}; str r4, [sp, #-4]!; ldr r4, [sp, #24]
++# define UNDOC2ARGS_5   ldr r4, [sp], #20
++
++# ifdef IS_IN_libpthread
++#  define CENABLE	bl PLTJMP(__pthread_enable_asynccancel)
++#  define CDISABLE	bl PLTJMP(__pthread_disable_asynccancel)
++#  define __local_multiple_threads __pthread_multiple_threads
++# else
++#  define CENABLE	bl PLTJMP(__libc_enable_asynccancel)
++#  define CDISABLE	bl PLTJMP(__libc_disable_asynccancel)
++#  define __local_multiple_threads __libc_multiple_threads
++# endif
++
++# ifndef __ASSEMBLER__
++extern int __local_multiple_threads attribute_hidden;
++#  define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
++# else
++#  if !defined PIC
++#   define SINGLE_THREAD_P						\
++  ldr ip, =__local_multiple_threads;					\
++  ldr ip, [ip];								\
++  teq ip, #0;
++#   define PSEUDO_PROLOGUE
++#  else
++#   define SINGLE_THREAD_P						\
++  ldr ip, 1b;								\
++2:									\
++  ldr ip, [pc, ip];							\
++  teq ip, #0;
++#   define PSEUDO_PROLOGUE						\
++  1:  .word __local_multiple_threads - 2f - 8;
++#  endif
++# endif
++
++#elif !defined __ASSEMBLER__
++
++/* This code should never be used but we define it anyhow.  */
++# define SINGLE_THREAD_P (1)
++
++#endif
diff --git a/packages/uclibc/uclibc-0.9.30/arm/uClibc.machine b/packages/uclibc/uclibc-0.9.30/arm/uClibc.machine
new file mode 100644
index 0000000000..898b73a33b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/arm/uClibc.machine
@@ -0,0 +1,69 @@
+#
+# Automatically generated make config: don't edit
+# Mon May 14 10:23:14 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+CONFIG_ARM920T=y
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/armeb/uClibc.machine b/packages/uclibc/uclibc-0.9.30/armeb/uClibc.machine
new file mode 100644
index 0000000000..2d9f63e531
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/armeb/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 22:07:03 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_BIG_ENDIAN=y
+ARCH_WANTS_BIG_ENDIAN=y
+# ARCH_WANTS_LITTLE_ENDIAN is not set
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/armv4t/uClibc.machine b/packages/uclibc/uclibc-0.9.30/armv4t/uClibc.machine
new file mode 100644
index 0000000000..898b73a33b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/armv4t/uClibc.machine
@@ -0,0 +1,69 @@
+#
+# Automatically generated make config: don't edit
+# Mon May 14 10:23:14 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+CONFIG_ARM920T=y
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/armv5te/uClibc.machine b/packages/uclibc/uclibc-0.9.30/armv5te/uClibc.machine
new file mode 100644
index 0000000000..ec0385bc0f
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/armv5te/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/armv6/uClibc.machine b/packages/uclibc/uclibc-0.9.30/armv6/uClibc.machine
new file mode 100644
index 0000000000..85f70f70c7
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/armv6/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+UCLIBC_HAS_SOFT_FLOAT=n
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/armv7a/uClibc.machine b/packages/uclibc/uclibc-0.9.30/armv7a/uClibc.machine
new file mode 100644
index 0000000000..85f70f70c7
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/armv7a/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+UCLIBC_HAS_SOFT_FLOAT=n
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/avr32/uClibc.machine b/packages/uclibc/uclibc-0.9.30/avr32/uClibc.machine
new file mode 100644
index 0000000000..ed8b1a447e
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/avr32/uClibc.machine
@@ -0,0 +1,54 @@
+#
+# Automatically generated make config: don't edit
+# Thu May  1 16:06:57 2008
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+TARGET_avr32=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="avr32"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_AVR32_AP7=y
+LINKRELAX=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_BIG_ENDIAN=y
+
+#
+# Using Big Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/home/stelios/proj/OE/tmp/uclibc/staging/avr32-angstrom-linux-uclibc/usr/include"
+HAVE_DOT_CONFIG=y
diff --git a/packages/uclibc/uclibc-0.9.30/bfin/uClibc.config b/packages/uclibc/uclibc-0.9.30/bfin/uClibc.config
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/bfin/uClibc.config
diff --git a/packages/uclibc/uclibc-0.9.30/bfin/uClibc.distro b/packages/uclibc/uclibc-0.9.30/bfin/uClibc.distro
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/bfin/uClibc.distro
diff --git a/packages/uclibc/uclibc-0.9.30/bfin/uClibc.machine b/packages/uclibc/uclibc-0.9.30/bfin/uClibc.machine
new file mode 100644
index 0000000000..0c565238e5
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/bfin/uClibc.machine
@@ -0,0 +1,192 @@
+#
+# Automatically generated make config: don't edit
+# Sat Oct 20 20:22:28 2007
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+TARGET_bfin=y
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="bfin"
+FORCE_OPTIONS_FOR_ARCH=y
+TARGET_SUBARCH=""
+# UCLIBC_FORMAT_ELF is not set
+UCLIBC_FORMAT_FDPIC_ELF=y
+# UCLIBC_FORMAT_FLAT is not set
+# UCLIBC_FORMAT_FLAT_SEP_DATA is not set
+# UCLIBC_FORMAT_SHARED_FLAT is not set
+ARCH_LITTLE_ENDIAN=y
+
+#
+# Using Little Endian
+#
+ARCH_HAS_NO_MMU=y
+
+#
+# Target CPU lacks a memory management unit (MMU)
+#
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+# DO_C99_MATH is not set
+KERNEL_HEADERS="/usr/include"
+# UCLIBC_UCLINUX_BROKEN_MUNMAP is not set
+EXCLUDE_BRK=y
+HAVE_DOT_CONFIG=y
+
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+DOPIC=y
+# HAVE_NO_SHARED is not set
+# ARCH_HAS_NO_LDSO is not set
+HAVE_SHARED=y
+# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
+LDSO_LDD_SUPPORT=y
+LDSO_CACHE_SUPPORT=y
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+LDSO_BASE_FILENAME="ld.so"
+UCLIBC_STATIC_LDCONFIG=y
+LDSO_RUNPATH=y
+UCLIBC_CTOR_DTOR=y
+# HAS_NO_THREADS is not set
+UCLIBC_HAS_THREADS=y
+# PTHREADS_DEBUG_SUPPORT is not set
+LINUXTHREADS_OLD=y
+UCLIBC_HAS_LFS=y
+MALLOC=y
+# MALLOC_SIMPLE is not set
+# MALLOC_STANDARD is not set
+# MALLOC_GLIBC_COMPAT is not set
+UCLIBC_DYNAMIC_ATEXIT=y
+# COMPAT_ATEXIT is not set
+# UCLIBC_SUSV3_LEGACY is not set
+# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_HAS_SHADOW=y
+# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
+UCLIBC_HAS___PROGNAME=y
+UNIX98PTY_ONLY=y
+ASSUME_DEVPTS=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+
+#
+# Networking Support
+#
+# UCLIBC_HAS_IPV6 is not set
+# UCLIBC_HAS_RPC is not set
+# UCLIBC_USE_NETLINK is not set
+
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+UCLIBC_HAS_CTYPE_UNSAFE=y
+# UCLIBC_HAS_CTYPE_CHECKED is not set
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+# UCLIBC_HAS_WCHAR is not set
+# UCLIBC_HAS_LOCALE is not set
+# UCLIBC_HAS_HEXADECIMAL_FLOATS is not set
+# UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set
+# USE_OLD_VFPRINTF is not set
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set
+# UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is not set
+# UCLIBC_HAS_PRINTF_M_SPEC is not set
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+UCLIBC_HAS_REGEX_OLD=y
+UCLIBC_HAS_FNMATCH=y
+UCLIBC_HAS_FNMATCH_OLD=y
+# UCLIBC_HAS_WORDEXP is not set
+# UCLIBC_HAS_FTW is not set
+UCLIBC_HAS_GLOB=y
+# UCLIBC_HAS_GNU_GLOB is not set
+
+#
+# Library Installation Options
+#
+SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)lib"
+RUNTIME_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/"
+DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/usr/"
+MULTILIB=""
+
+#
+# Security options
+#
+# UCLIBC_HAS_ARC4RANDOM is not set
+# HAVE_NO_SSP is not set
+# UCLIBC_HAS_SSP is not set
+UCLIBC_BUILD_RELRO=y
+# UCLIBC_BUILD_NOW is not set
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX=""
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+# DODEBUG_PT is not set
+DOSTRIP=y
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set
diff --git a/packages/uclibc/uclibc-0.9.30/c7x0/uClibc.machine b/packages/uclibc/uclibc-0.9.30/c7x0/uClibc.machine
new file mode 100644
index 0000000000..ec0385bc0f
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/c7x0/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/cm-x270/uClibc.machine b/packages/uclibc/uclibc-0.9.30/cm-x270/uClibc.machine
new file mode 100644
index 0000000000..e27931cf6b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/cm-x270/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 23:18:41 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/collie/uClibc.machine b/packages/uclibc/uclibc-0.9.30/collie/uClibc.machine
new file mode 100644
index 0000000000..6e89444a64
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/collie/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:29:51 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_ARM_OABI=y
+# CONFIG_ARM_EABI is not set
+# USE_BX is not set
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+CONFIG_ARM_SA1100=y
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/dht-walnut/uClibc.machine b/packages/uclibc/uclibc-0.9.30/dht-walnut/uClibc.machine
new file mode 100644
index 0000000000..2a38cfdd74
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/dht-walnut/uClibc.machine
@@ -0,0 +1,54 @@
+#
+# Automatically generated make config: don't edit
+# Sun May  4 23:50:48 2008
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_avr32 is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+TARGET_powerpc=y
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="powerpc"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_CLASSIC=y
+# CONFIG_E500 is not set
+TARGET_SUBARCH="classic"
+
+#
+# Using ELF file format
+#
+ARCH_BIG_ENDIAN=y
+
+#
+# Using Big Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/home/stelios/proj/OE/tmp/uclibc/staging/powerpc-angstrom-linux-uclibc/usr/include"
+HAVE_DOT_CONFIG=y
diff --git a/packages/uclibc/uclibc-0.9.30/efika/uClibc.machine b/packages/uclibc/uclibc-0.9.30/efika/uClibc.machine
new file mode 100644
index 0000000000..e059257c09
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/efika/uClibc.machine
@@ -0,0 +1,53 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:25:50 2007
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+TARGET_powerpc=y
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="powerpc"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_CLASSIC=y
+# CONFIG_E500 is not set
+TARGET_SUBARCH="classic"
+
+#
+# Using ELF file format
+#
+ARCH_BIG_ENDIAN=y
+
+#
+# Using Big Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/powerpc-angstrom-linux-uclibc/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/ep93xx/uClibc.machine b/packages/uclibc/uclibc-0.9.30/ep93xx/uClibc.machine
new file mode 100644
index 0000000000..898b73a33b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/ep93xx/uClibc.machine
@@ -0,0 +1,69 @@
+#
+# Automatically generated make config: don't edit
+# Mon May 14 10:23:14 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+CONFIG_ARM920T=y
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/gumstix-connex/uClibc.machine b/packages/uclibc/uclibc-0.9.30/gumstix-connex/uClibc.machine
new file mode 100644
index 0000000000..ec0385bc0f
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/gumstix-connex/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/gumstix-verdex/uClibc.machine b/packages/uclibc/uclibc-0.9.30/gumstix-verdex/uClibc.machine
new file mode 100644
index 0000000000..e27931cf6b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/gumstix-verdex/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 23:18:41 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/h2200/uClibc.machine b/packages/uclibc/uclibc-0.9.30/h2200/uClibc.machine
new file mode 100644
index 0000000000..ec0385bc0f
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/h2200/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/h3600/uClibc.machine b/packages/uclibc/uclibc-0.9.30/h3600/uClibc.machine
new file mode 100644
index 0000000000..6e89444a64
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/h3600/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:29:51 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_ARM_OABI=y
+# CONFIG_ARM_EABI is not set
+# USE_BX is not set
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+CONFIG_ARM_SA1100=y
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/h3800/uClibc.machine b/packages/uclibc/uclibc-0.9.30/h3800/uClibc.machine
new file mode 100644
index 0000000000..6e89444a64
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/h3800/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:29:51 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_ARM_OABI=y
+# CONFIG_ARM_EABI is not set
+# USE_BX is not set
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+CONFIG_ARM_SA1100=y
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/h3900/uClibc.machine b/packages/uclibc/uclibc-0.9.30/h3900/uClibc.machine
new file mode 100644
index 0000000000..ec0385bc0f
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/h3900/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/h4000/uClibc.machine b/packages/uclibc/uclibc-0.9.30/h4000/uClibc.machine
new file mode 100644
index 0000000000..ec0385bc0f
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/h4000/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/h5000/uClibc.machine b/packages/uclibc/uclibc-0.9.30/h5000/uClibc.machine
new file mode 100644
index 0000000000..ec0385bc0f
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/h5000/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/hx4700/uClibc.machine b/packages/uclibc/uclibc-0.9.30/hx4700/uClibc.machine
new file mode 100644
index 0000000000..e27931cf6b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/hx4700/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 23:18:41 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/iwmmxt/uClibc.machine b/packages/uclibc/uclibc-0.9.30/iwmmxt/uClibc.machine
new file mode 100644
index 0000000000..e27931cf6b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/iwmmxt/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 23:18:41 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/ixp4xxbe/uClibc.machine b/packages/uclibc/uclibc-0.9.30/ixp4xxbe/uClibc.machine
new file mode 100644
index 0000000000..2d9f63e531
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/ixp4xxbe/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 22:07:03 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_BIG_ENDIAN=y
+ARCH_WANTS_BIG_ENDIAN=y
+# ARCH_WANTS_LITTLE_ENDIAN is not set
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/kilauea/uClibc.machine b/packages/uclibc/uclibc-0.9.30/kilauea/uClibc.machine
new file mode 100644
index 0000000000..effef11099
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/kilauea/uClibc.machine
@@ -0,0 +1,55 @@
+#
+# Automatically generated make config: don't edit
+# Sun May  4 23:50:48 2008
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_avr32 is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+TARGET_powerpc=y
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="powerpc"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_CLASSIC=y
+# CONFIG_E500 is not set
+TARGET_SUBARCH="classic"
+
+#
+# Using ELF file format
+#
+ARCH_BIG_ENDIAN=y
+
+#
+# Using Big Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/home/stelios/proj/OE/tmp/uclibc/staging/powerpc-angstrom-linux-uclibc/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/ldso_hash_arm.patch b/packages/uclibc/uclibc-0.9.30/ldso_hash_arm.patch
new file mode 100644
index 0000000000..8a625f21c2
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/ldso_hash_arm.patch
@@ -0,0 +1,19 @@
+Index: uClibc-0.9.30/Rules.mak
+===================================================================
+--- uClibc-0.9.30.orig/Rules.mak	2008-11-15 16:35:00.713664783 +0100
++++ uClibc-0.9.30/Rules.mak	2008-11-15 16:36:32.776988120 +0100
+@@ -519,13 +519,7 @@
+ endif
+ 
+ ifeq ($(LDSO_GNU_HASH_SUPPORT),y)
+-# Be sure that binutils support it
+-LDFLAGS_GNUHASH:=$(call check_ld,--hash-style=gnu)
+-ifeq ($(LDFLAGS_GNUHASH),)
+-$(error Your binutils don't support --hash-style option, while you want to use it)
+-else
+-LDFLAGS_NOSTRIP += -Wl,$(LDFLAGS_GNUHASH)
+-endif
++LDFLAGS_NOSTRIP += -Wl,--hash-style=gnu
+ endif
+ 
+ LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs
diff --git a/packages/uclibc/uclibc-0.9.30/linuxthreads-changes.patch b/packages/uclibc/uclibc-0.9.30/linuxthreads-changes.patch
new file mode 100644
index 0000000000..f6f32cdd29
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/linuxthreads-changes.patch
@@ -0,0 +1,291 @@
+Index: uClibc/libpthread/linuxthreads/descr.h
+===================================================================
+--- uClibc.orig/libpthread/linuxthreads/descr.h	2008-08-27 23:59:46.171809044 +0200
++++ uClibc/libpthread/linuxthreads/descr.h	2008-08-28 00:00:35.435134759 +0200
+@@ -123,9 +123,9 @@
+       union dtv *dtvp;
+       pthread_descr self;	/* Pointer to this structure */
+       int multiple_threads;
+-# ifdef NEED_DL_SYSINFO
+       uintptr_t sysinfo;
+-# endif
++      uintptr_t stack_guard;
++      uintptr_t pointer_guard;
+     } data;
+     void *__padding[16];
+   } p_header;
+@@ -193,6 +193,13 @@
+   size_t p_alloca_cutoff;	/* Maximum size which should be allocated
+ 				   using alloca() instead of malloc().  */
+   /* New elements must be added at the end.  */
++
++  /* This member must be last.  */
++  char end_padding[];
++
++#define PTHREAD_STRUCT_END_PADDING \
++  (sizeof (struct _pthread_descr_struct)			      \
++   - offsetof (struct _pthread_descr_struct, end_padding))
+ } __attribute__ ((aligned(32))); /* We need to align the structure so that
+ 				    doubles are aligned properly.  This is 8
+ 				    bytes on MIPS and 16 bytes on MIPS64.
+Index: uClibc/libpthread/linuxthreads/manager.c
+===================================================================
+--- uClibc.orig/libpthread/linuxthreads/manager.c	2008-08-27 23:59:54.185140485 +0200
++++ uClibc/libpthread/linuxthreads/manager.c	2008-08-28 00:00:35.435134759 +0200
+@@ -679,6 +679,17 @@
+   new_thread->p_inheritsched = attr ? attr->__inheritsched : 0;
+   new_thread->p_alloca_cutoff = stksize / 4 > __MAX_ALLOCA_CUTOFF
+ 				 ? __MAX_ALLOCA_CUTOFF : stksize / 4;
++
++  /* Copy the stack guard canary.  */
++#ifdef THREAD_COPY_STACK_GUARD
++  THREAD_COPY_STACK_GUARD (new_thread);
++#endif
++
++  /* Copy the pointer guard value.  */
++#ifdef THREAD_COPY_POINTER_GUARD
++  THREAD_COPY_POINTER_GUARD (new_thread);
++#endif
++
+   /* Initialize the thread handle */
+   __pthread_init_lock(&__pthread_handles[sseg].h_lock);
+   __pthread_handles[sseg].h_descr = new_thread;
+@@ -742,15 +753,15 @@
+ 	  pid = __clone2(pthread_start_thread_event,
+   		 (void **)new_thread_bottom,
+ 			 (char *)stack_addr - new_thread_bottom,
+-			 CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++			 CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM |
+ 			 __pthread_sig_cancel, new_thread);
+ #elif _STACK_GROWS_UP
+ 	  pid = __clone(pthread_start_thread_event, (void *) new_thread_bottom,
+-			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM |
+ 			__pthread_sig_cancel, new_thread);
+ #else
+ 	  pid = __clone(pthread_start_thread_event, stack_addr,
+-			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM |
+ 			__pthread_sig_cancel, new_thread);
+ #endif
+ 	  saved_errno = errno;
+@@ -783,15 +794,15 @@
+       pid = __clone2(pthread_start_thread,
+ 		     (void **)new_thread_bottom,
+                      (char *)stack_addr - new_thread_bottom,
+-		     CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++		     CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM |
+ 		     __pthread_sig_cancel, new_thread);
+ #elif _STACK_GROWS_UP
+       pid = __clone(pthread_start_thread, (void *) new_thread_bottom,
+-		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM |
+ 		    __pthread_sig_cancel, new_thread);
+ #else
+       pid = __clone(pthread_start_thread, stack_addr,
+-		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
++		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM |
+ 		    __pthread_sig_cancel, new_thread);
+ #endif /* !NEED_SEPARATE_REGISTER_STACK */
+       saved_errno = errno;
+@@ -892,10 +903,11 @@
+ #ifdef _STACK_GROWS_UP
+ # ifdef USE_TLS
+       size_t stacksize = guardaddr - th->p_stackaddr;
++      guardaddr = th->p_stackaddr;
+ # else
+       size_t stacksize = guardaddr - (char *)th;
+-# endif
+       guardaddr = (char *)th;
++# endif
+ #else
+       /* Guardaddr is always set, even if guardsize is 0.  This allows
+ 	 us to compute everything else.  */
+Index: uClibc/libpthread/linuxthreads/pthread.c
+===================================================================
+--- uClibc.orig/libpthread/linuxthreads/pthread.c	2008-08-28 00:00:00.825141935 +0200
++++ uClibc/libpthread/linuxthreads/pthread.c	2008-08-28 00:00:35.438472147 +0200
+@@ -698,6 +698,16 @@
+   mgr = &__pthread_manager_thread;
+ #endif
+ 
++  /* Copy the stack guard canary.  */
++#ifdef THREAD_COPY_STACK_GUARD
++  THREAD_COPY_STACK_GUARD (mgr);
++#endif
++
++  /* Copy the pointer guard value.  */
++#ifdef THREAD_COPY_POINTER_GUARD
++  THREAD_COPY_POINTER_GUARD (mgr);
++#endif
++
+   __pthread_manager_request = manager_pipe[1]; /* writing end */
+   __pthread_manager_reader = manager_pipe[0]; /* reading end */
+ 
+@@ -738,17 +748,17 @@
+ 	  pid = __clone2(__pthread_manager_event,
+ 			 (void **) __pthread_manager_thread_bos,
+ 			 THREAD_MANAGER_STACK_SIZE,
+-			 CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
++			 CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM,
+ 			 mgr);
+ #elif _STACK_GROWS_UP
+ 	  pid = __clone(__pthread_manager_event,
+ 			(void **) __pthread_manager_thread_bos,
+-			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
++			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM,
+ 			mgr);
+ #else
+ 	  pid = __clone(__pthread_manager_event,
+ 			(void **) __pthread_manager_thread_tos,
+-			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
++			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM,
+ 			mgr);
+ #endif
+ 
+@@ -778,13 +788,13 @@
+ #ifdef NEED_SEPARATE_REGISTER_STACK
+       pid = __clone2(__pthread_manager, (void **) __pthread_manager_thread_bos,
+ 		     THREAD_MANAGER_STACK_SIZE,
+-		     CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND, mgr);
++		     CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM, mgr);
+ #elif _STACK_GROWS_UP
+       pid = __clone(__pthread_manager, (void **) __pthread_manager_thread_bos,
+-		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND, mgr);
++		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM, mgr);
+ #else
+       pid = __clone(__pthread_manager, (void **) __pthread_manager_thread_tos,
+-		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND, mgr);
++		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_SYSVSEM, mgr);
+ #endif
+     }
+   if (__builtin_expect (pid, 0) == -1) {
+@@ -971,6 +981,10 @@
+     struct pthread_request request;
+     pthread_descr self = thread_self();
+ 
++    /* Make sure we come back here after suspend(), in case we entered
++       from a signal handler.  */
++    THREAD_SETMEM(self, p_signal_jmp, NULL);
++
+     request.req_thread = self;
+     request.req_kind = REQ_PROCESS_EXIT;
+     request.req_args.exit.code = retcode;
+@@ -1198,13 +1212,13 @@
+ 
+ void __pthread_restart_old(pthread_descr th)
+ {
+-  if (atomic_increment(&th->p_resume_count) == -1)
++  if (pthread_atomic_increment(&th->p_resume_count) == -1)
+     kill(th->p_pid, __pthread_sig_restart);
+ }
+ 
+ void __pthread_suspend_old(pthread_descr self)
+ {
+-  if (atomic_decrement(&self->p_resume_count) <= 0)
++  if (pthread_atomic_decrement(&self->p_resume_count) <= 0)
+     __pthread_wait_for_restart_signal(self);
+ }
+ 
+@@ -1215,7 +1229,7 @@
+   int was_signalled = 0;
+   sigjmp_buf jmpbuf;
+ 
+-  if (atomic_decrement(&self->p_resume_count) == 0) {
++  if (pthread_atomic_decrement(&self->p_resume_count) == 0) {
+     /* Set up a longjmp handler for the restart signal, unblock
+        the signal and sleep. */
+ 
+@@ -1272,9 +1286,9 @@
+      being delivered. */
+ 
+   if (!was_signalled) {
+-    if (atomic_increment(&self->p_resume_count) != -1) {
++    if (pthread_atomic_increment(&self->p_resume_count) != -1) {
+       __pthread_wait_for_restart_signal(self);
+-      atomic_decrement(&self->p_resume_count); /* should be zero now! */
++      pthread_atomic_decrement(&self->p_resume_count); /* should be zero now! */
+       /* woke spontaneously and consumed restart signal */
+       return 1;
+     }
+Index: uClibc/libpthread/linuxthreads/specific.c
+===================================================================
+--- uClibc.orig/libpthread/linuxthreads/specific.c	2008-08-28 00:00:07.595139286 +0200
++++ uClibc/libpthread/linuxthreads/specific.c	2008-08-28 00:00:35.438472147 +0200
+@@ -104,13 +104,14 @@
+      that if the key is reallocated later by pthread_key_create, its
+      associated values will be NULL in all threads.
+ 
+-     If no threads have been created yet, clear it just in the
+-     current thread.  */
++     If no threads have been created yet, or if we are exiting, clear
++     it just in the current thread.  */
+ 
+   struct pthread_key_delete_helper_args args;
+   args.idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE;
+   args.idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE;
+-  if (__pthread_manager_request != -1)
++  if (__pthread_manager_request != -1
++      && !(__builtin_expect (__pthread_exit_requested, 0)))
+     {
+       struct pthread_request request;
+ 
+@@ -203,8 +204,9 @@
+   __pthread_lock(THREAD_GETMEM(self, p_lock), self);
+   for (i = 0; i < PTHREAD_KEY_1STLEVEL_SIZE; i++) {
+     if (THREAD_GETMEM_NC(self, p_specific[i]) != NULL) {
+-      free(THREAD_GETMEM_NC(self, p_specific[i]));
++      void *p = THREAD_GETMEM_NC(self, p_specific[i]);
+       THREAD_SETMEM_NC(self, p_specific[i], NULL);
++      free(p);
+     }
+   }
+   __pthread_unlock(THREAD_GETMEM(self, p_lock));
+Index: uClibc/libpthread/linuxthreads/spinlock.c
+===================================================================
+--- uClibc.orig/libpthread/linuxthreads/spinlock.c	2008-08-28 00:00:17.805140454 +0200
++++ uClibc/libpthread/linuxthreads/spinlock.c	2008-08-28 00:00:35.438472147 +0200
+@@ -637,8 +637,20 @@
+ #if defined HAS_COMPARE_AND_SWAP
+ 	wait_node_dequeue(pp_head, pp_max_prio, p_max_prio);
+ #endif
++
++      /* Release the spinlock before restarting.  */
++#if defined TEST_FOR_COMPARE_AND_SWAP
++      if (!__pthread_has_cas)
++#endif
++#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
++	{
++	  __pthread_release(&lock->__spinlock);
++	}
++#endif
++
+       restart(p_max_prio->thr);
+-      break;
++
++      return;
+     }
+   }
+ 
+Index: uClibc/libpthread/linuxthreads/spinlock.h
+===================================================================
+--- uClibc.orig/libpthread/linuxthreads/spinlock.h	2008-08-28 00:00:24.768471655 +0200
++++ uClibc/libpthread/linuxthreads/spinlock.h	2008-08-28 00:02:42.971786951 +0200
+@@ -172,7 +172,7 @@
+ 
+ /* Operations on pthread_atomic, which is defined in internals.h */
+ 
+-static __inline__ long atomic_increment(struct pthread_atomic *pa)
++static __inline__ long pthread_atomic_increment(struct pthread_atomic *pa)
+ {
+     long oldval;
+ 
+@@ -184,7 +184,7 @@
+ }
+ 
+ 
+-static __inline__ long atomic_decrement(struct pthread_atomic *pa)
++static __inline__ long pthread_atomic_decrement(struct pthread_atomic *pa)
+ {
+     long oldval;
+ 
diff --git a/packages/uclibc/uclibc-0.9.30/mpc8313e-rdb/uClibc.machine b/packages/uclibc/uclibc-0.9.30/mpc8313e-rdb/uClibc.machine
new file mode 100644
index 0000000000..3ad8ff0da1
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/mpc8313e-rdb/uClibc.machine
@@ -0,0 +1,53 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:25:50 2007
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+TARGET_powerpc=y
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="powerpc"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_CLASSIC=y
+# CONFIG_E500 is not set
+TARGET_SUBARCH="classic"
+
+#
+# Using ELF file format
+#
+ARCH_BIG_ENDIAN=y
+
+#
+# Using Big Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+KERNEL_HEADERS="will be mangled in bitbake"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/mpc8323e-rdb/uClibc.machine b/packages/uclibc/uclibc-0.9.30/mpc8323e-rdb/uClibc.machine
new file mode 100644
index 0000000000..620676918b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/mpc8323e-rdb/uClibc.machine
@@ -0,0 +1,54 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:25:50 2007
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+TARGET_powerpc=y
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="powerpc"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_CLASSIC=y
+# CONFIG_E500 is not set
+TARGET_SUBARCH="classic"
+
+#
+# Using ELF file format
+#
+ARCH_BIG_ENDIAN=y
+
+#
+# Using Big Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="to be mangled by uclibc bitbake"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/om-gta01/uClibc.machine b/packages/uclibc/uclibc-0.9.30/om-gta01/uClibc.machine
new file mode 100644
index 0000000000..898b73a33b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/om-gta01/uClibc.machine
@@ -0,0 +1,69 @@
+#
+# Automatically generated make config: don't edit
+# Mon May 14 10:23:14 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+CONFIG_ARM920T=y
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/palmld/uClibc.machine b/packages/uclibc/uclibc-0.9.30/palmld/uClibc.machine
new file mode 100644
index 0000000000..e27931cf6b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/palmld/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 23:18:41 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/palmz31/uClibc.machine b/packages/uclibc/uclibc-0.9.30/palmz31/uClibc.machine
new file mode 100644
index 0000000000..ec0385bc0f
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/palmz31/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/palmz72/uClibc.machine b/packages/uclibc/uclibc-0.9.30/palmz72/uClibc.machine
new file mode 100644
index 0000000000..e27931cf6b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/palmz72/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 23:18:41 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/poodle/uClibc.machine b/packages/uclibc/uclibc-0.9.30/poodle/uClibc.machine
new file mode 100644
index 0000000000..ec0385bc0f
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/poodle/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/qemux86/uClibc.machine b/packages/uclibc/uclibc-0.9.30/qemux86/uClibc.machine
new file mode 100644
index 0000000000..44fec169c8
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/qemux86/uClibc.machine
@@ -0,0 +1,68 @@
+#
+# Automatically generated make config: don't edit
+# Fri Nov 23 15:49:33 2007
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+TARGET_i386=y
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="i386"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_GENERIC_386=y
+# CONFIG_386 is not set
+# CONFIG_486 is not set
+# CONFIG_586 is not set
+# CONFIG_586MMX is not set
+# CONFIG_686 is not set
+# CONFIG_PENTIUMII is not set
+# CONFIG_PENTIUMIII is not set
+# CONFIG_PENTIUM4 is not set
+# CONFIG_K6 is not set
+# CONFIG_K7 is not set
+# CONFIG_ELAN is not set
+# CONFIG_CRUSOE is not set
+# CONFIG_WINCHIPC6 is not set
+# CONFIG_WINCHIP2 is not set
+# CONFIG_CYRIXIII is not set
+# CONFIG_NEHEMIAH is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_LITTLE_ENDIAN=y
+
+#
+# Using Little Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/sequoia/uClibc.machine b/packages/uclibc/uclibc-0.9.30/sequoia/uClibc.machine
new file mode 100644
index 0000000000..e059257c09
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/sequoia/uClibc.machine
@@ -0,0 +1,53 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:25:50 2007
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+TARGET_powerpc=y
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="powerpc"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_CLASSIC=y
+# CONFIG_E500 is not set
+TARGET_SUBARCH="classic"
+
+#
+# Using ELF file format
+#
+ARCH_BIG_ENDIAN=y
+
+#
+# Using Big Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/powerpc-angstrom-linux-uclibc/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/simpad/uClibc.machine b/packages/uclibc/uclibc-0.9.30/simpad/uClibc.machine
new file mode 100644
index 0000000000..6e89444a64
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/simpad/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:29:51 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_ARM_OABI=y
+# CONFIG_ARM_EABI is not set
+# USE_BX is not set
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+CONFIG_ARM_SA1100=y
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/spitz/uClibc.machine b/packages/uclibc/uclibc-0.9.30/spitz/uClibc.machine
new file mode 100644
index 0000000000..e27931cf6b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/spitz/uClibc.machine
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 23:18:41 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/titan/uClibc.machine b/packages/uclibc/uclibc-0.9.30/titan/uClibc.machine
new file mode 100644
index 0000000000..75c5328056
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/titan/uClibc.machine
@@ -0,0 +1,52 @@
+#
+# Automatically generated make config: don't edit
+# Wed May 16 12:03:09 2007
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+TARGET_sh=y
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="sh"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_SH2A is not set
+# CONFIG_SH2 is not set
+# CONFIG_SH3 is not set
+CONFIG_SH4=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
diff --git a/packages/uclibc/uclibc-0.9.30/uClibc.config b/packages/uclibc/uclibc-0.9.30/uClibc.config
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/uClibc.config
diff --git a/packages/uclibc/uclibc-0.9.30/uClibc.distro b/packages/uclibc/uclibc-0.9.30/uClibc.distro
new file mode 100644
index 0000000000..b072b2fd37
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/uClibc.distro
@@ -0,0 +1,147 @@
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+# DOPIC is not set
+# HAVE_NO_SHARED is not set
+# ARCH_HAS_NO_LDSO is not set
+HAVE_SHARED=y
+# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
+LDSO_LDD_SUPPORT=y
+LDSO_CACHE_SUPPORT=y
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+LDSO_BASE_FILENAME="ld.so"
+# UCLIBC_STATIC_LDCONFIG is not set
+LDSO_RUNPATH=y
+UCLIBC_CTOR_DTOR=y
+LDSO_GNU_HASH_SUPPORT=y
+# HAS_NO_THREADS is not set
+UCLIBC_HAS_THREADS=y
+# PTHREADS_DEBUG_SUPPORT is not set
+LINUXTHREADS_OLD=y
+UCLIBC_HAS_LFS=y
+# MALLOC is not set
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+MALLOC_GLIBC_COMPAT=y
+UCLIBC_DYNAMIC_ATEXIT=y
+COMPAT_ATEXIT=y
+UCLIBC_SUSV3_LEGACY=y
+UCLIBC_SUSV3_LEGACY_MACROS=y
+UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
+UNIX98PTY_ONLY=y
+ASSUME_DEVPTS=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+
+#
+# Advanced Library Settings
+#
+UCLIBC_PWD_BUFFER_SIZE=256
+UCLIBC_GRP_BUFFER_SIZE=256
+
+#
+# Networking Support
+#
+UCLIBC_HAS_IPV6=y
+UCLIBC_HAS_RPC=y
+UCLIBC_HAS_FULL_RPC=y
+# UCLIBC_HAS_REENTRANT_RPC is not set
+# UCLIBC_USE_NETLINK is not set
+# UCLIBC_HAS_BSD_RES_CLOSE is not set
+
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+UCLIBC_HAS_WCHAR=y
+# UCLIBC_HAS_LOCALE is not set
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+UCLIBC_HAS_STDIO_BUFSIZ_256=y
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+# UCLIBC_HAS_REGEX_OLD is not set
+UCLIBC_HAS_FNMATCH=y
+# UCLIBC_HAS_FNMATCH_OLD is not set
+UCLIBC_HAS_WORDEXP=y
+UCLIBC_HAS_FTW=y
+UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_GLOB=y
+
+#
+# Library Installation Options
+#
+SHARED_LIB_LOADER_PREFIX="/lib"
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="//usr"
+
+#
+# Security options
+#
+# UCLIBC_BUILD_PIE is not set
+# UCLIBC_HAS_ARC4RANDOM is not set
+# HAVE_NO_SSP is not set
+# UCLIBC_HAS_SSP is not set
+UCLIBC_BUILD_RELRO=y
+UCLIBC_BUILD_NOW=y
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX=""
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+# DODEBUG_PT is not set
+DOSTRIP=n
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set
+
+# math stuff for perl
+DO_C99_MATH=y
diff --git a/packages/uclibc/uclibc-0.9.30/uClibc.machine.armv4t b/packages/uclibc/uclibc-0.9.30/uClibc.machine.armv4t
new file mode 100644
index 0000000000..898b73a33b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/uClibc.machine.armv4t
@@ -0,0 +1,69 @@
+#
+# Automatically generated make config: don't edit
+# Mon May 14 10:23:14 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+CONFIG_ARM920T=y
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/uClibc.machine.armv5te b/packages/uclibc/uclibc-0.9.30/uClibc.machine.armv5te
new file mode 100644
index 0000000000..ec0385bc0f
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/uClibc.machine.armv5te
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/uClibc.machine.iwmmxt b/packages/uclibc/uclibc-0.9.30/uClibc.machine.iwmmxt
new file mode 100644
index 0000000000..e27931cf6b
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/uClibc.machine.iwmmxt
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sat May 12 23:18:41 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+CONFIG_ARM_IWMMXT=y
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-0.9.30/uClibc.machine.strongarm b/packages/uclibc/uclibc-0.9.30/uClibc.machine.strongarm
new file mode 100644
index 0000000000..6e89444a64
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.30/uClibc.machine.strongarm
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:29:51 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_ARM_OABI=y
+# CONFIG_ARM_EABI is not set
+# USE_BX is not set
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+CONFIG_ARM_SA1100=y
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-initial_0.9.30.bb b/packages/uclibc/uclibc-initial_0.9.30.bb
new file mode 100644
index 0000000000..c56e5fb2f5
--- /dev/null
+++ b/packages/uclibc/uclibc-initial_0.9.30.bb
@@ -0,0 +1,36 @@
+SECTION = "base"
+require uclibc_${PV}.bb
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+PACKAGES = ""
+
+do_stage() {
+	# Install initial headers into the cross dir
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		pregen install_dev
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		lib/crt1.o lib/crti.o lib/crtn.o
+
+	install -d ${CROSS_DIR}/${TARGET_SYS}	
+	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
+
+	# This conflicts with the c++ version of this header
+	rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
+	install -m 644 lib/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib
+	${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+		-o ${UCLIBC_STAGE_PREFIX}/lib/libc.so
+
+}
+
+do_install() {
+	:
+}
+
+do_compile () {
+	:
+}
diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb
index 16b168715f..256196ce2a 100644
--- a/packages/uclibc/uclibc_0.9.29.bb
+++ b/packages/uclibc/uclibc_0.9.29.bb
@@ -8,7 +8,6 @@
 #
 UCLIBC_BASE ?= "0.9.29"
 PR = "r29"
-DEFAULT_PREFERENCE = "1"
 
 require uclibc.inc
 
diff --git a/packages/uclibc/uclibc_0.9.30.bb b/packages/uclibc/uclibc_0.9.30.bb
new file mode 100644
index 0000000000..faeaeca976
--- /dev/null
+++ b/packages/uclibc/uclibc_0.9.30.bb
@@ -0,0 +1,35 @@
+# UCLIBC_BASE should be the latest released revision of uclibc (that way
+# the config files will typically be correct!)  uclibc-cvs takes precedence
+# over uclibc-${UCLIBC_BASE}, if a config file in uclibc-cvs is out of date
+# try removing it
+#
+# UCLIBC_BASE can be set in a distro file, but whether this works depends
+# on whether the base patches apply to the selected (SRCDATE) svn release.
+#
+UCLIBC_BASE ?= "0.9.30"
+PR = "r0"
+DEFAULT_PREFERENCE = "1"
+
+require uclibc.inc
+
+PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
+
+SRC_URI += "file://uClibc.machine file://uClibc.distro \
+            file://arm-linuxthreads.patch;patch=1 \
+            file://linuxthreads-changes.patch;patch=1 \
+	   "
+SRC_URI_append_arm = " file://ldso_hash_arm.patch;patch=1 "
+SRC_URI_append_armeb = " file://ldso_hash_arm.patch;patch=1 "
+
+#recent versions uclibc require real kernel headers
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+#as stated above, uclibc needs real kernel-headers
+#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
+KERNEL_SOURCE = "${STAGING_DIR_HOST}/${exec_prefix}"
+
+SRC_URI += "http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2"
+
+S = "${WORKDIR}/uClibc-${UCLIBC_BASE}"
+
+LEAD_SONAME = "libc.so"
diff --git a/packages/vagalume/files/use-png-icons.patch b/packages/vagalume/files/use-png-icons.patch
new file mode 100644
index 0000000000..6a5c1b2a29
--- /dev/null
+++ b/packages/vagalume/files/use-png-icons.patch
@@ -0,0 +1,14 @@
+:M:
+Index: vagalume-0.5.1/Makefile.am
+===================================================================
+--- vagalume-0.5.1.orig/Makefile.am
++++ vagalume-0.5.1/Makefile.am
+@@ -42,7 +42,7 @@ themesmallicondir = $(appdatadir)/icons/
+ themesmallicon_DATA = data/buttons/small/*.png
+ else
+ themeicondir = $(appdatadir)/icons/hicolor/scalable/actions
+-themeicon_DATA = data/buttons/big/*.svg data/buttons/small/*.svg
++themeicon_DATA = data/buttons/big/*.png data/buttons/small/*.png
+ endif
+ 
+ if HAVE_DBUS_SUPPORT
diff --git a/packages/vagalume/vagalume_0.5.1.bb b/packages/vagalume/vagalume_0.5.1.bb
index a2d5c5889a..b2a4a104fc 100644
--- a/packages/vagalume/vagalume_0.5.1.bb
+++ b/packages/vagalume/vagalume_0.5.1.bb
@@ -3,7 +3,11 @@ AUTHOR = "agarcia@igalia.com"
 HOMEPAGE = "http://people.igalia.com/berto/"
 SECTION = "x11"
 DEPENDS = "gtk+"
+PR = "r1"
 
-SRC_URI = "http://people.igalia.com/berto/files/vagalume/source/vagalume_0.5.1-1.tar.gz"
+SRC_URI = "\
+  http://people.igalia.com/berto/files/vagalume/source/vagalume_0.5.1-1.tar.gz \
+  file://use-png-icons.patch;patch=1 \
+"
 
 inherit autotools
diff --git a/packages/vagalume/vagalume_0.7.bb b/packages/vagalume/vagalume_0.7.bb
new file mode 100644
index 0000000000..27cb76387f
--- /dev/null
+++ b/packages/vagalume/vagalume_0.7.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Last.fm client"
+AUTHOR = "agarcia@igalia.com"
+HOMEPAGE = "http://people.igalia.com/berto/"
+SECTION = "x11"
+DEPENDS = "gtk+ gstreamer"
+PR = "r0"
+
+SRC_URI = "\
+  http://people.igalia.com/berto/files/vagalume/source/vagalume_${PV}.orig.tar.gz \
+"
+S = "${WORKDIR}/vagalume-${PV}.orig"
+
+inherit autotools
diff --git a/packages/vlc/vlc_0.9.4.bb b/packages/vlc/vlc_0.9.4.bb
index 4630ea5340..876fb74ae3 100644
--- a/packages/vlc/vlc_0.9.4.bb
+++ b/packages/vlc/vlc_0.9.4.bb
@@ -6,7 +6,7 @@ SECTION = "multimedia"
 
 PR = "r2"
 
-DEPENDS = "libtool hal gettext libgcrypt schroedinger libsdl-x11 qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \
+DEPENDS = "libfribidi libtool hal gettext libgcrypt schroedinger libsdl-x11 qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
 
 SRC_URI = "http://videolan.mirror.technotop.nl/vlc/${PV}/vlc-${PV}.tar.bz2"
@@ -29,6 +29,7 @@ EXTRA_OECONF = "\
 	--enable-dbus \
 	--enable-hal \	
 	--without-contrib \
+	--disable-opengl --disable-glx \
 	ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
 	ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \
 	ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
diff --git a/packages/vpnc/vpnc.inc b/packages/vpnc/vpnc.inc
index 4ca82eb47d..46f627b413 100644
--- a/packages/vpnc/vpnc.inc
+++ b/packages/vpnc/vpnc.inc
@@ -11,6 +11,7 @@ CFLAGS_append = ' -DVERSION=\\"${PV}\\"'
 LDFLAGS_append = " -lgcrypt -lgpg-error"
 
 do_install () {
+	sed -i s:m600:m\ 600:g Makefile	
 	oe_runmake 'DESTDIR=${D}' 'PREFIX=/usr' install
 	rm -f ${D}${sysconfdir}/vpnc/vpnc.conf #This file is useless
 	install ${WORKDIR}/default.conf ${D}${sysconfdir}/vpnc/default.conf
diff --git a/packages/wpa-supplicant/wpa-gui_0.6.4.bb b/packages/wpa-supplicant/wpa-gui_0.6.4.bb
index 6f63958288..143cf8e5d2 100644
--- a/packages/wpa-supplicant/wpa-gui_0.6.4.bb
+++ b/packages/wpa-supplicant/wpa-gui_0.6.4.bb
@@ -12,6 +12,7 @@ SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz "
 S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant/wpa_gui"
 
 inherit qt4x11
+ARM_INSTRUCTION_SET = "arm"
 
 EXTRA_QMAKEVARS_POST += "CONFIG+=thread"
 
diff --git a/packages/x-load/x-load_git.bb b/packages/x-load/x-load_git.bb
index 439262c048..d7c7a642a5 100644
--- a/packages/x-load/x-load_git.bb
+++ b/packages/x-load/x-load_git.bb
@@ -4,8 +4,9 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/x-load-git/${MACHINE
 
 SRCREV = "73eb0caf065b3b3f407d8af5c4836624e5cc7b69"
 
-PV = "1.42+${PR}+git${SRCREV}"
+PV = "1.42+${PR}+gitr${SRCREV}"
 PR ="r7"
+PE = "1"
 
 SRC_URI = "git://www.sakoman.net/git/x-load-omap3.git;branch=master;protocol=git"
 
diff --git a/packages/xorg-driver/xf86-video-omapfb_git.bb b/packages/xorg-driver/xf86-video-omapfb_git.bb
index d81f7622be..df765d4a6d 100644
--- a/packages/xorg-driver/xf86-video-omapfb_git.bb
+++ b/packages/xorg-driver/xf86-video-omapfb_git.bb
@@ -5,7 +5,8 @@ DESCRIPTION = "X.Org X server -- OMAP display driver"
 PR ="r14"
 
 SRCREV = "e33601fe4c4c5e0d093321f86a633047056c7445"
-PV = "0.0.1+${PR}+git${SRCREV}"
+PV = "0.0.1+${PR}+gitr${SRCREV}"
+PE = "1"
 
 SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http"
 
diff --git a/packages/xorg-lib/libxcalibrate_git.bb b/packages/xorg-lib/libxcalibrate_git.bb
index 24b4a1f067..f9e1587ef1 100644
--- a/packages/xorg-lib/libxcalibrate_git.bb
+++ b/packages/xorg-lib/libxcalibrate_git.bb
@@ -3,7 +3,8 @@ require xorg-lib-common.inc
 DESCRIPTION = "	Touchscreen calibration client library"
 LICENSE = "BSD-X"
 DEPENDS = "virtual/libx11 calibrateproto libxext"
-PV = "0.0+git${SRCREV}"
+PV = "0.0+gitr${SRCREV}"
+PE = "1"
 
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git"
 
diff --git a/packages/xorg-proto/calibrateproto_git.bb b/packages/xorg-proto/calibrateproto_git.bb
index 02d20b5038..fe9e1a43a1 100644
--- a/packages/xorg-proto/calibrateproto_git.bb
+++ b/packages/xorg-proto/calibrateproto_git.bb
@@ -2,8 +2,9 @@ require xorg-proto-common.inc
 
 DESCRIPTION = "Touchscreen calibration protocol"
 
-PV = "0.0+git${SRCREV}"
+PV = "0.0+gitr${SRCREV}"
 PR = "r1"
+PE = "1"
 
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git"
 S = "${WORKDIR}/git"
diff --git a/packages/zope/zope_2.7.1.bb b/packages/zope/zope_2.7.1.bb
deleted file mode 100644
index efda9d2e6b..0000000000
--- a/packages/zope/zope_2.7.1.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "A full fledged pluggable content management system with integrated web server and much more"
-SECTION = "console/network"
-PRIORITY = "optional"
-DEPENDS = "python"
-RDEPENDS = "python-core python-shell"
-LICENSE = "ZPL"
-PR = "ml1"
-
-SRC_URI = "http://zope.org/Products/Zope/${PV}/Zope-${PV}.tgz"
-S = "${WORKDIR}/Zope-${PV}-0"
-
-do_configure() {
-	./configure --with-python=${STAGING_BINDIR_NATIVE}/python --prefix=${prefix} --optimize --ignore-zlib
-}
-
-do_compile() {
-	oe_runmake HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS}
-}
-
-do_install() {
-	oe_runmake install PREFIX=${D}${prefix} HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS}
-}
-
-FILES_${PN} = "${prefix}"
-FILES_${PN}_doc = "${prefix}/doc"
diff --git a/packages/zope/zope_2.9.2.bb b/packages/zope/zope_2.9.2.bb
deleted file mode 100644
index 12254375db..0000000000
--- a/packages/zope/zope_2.9.2.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "A full fledged pluggable content management system with integrated web server and much more."
-SECTION = "console/network"
-PRIORITY = "optional"
-DEPENDS = "python"
-RDEPENDS = "python-core python-shell"
-LICENSE = "ZPL"
-PR = "ml0"
-
-SRC_URI = "http://zope.org/Products/Zope/${PV}/Zope-${PV}.tgz"
-S = "${WORKDIR}/Zope-${PV}"
-
-do_configure() {
-	./configure --with-python=${STAGING_BINDIR_NATIVE}/python --prefix=${prefix} --force
-}
-
-do_compile() {
-	oe_runmake HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS}
-}
-
-do_install() {
-	oe_runmake install prefix=${D}${prefix} HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS}
-}
-
-FILES_${PN} = "${prefix}"
-FILES_${PN}_doc = "${prefix}/doc"
diff --git a/packages/zope/zope_3.3.1.bb b/packages/zope/zope_3.3.1.bb
index 717e5a119b..000947f629 100644
--- a/packages/zope/zope_3.3.1.bb
+++ b/packages/zope/zope_3.3.1.bb
@@ -4,26 +4,25 @@ PRIORITY = "optional"
 DEPENDS = "python"
 RDEPENDS = "python-core python-shell"
 LICENSE = "ZPL"
-PR = "r3"
+PR = "r5"
 
 SRC_URI = "http://www.zope.org/Products/Zope3/${PV}/Zope-${PV}.tgz"
-
 S = "${WORKDIR}/Zope-${PV}"
 
+inherit distutils-base
+
 do_configure() {
 	./configure --with-python=${STAGING_BINDIR_NATIVE}/python --prefix=${prefix} --force
 }
 
 do_compile() {
-	oe_runmake HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS}
+	oe_runmake HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS} STAGING_INCDIR=${STAGING_INCDIR}
 }
 
-PYTHON_MAJMIN = "2.4"
-
 do_install() {
-	install -d ${D}${libdir}/python${PYTHON_MAJMIN}
+	install -d ${D}${libdir}/${PYTHON_DIR}
 	oe_runmake install prefix=${D}${prefix} HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS}
-	mv ${D}${libdir}/python/* ${D}${libdir}/python${PYTHON_MAJMIN} 
+	mv ${D}${libdir}/python/* ${D}${libdir}/${PYTHON_DIR} 
 }
 
 PACKAGES =+ "python-zopeinterface python-zopeinterface-dbg"
@@ -31,15 +30,15 @@ PACKAGES =+ "python-zopeinterface python-zopeinterface-dbg"
 FILES_${PN} = "${prefix}"
 FILES_${PN}_doc = "${prefix}/doc"
 FILES_${PN}-dbg += "\
-${libdir}/python${PYTHON_MAJMIN}/BTrees/.debug \
-${libdir}/python${PYTHON_MAJMIN}/persistent/.debug \
-${libdir}/python${PYTHON_MAJMIN}/zope/proxy/.debug \
-${libdir}/python${PYTHON_MAJMIN}/zope/thread/.debug \
-${libdir}/python${PYTHON_MAJMIN}/zope/security/.debug \
-${libdir}/python${PYTHON_MAJMIN}/zope/hookable/.debug \
-${libdir}/python${PYTHON_MAJMIN}/zope/app/container/.debug \
-${libdir}/python${PYTHON_MAJMIN}/zope/i18nmessageid/.debug \
-${libdir}/python${PYTHON_MAJMIN}/ZODB/.debug"
-FILES_python-zopeinterface-dbg += "${libdir}/python${PYTHON_MAJMIN}/zope/interface/.debug "
-
-FILES_python-zopeinterface = "${libdir}/python${PYTHON_MAJMIN}/zope/interface/*.* ${libdir}/python${PYTHON_MAJMIN}/zope/interface/common"
+${libdir}/${PYTHON_DIR}/BTrees/.debug \
+${libdir}/${PYTHON_DIR}/persistent/.debug \
+${libdir}/${PYTHON_DIR}/zope/proxy/.debug \
+${libdir}/${PYTHON_DIR}/zope/thread/.debug \
+${libdir}/${PYTHON_DIR}/zope/security/.debug \
+${libdir}/${PYTHON_DIR}/zope/hookable/.debug \
+${libdir}/${PYTHON_DIR}/zope/app/container/.debug \
+${libdir}/${PYTHON_DIR}/zope/i18nmessageid/.debug \
+${libdir}/${PYTHON_DIR}/ZODB/.debug"
+FILES_python-zopeinterface-dbg += "${libdir}/${PYTHON_DIR}/zope/interface/.debug "
+
+FILES_python-zopeinterface = "${libdir}/${PYTHON_DIR}/zope/interface/*.* ${libdir}/${PYTHON_DIR}/zope/interface/common"
author	Holger Hans Peter Freyther <zecke@selfish.org>	2008-11-16 16:35:39 +0100
committer	Holger Hans Peter Freyther <zecke@selfish.org>	2008-11-16 16:35:39 +0100
commit	52abe8d77cbfed9c91a9cae7ed0a7e60aaf50b34 (patch)
tree	7f3b125c3485041c0488adf60390a1fdb230bf6c
parent	9eaf1493b3c777d688ad992b9ecedd1cc18cf147 (diff)
parent	ce5b19f9784561fb506bc564082e7a3d888a0c90 (diff)
download	openembedded-52abe8d77cbfed9c91a9cae7ed0a7e60aaf50b34.tar.gz