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

25 files changed, 377 insertions, 54 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 78dc0f2082..a4072a35bd 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -118,9 +118,9 @@ sha256=0875e553a17fe65e920ad810a67aa6faca582c53476d8dc75880a6b3da625d0b
 md5=835e850fddba8d8214d39ddd0646c3e8
 sha256=f83af60d53ab4319e5d71a4459cc10464ffd683efabacd6bd773bb807f8771fa
 
-[http://media.djangoproject.com/releases/0.96/Django-0.96.1.tar.gz]
-md5=10aa32e58969c4efeb00ef42ba192b17
-sha256=4874134e9fc6bd08eb7e451e42038394668895c26b7cc867d4c3fdaf9d711085
+[http://media.djangoproject.com/releases/1.0/Django-1.0.tar.gz]
+md5=84d0490e4126f31d1c23f640e1e86f2f
+sha256=4c780b9e2906944ce02a9325b15f480d2bd4c0b12137f752aa4800c0f8563acf
 
 [http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-2.0a.tar.gz]
 md5=3bf4d8d285591a5b7f31170f9b87aba0
@@ -4166,6 +4166,10 @@ sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a
 md5=4afa0290cc3a41ac8822666f1110de98
 sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5
 
+[ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2]
+md5=5dfac5da961ecd5f227c3175859a486d
+sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165
+
 [ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2]
 md5=5dfac5da961ecd5f227c3175859a486d
 sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165
@@ -4902,6 +4906,10 @@ sha256=1c70e916c691c7c31ea3c8f2abeedae6c7dfda754e02b373287ceb5b46bfbb0e
 md5=f8721af6f4e90ff48bd7cb4c96a5a94c
 sha256=c2977b18d1166c62e3f04373feefc0e2af704da3cb98e32612be4a55fd77a3f9
 
+[http://ftp.5z.com/pub/gob/old/gob2-2.0.14.tar.gz]
+md5=f8721af6f4e90ff48bd7cb4c96a5a94c
+sha256=c2977b18d1166c62e3f04373feefc0e2af704da3cb98e32612be4a55fd77a3f9
+
 [http://releases.0x539.de/gobby/gobby-0.4.1.tar.gz]
 md5=a2c79bdda652a2d74fec104235d27bc0
 sha256=aad2ed23638f5a6aa655dc13395228cefc4c28e46b05eb05ac12481fac36aba3
@@ -5750,6 +5758,10 @@ sha256=e07c495a18679b79c7c6f6f475689a33ab2a8ee5af4783e915f08134d1f546d2
 md5=f7c9cf2e4b9967d3af167d7c9fadaae4
 sha256=d864fbd0bf6dea24e4f71736da9902a1cae86d0a1a893b5fe17118927257ec3e
 
+[ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz]
+md5=cd3f3eb54446be6003156158d51f4884
+sha256=4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
+
 [ftp://ftp.gnu.org/gnu/gsl/gsl-1.4.tar.gz]
 md5=7513e13525c073dc07e02cc4354294e2
 sha256=850b4512fa5e4bbb964c67c215fe8ce64fe6f7e6b704180a783d8c2a04169ccb
@@ -9294,6 +9306,10 @@ sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36
 md5=6646be5e31e58188e8f47c6ce64faa4c
 sha256=4d0d6a5302222757fb36ee21d8f8e1b3de849c2de658ab1105272f32ff78767d
 
+[http://downloads.sourceforge.net/pupnp/libupnp-1.6.5.tar.bz2]
+md5=2b0370e7c405a5bc80880085e6d7d827
+sha256=95b11e2db04c2e714c2f4fb05d9d31351d3388dababd4e1dd5300f4b0d5e8767
+
 [http://downloads.sourceforge.net/libusb/libusb-0.1.10a.tar.gz]
 md5=c6062b29acd2cef414bcc34e0decbdd1
 sha256=2f0ed0261074beaa6e060f9539c54017a3f3b4d2b272311e6cf60ba09c4aeadc
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index a66b1e4ac7..48cbb49d2c 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -57,6 +57,9 @@ require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc
 
 # We don't want to keep OABI compat
 ARM_KEEP_OABI = "0"
+# Do keep OABI compat for om-gta01 to keep the gllin binary working
+ARM_KEEP_OABI_pn-linux-openmoko_om-gta01 = "1"
+
 
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
 PREFERRED_PROVIDER_qemu-native = "qemu-native"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index bfac652d55..e81765d19e 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -43,7 +43,7 @@ SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
-SRCREV_pn-frameworkd ?= "5a292ced8330ace191d66fc1b655e921fa442fdf"
+SRCREV_pn-frameworkd ?= "a816e0412c687bf8e59e3505cce877f02e51f84d"
 SRCREV_pn-fso-gpsd ?= "fd1cd578d6ba9fa13aadceb59a9b46345108583b"
 SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2"
 SRCREV_pn-fstests ?= "204"
@@ -91,7 +91,7 @@ SRCREV_pn-matchbox-keyboard ?= "1910"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
-SRCREV_pn-mickeydbus ?= "19de58bbe1c80a547be35f86d315ac78a75cea2a"
+SRCREV_pn-mickeydbus ?= "a63379b41241e6529e027e7ae812628a8f1f9f0b"
 SRCREV_pn-mickeyterm ?= "19de58bbe1c80a547be35f86d315ac78a75cea2a"
 SRCREV_pn-moko-gtk-engine ?= "3612"
 SRCREV_pn-mpd-alsa ?= "6952"
@@ -191,7 +191,7 @@ SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "4067470ea4d569bae7b4161ca998645a0c9b96e7"
-SRCREV_pn-zhone ?= "2cccdc592d10c15509d974dfbba493e95a776530"
+SRCREV_pn-zhone ?= "28e01227063ab76b9144e7a443319add6b195864"
 
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 50500d084b..722a5c9dc9 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -81,7 +81,9 @@ do
 		      ctorrent \
 		      distcc \
 		      dsniff \
+		      duke3d \
 		      e-wm \
+		      empathy \ 
 		      epdfview \
 		      epiphany \
 		      evince \
@@ -100,7 +102,7 @@ do
 		      freenote \
 		      froot \
 		      gcc \
-		      gdal" \
+		      gdal \
 		      gdb \
 		      gdbserver \
 		      gimp \
@@ -108,6 +110,8 @@ do
 		      gmp \
 		      gnome-games \
 		      gnome-mplayer \
+		      gnome-panel \
+		      gnome-system-monitor \
 		      gnumeric \
 		      gnuplot \
 		      gnuradio \
@@ -150,7 +154,6 @@ do
 		      meta-nas-server \
 		      midori \
 		      mileage \
-		      minimo \
 		      mono \
 		      mpfr \
 		      mplayer \
@@ -217,7 +220,7 @@ do
 		      usbutils \
 		      usbview \
 		      viking \
-		      vlc-gpe \
+		      vlc \
 		      vpnc \
 		      wifi-radar \
 		      win4 \
diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index 268a24faba..9a0685578c 100644
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -8,8 +8,8 @@ DEPENDS = "expat virtual/libintl libdaemon dbus glib-2.0"
 
 # uclibc has no nss
 RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns"
-RDEPENDS_avahi-daemon = "sysvinit-pidof update-rc.d"
-RDEPENDS_avahi-autoipd = "update-rc.d"
+RDEPENDS_avahi-daemon += "sysvinit-pidof update-rc.d"
+RDEPENDS_avahi-autoipd += "update-rc.d"
 
 SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
 	   file://00avahi-autoipd file://99avahi-autoipd"
diff --git a/packages/avahi/avahi_0.6.19.bb b/packages/avahi/avahi_0.6.19.bb
index 482f0cd5ad..f58923e862 100644
--- a/packages/avahi/avahi_0.6.19.bb
+++ b/packages/avahi/avahi_0.6.19.bb
@@ -1,3 +1,3 @@
 require avahi.inc
 
-FILE_PR = "r8"
+FILE_PR = "r9"
diff --git a/packages/avahi/avahi_0.6.20.bb b/packages/avahi/avahi_0.6.20.bb
index 482f0cd5ad..f58923e862 100644
--- a/packages/avahi/avahi_0.6.20.bb
+++ b/packages/avahi/avahi_0.6.20.bb
@@ -1,3 +1,3 @@
 require avahi.inc
 
-FILE_PR = "r8"
+FILE_PR = "r9"
diff --git a/packages/avahi/avahi_0.6.21.bb b/packages/avahi/avahi_0.6.21.bb
index 7a0546afba..4c66a364bc 100644
--- a/packages/avahi/avahi_0.6.21.bb
+++ b/packages/avahi/avahi_0.6.21.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-FILE_PR = "r8"
+FILE_PR = "r9"
 
 SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1"
 SRC_URI += "file://avr32-ipv6-fix.patch;patch=1"
diff --git a/packages/avahi/avahi_0.6.22.bb b/packages/avahi/avahi_0.6.22.bb
index 0dae694e01..e70b8d4801 100644
--- a/packages/avahi/avahi_0.6.22.bb
+++ b/packages/avahi/avahi_0.6.22.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
 DEPENDS += "intltool-native"
-FILE_PR = "r8"
+FILE_PR = "r9"
 
 PACKAGES =+ "libavahi-gobject"
diff --git a/packages/duke3d/duke3d_svn.bb b/packages/duke3d/duke3d_svn.bb
new file mode 100644
index 0000000000..11c33b1fad
--- /dev/null
+++ b/packages/duke3d/duke3d_svn.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Duke Nukem 3D game engine"
+LICENSE = "GPLv2"
+DEPENDS = "libsdl libsdl-mixer"
+
+SRCREV = "185"
+PV = "0.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.icculus.org/duke3d/;module=trunk \
+           file://duke3d.desktop"
+
+S = "${WORKDIR}/trunk/source"
+
+PARALLEL_MAKE = ""
+
+do_compile() {
+	for i in $(find ${S} -name 'Makefile') ; do
+		sed -i s:\ gcc:\ '${CC}': $i
+	done
+	make
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 ${S}/duke3d ${D}${bindir}/
+	install -d ${D}${datadir}/applications
+	install -m 0644 ${WORKDIR}/duke3d.desktop ${D}${datadir}/applications/
+}
diff --git a/packages/duke3d/files/duke3d.desktop b/packages/duke3d/files/duke3d.desktop
new file mode 100644
index 0000000000..a7a3f01f0b
--- /dev/null
+++ b/packages/duke3d/files/duke3d.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=Duke3D
+Comment=first person shooter
+Encoding=UTF-8
+Version=0.1.1
+Type=Application
+Exec=duke3d
+Icon=duke3d
+Terminal=false
+Categories=GTK;Application
+SingleInstance=true
+StartupNotify=true
+
diff --git a/packages/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch b/packages/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch
index 38dd0a5c31..d1dbd07341 100644
--- a/packages/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch
+++ b/packages/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch
@@ -1,13 +1,273 @@
-Index: e2fsprogs-1.38/MCONFIG.in
-===================================================================
+This patch is based on the following:
+
+http://cvs.fedora.redhat.com/viewvc/rpms/e2fsprogs/F-7/e2fsprogs-1.39-mkinstalldirs.patch
+
+diff -urN e2fsprogs-1.38.orig/configure.in e2fsprogs-1.38/configure.in
+--- e2fsprogs-1.38.orig/configure.in	2005-04-06 20:44:15.000000000 +0200
++++ e2fsprogs-1.38/configure.in	2008-10-16 23:44:10.000000000 +0200
+@@ -518,6 +518,7 @@
+ AC_CHECK_TOOL(RANLIB, ranlib, :)
+ AC_CHECK_TOOL(STRIP, strip, :)
+ AC_PROG_INSTALL
++AC_PROG_MKDIR_P
+ # See if we need a separate native compiler.
+ if test $cross_compiling = no; then
+   BUILD_CC="$CC"
+diff -urN e2fsprogs-1.38.orig/debugfs/Makefile.in e2fsprogs-1.38/debugfs/Makefile.in
+--- e2fsprogs-1.38.orig/debugfs/Makefile.in	2005-06-29 19:42:20.000000000 +0200
++++ e2fsprogs-1.38/debugfs/Makefile.in	2008-10-16 23:44:10.000000000 +0200
+@@ -48,8 +48,8 @@
+ 	@$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
+ 
+ installdirs:
+-	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
++	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
++	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
+ 		$(DESTDIR)$(man8dir)
+ 
+ install: $(PROGS) $(MANPAGES) installdirs
+diff -urN e2fsprogs-1.38.orig/doc/Makefile.in e2fsprogs-1.38/doc/Makefile.in
+--- e2fsprogs-1.38.orig/doc/Makefile.in	2005-06-29 19:42:20.000000000 +0200
++++ e2fsprogs-1.38/doc/Makefile.in	2008-10-16 23:44:10.000000000 +0200
+@@ -20,8 +20,8 @@
+ 
+ install-doc-libs:
+ 	@$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
+-	@echo "	MKINSTALLDIRS $(infodir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
++	@echo "	MKDIR_P $(infodir)"
++	@$(MKDIR_P) $(DESTDIR)$(infodir)
+ 	@for i in libext2fs.info* ; do \
+ 		echo "	INSTALL_DATA $(infodir)/$$i" ; \
+ 		$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
+diff -urN e2fsprogs-1.38.orig/e2fsck/Makefile.in e2fsprogs-1.38/e2fsck/Makefile.in
+--- e2fsprogs-1.38.orig/e2fsck/Makefile.in	2005-06-29 19:42:20.000000000 +0200
++++ e2fsprogs-1.38/e2fsck/Makefile.in	2008-10-16 23:44:55.000000000 +0200
+@@ -151,8 +151,8 @@
+ 	@$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8
+ 
+ installdirs:
+-	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
++	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
++	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
+ 		$(DESTDIR)$(man8dir)
+ 
+ install: $(PROGS) $(MANPAGES) installdirs
+diff -urN e2fsprogs-1.38.orig/intl/Makefile.in e2fsprogs-1.38/intl/Makefile.in
+--- e2fsprogs-1.38.orig/intl/Makefile.in	2005-06-29 19:42:20.000000000 +0200
++++ e2fsprogs-1.38/intl/Makefile.in	2008-10-16 23:44:10.000000000 +0200
+@@ -39,8 +39,8 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
++MKDIR_P = @MKDIR_P@
++mkdir_p = @MKDIR_P@
+ 
+ l = @INTL_LIBTOOL_SUFFIX_PREFIX@
+ 
+diff -urN e2fsprogs-1.38.orig/lib/blkid/Makefile.in e2fsprogs-1.38/lib/blkid/Makefile.in
+--- e2fsprogs-1.38.orig/lib/blkid/Makefile.in	2005-06-29 19:39:54.000000000 +0200
++++ e2fsprogs-1.38/lib/blkid/Makefile.in	2008-10-16 23:45:16.000000000 +0200
+@@ -129,8 +129,8 @@
+ 	@cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/blkid"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
++	@echo "	MKDIR_P $(libdir) $(includedir)/blkid"
++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
+ 		$(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig
+ 
+ install:: all installdirs 
+diff -urN e2fsprogs-1.38.orig/lib/e2p/Makefile.in e2fsprogs-1.38/lib/e2p/Makefile.in
+--- e2fsprogs-1.38.orig/lib/e2p/Makefile.in	2005-06-29 19:42:20.000000000 +0200
++++ e2fsprogs-1.38/lib/e2p/Makefile.in	2008-10-16 23:44:10.000000000 +0200
+@@ -73,8 +73,8 @@
+ 	./tst_ostype
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/e2p"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
++	@echo "	MKDIR_P $(libdir) $(includedir)/e2p"
++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
+ 		$(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig
+ 
+ install:: all installdirs 
+diff -urN e2fsprogs-1.38.orig/lib/et/Makefile.in e2fsprogs-1.38/lib/et/Makefile.in
+--- e2fsprogs-1.38.orig/lib/et/Makefile.in	2005-06-29 19:42:20.000000000 +0200
++++ e2fsprogs-1.38/lib/et/Makefile.in	2008-10-16 23:44:10.000000000 +0200
+@@ -74,8 +74,8 @@
+ 	$(TAGS) $(SRCS)
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
++	@echo "	MKDIR_P $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
+ 		$(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \
+ 		$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
+ 		$(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig
+diff -urN e2fsprogs-1.38.orig/lib/ext2fs/Makefile.in e2fsprogs-1.38/lib/ext2fs/Makefile.in
+--- e2fsprogs-1.38.orig/lib/ext2fs/Makefile.in	2005-06-29 19:42:20.000000000 +0200
++++ e2fsprogs-1.38/lib/ext2fs/Makefile.in	2008-10-16 23:44:10.000000000 +0200
+@@ -230,8 +230,8 @@
+ @SWAPFS_CMT@	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_byteswap
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
++	@echo "	MKDIR_P $(libdir) $(includedir)/ext2fs"
++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
+ 		$(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig
+ 
+ install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc
+diff -urN e2fsprogs-1.38.orig/lib/Makefile.elf-lib e2fsprogs-1.38/lib/Makefile.elf-lib
+--- e2fsprogs-1.38.orig/lib/Makefile.elf-lib	2004-12-15 17:30:39.000000000 +0100
++++ e2fsprogs-1.38/lib/Makefile.elf-lib	2008-10-16 23:44:10.000000000 +0200
+@@ -35,8 +35,8 @@
+ 	@$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
+ 
+ installdirs-elf-lib::
+-	@echo "	MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
++	@echo "	MKDIR_P $(ELF_INSTALL_DIR) $(libdir)"
++	@$(MKDIR_P) $(DESTDIR)$(ELF_INSTALL_DIR) \
+ 		$(DESTDIR)$(libdir)
+ 
+ installdirs:: installdirs-elf-lib
+diff -urN e2fsprogs-1.38.orig/lib/ss/Makefile.in e2fsprogs-1.38/lib/ss/Makefile.in
+--- e2fsprogs-1.38.orig/lib/ss/Makefile.in	2005-06-29 19:42:20.000000000 +0200
++++ e2fsprogs-1.38/lib/ss/Makefile.in	2008-10-16 23:44:10.000000000 +0200
+@@ -125,8 +125,8 @@
+ 	@cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
++	@echo "	MKDIR_P $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
++	@$(MKDIR_P) $(DESTDIR)$(libdir) \
+ 		$(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \
+ 		$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig
+ 
+diff -urN e2fsprogs-1.38.orig/lib/uuid/Makefile.in e2fsprogs-1.38/lib/uuid/Makefile.in
+--- e2fsprogs-1.38.orig/lib/uuid/Makefile.in	2005-06-29 19:42:20.000000000 +0200
++++ e2fsprogs-1.38/lib/uuid/Makefile.in	2008-10-16 23:44:10.000000000 +0200
+@@ -126,8 +126,8 @@
+ 	@cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
+ 
+ installdirs::
+-	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir)  \
++	@echo "	MKDIR_P $(libdir) $(includedir)/uuid $(man3dir)"
++	@$(MKDIR_P) $(DESTDIR)$(libdir)  \
+ 		$(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \
+ 		$(DESTDIR)$(libdir)/pkgconfig
+ 
+diff -urN e2fsprogs-1.38.orig/MCONFIG.in e2fsprogs-1.38/MCONFIG.in
 --- e2fsprogs-1.38.orig/MCONFIG.in	2005-02-04 16:43:57.000000000 +0100
-+++ e2fsprogs-1.38/MCONFIG.in	2008-10-14 00:57:33.988145555 +0200
++++ e2fsprogs-1.38/MCONFIG.in	2008-10-16 23:44:10.000000000 +0200
 @@ -59,7 +59,7 @@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
 -MKINSTALLDIRS = @MKINSTALLDIRS@
-+MKINSTALLDIRS = @mkdir_p@
++MKDIR_P = @MKDIR_P@
  
  #
  # Library definitions
+diff -urN e2fsprogs-1.38.orig/misc/Makefile.in e2fsprogs-1.38/misc/Makefile.in
+--- e2fsprogs-1.38.orig/misc/Makefile.in	2005-06-29 19:42:20.000000000 +0200
++++ e2fsprogs-1.38/misc/Makefile.in	2008-10-16 23:44:10.000000000 +0200
+@@ -215,8 +215,8 @@
+ 	@$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
+ 
+ installdirs:
+-	@echo "	MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
++	@echo "	MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)"
++	@$(MKDIR_P) $(DESTDIR)$(sbindir) \
+ 		$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
+ 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) $(DESTDIR)$(libdir)
+ 
+diff -urN e2fsprogs-1.38.orig/po/Makefile.in.in e2fsprogs-1.38/po/Makefile.in.in
+--- e2fsprogs-1.38.orig/po/Makefile.in.in	2005-06-29 19:42:20.000000000 +0200
++++ e2fsprogs-1.38/po/Makefile.in.in	2008-10-16 23:44:10.000000000 +0200
+@@ -25,11 +25,10 @@
+ datadir = @datadir@
+ localedir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/gettext/po
++mkdir_p = @MKDIR_P@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+ 
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@
+@@ -147,7 +146,7 @@
+ install-exec:
+ install-data: install-data-@USE_NLS@
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
++	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ 	  for file in $(DISTFILES.common) Makevars.template; do \
+ 	    $(INSTALL_DATA) $(srcdir)/$$file \
+ 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+@@ -160,13 +159,13 @@
+ 	fi
+ install-data-no: all
+ install-data-yes: all
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)
++	$(mkdir_p) $(DESTDIR)$(datadir)
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
++	  $(mkdir_p) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+ 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+ 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+@@ -206,19 +205,19 @@
+ installdirs-exec:
+ installdirs-data: installdirs-data-@USE_NLS@
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
++	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+ 	else \
+ 	  : ; \
+ 	fi
+ installdirs-data-no:
+ installdirs-data-yes:
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)
++	$(mkdir_p) $(DESTDIR)$(datadir)
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
++	  $(mkdir_p) $(DESTDIR)$$dir; \
+ 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+ 	    if test -n "$$lc"; then \
+ 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+diff -urN e2fsprogs-1.38.orig/resize/Makefile.in e2fsprogs-1.38/resize/Makefile.in
+--- e2fsprogs-1.38.orig/resize/Makefile.in	2005-06-29 19:42:20.000000000 +0200
++++ e2fsprogs-1.38/resize/Makefile.in	2008-10-16 23:44:10.000000000 +0200
+@@ -56,8 +56,8 @@
+ 	@$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) 
+ 
+ installdirs:
+-	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
+-	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
++	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
++	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
+ 		$(DESTDIR)$(man8dir)
+ 
+ install: $(PROGS) $(MANPAGES) installdirs
diff --git a/packages/e2fsprogs/e2fsprogs-native_1.38.bb b/packages/e2fsprogs/e2fsprogs-native_1.38.bb
index 9cd499c320..b0caa5c6be 100644
--- a/packages/e2fsprogs/e2fsprogs-native_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs-native_1.38.bb
@@ -2,7 +2,11 @@ SECTION = "base"
 require e2fsprogs.inc
 inherit native
 
-FILE_PR = "r1"
+FILE_PR = "r2"
+
+SRC_URI += "file://no-hardlinks.patch;patch=1 \
+	    file://mkinstalldirs.patch;patch=1 \
+	   "
 
 EXTRA_OECONF = ""
 
diff --git a/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb b/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
index 9cd499c320..955036e7b1 100644
--- a/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
+++ b/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
@@ -3,6 +3,7 @@ require e2fsprogs.inc
 inherit native
 
 FILE_PR = "r1"
+DEFAULT_PREFERENCE = "-1"
 
 EXTRA_OECONF = ""
 
diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb
index 3dcb9c956f..4238fecac3 100644
--- a/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -1,19 +1,11 @@
 require e2fsprogs.inc
 
-FILE_PR = "r16"
+FILE_PR = "r17"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1 \
 	    file://mkinstalldirs.patch;patch=1 \
 	   "
 
-# Temporary solution; the mkinstalldirs patch kills SlugOS builds regardless
-# of version of gettext in use -- the lines below need to be removed when
-# the feeds are frozen and SlugOS is upgraded.
-SRC_URI_slugos = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
-	          file://no-hardlinks.patch;patch=1 \
-		 "
-
-
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
 	( cd util; ${BUILD_CC} subst.c -o subst )
diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb
index 8d77fdcc86..3ad398b5e7 100644
--- a/packages/freesmartphone/frameworkd_git.bb
+++ b/packages/freesmartphone/frameworkd_git.bb
@@ -1,11 +1,11 @@
-DESCRIPTION = "The freesmartphone.org Framework Daemon"
+DESCRIPTION = "The reference implementation of the freesmartphone.org framework APIs"
 HOMEPAGE = "http://www.freesmartphone.org"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de> et. al."
 SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
-PV = "0.8.3+${PR}-gitr${SRCREV}"
-FILE_PR = "r1"
+PV = "0.8.4.0+gitr${SRCREV}"
+FILE_PR = "r0"
 
 inherit distutils update-rc.d
 
@@ -24,6 +24,7 @@ do_install_append() {
 }
 
 RDEPENDS_${PN} += "\
+  python-ctypes \
   python-dbus \
   python-datetime \
   python-pprint \
diff --git a/packages/freesmartphone/mickeydbus_git.bb b/packages/freesmartphone/mickeydbus_git.bb
index 17b8975375..e048315b3a 100644
--- a/packages/freesmartphone/mickeydbus_git.bb
+++ b/packages/freesmartphone/mickeydbus_git.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "Mickey's DBus introspection and calling Program"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
+HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console/network"
 LICENSE = "GPLv2"
-PV = "0.9.1+gitr${SRCREV}"
-FILE_PR = "r1"
+PV = "0.9.2+gitr${SRCREV}"
+FILE_PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
diff --git a/packages/freesmartphone/mickeyterm_git.bb b/packages/freesmartphone/mickeyterm_git.bb
index cb4ea28170..d32b2ee95a 100644
--- a/packages/freesmartphone/mickeyterm_git.bb
+++ b/packages/freesmartphone/mickeyterm_git.bb
@@ -1,5 +1,6 @@
 DESCRIPTION = "Mickey's Terminal Program"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
+HOMEPAGE = "http://www.freesmartphone.org"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 PV = "2.9.1+gitr${SRCREV}"
diff --git a/packages/freesmartphone/zhone_git.bb b/packages/freesmartphone/zhone_git.bb
index 06c19ce25b..c95a536807 100644
--- a/packages/freesmartphone/zhone_git.bb
+++ b/packages/freesmartphone/zhone_git.bb
@@ -1,8 +1,8 @@
-DESCRIPTION = "Zhone: Zen Phone"
+DESCRIPTION = "A phone UI based on the freesmartphone.org framework"
 LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "edje-native python-pyrex-native python-cython-native"
-PV = "0.0.0+${PR}-gitr${SRCREV}"
+PV = "0.0.1+gitr${SRCREV}"
 FILE_PR = "r10"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \
diff --git a/packages/libsdl/libsdl-image.inc b/packages/libsdl/libsdl-image.inc
index 1212e9cfa6..b52db71511 100644
--- a/packages/libsdl/libsdl-image.inc
+++ b/packages/libsdl/libsdl-image.inc
@@ -10,6 +10,8 @@ S = "${WORKDIR}/SDL_image-${PV}"
 
 inherit autotools
 
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
 do_stage() {
 	oe_libinstall -so libSDL_image ${STAGING_LIBDIR}
 	ln -sf libSDL_image.so ${STAGING_LIBDIR}/libSDL_image-1.2.so
diff --git a/packages/libsdl/libsdl-image_1.2.3.bb b/packages/libsdl/libsdl-image_1.2.3.bb
index 81bb7504e6..199945e4bc 100644
--- a/packages/libsdl/libsdl-image_1.2.3.bb
+++ b/packages/libsdl/libsdl-image_1.2.3.bb
@@ -6,8 +6,6 @@ SRC_URI += "\
   file://autotools.patch;patch=1 \
 "
 
-export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
-
 inherit autotools
 
 do_stage() {
diff --git a/packages/linux/linux-openmoko/defconfig-oe b/packages/linux/linux-openmoko/defconfig-oe
index 4154639d3e..4dd031ec8a 100644
--- a/packages/linux/linux-openmoko/defconfig-oe
+++ b/packages/linux/linux-openmoko/defconfig-oe
@@ -569,15 +569,15 @@ CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_IRDA is not set
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
+CONFIG_BT=y
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
+CONFIG_BT_RFCOMM=y
 CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP=y
 CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
+CONFIG_BT_HIDP=y
 
 #
 # Bluetooth device drivers
@@ -1137,13 +1137,13 @@ CONFIG_SOUND=y
 #
 # Advanced Linux Sound Architecture
 #
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
 # CONFIG_SND_SEQUENCER is not set
 CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
 CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_SND_DYNAMIC_MINORS is not set
 CONFIG_SND_SUPPORT_OLD_API=y
@@ -1176,10 +1176,11 @@ CONFIG_SND_VERBOSE_PROCFS=y
 #
 # System on Chip audio support
 #
-CONFIG_SND_SOC=m
-CONFIG_SND_S3C24XX_SOC=m
+CONFIG_SND_SOC=y
+CONFIG_SND_S3C24XX_SOC=y
 CONFIG_SND_S3C24XX_SOC_I2S=m
 CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
+# CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753_DEBUG is not set
 CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
 
 #
diff --git a/packages/linux/linux-openmoko_2.6.24+git.bb b/packages/linux/linux-openmoko_2.6.24+git.bb
index 83979627b1..524b22a311 100644
--- a/packages/linux/linux-openmoko_2.6.24+git.bb
+++ b/packages/linux/linux-openmoko_2.6.24+git.bb
@@ -7,7 +7,7 @@ KERNEL_RELEASE = "2.6.24"
 KERNEL_VERSION = "${KERNEL_RELEASE}"
 
 PV = "${KERNEL_RELEASE}+${PR}+gitr${SRCREV}"
-FILE_PR = "r8"
+FILE_PR = "r10"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \
diff --git a/packages/python/python-django_0.96.1.bb b/packages/python/python-django_1.0.bb
index 7921f9db0f..06816778b0 100644
--- a/packages/python/python-django_0.96.1.bb
+++ b/packages/python/python-django_1.0.bb
@@ -8,7 +8,7 @@ RDEPENDS = "python-email python-netserver python-pickle python-pprint \
 RRECOMMENDS = "python-pysqlite2"
 SRCNAME = "Django"
 
-SRC_URI = "http://media.djangoproject.com/releases/0.96/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "http://media.djangoproject.com/releases/1.0/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index 666946b71a..2c16eeacc9 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -13,7 +13,7 @@ resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \
 libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \
 libxkbui libxxf86misc libxi libdmx libxtst libxres mesa"
 
-RDEPENDS_${PN} = "hal"
+RECOMMENDS_${PN} = "hal"
 
 XORG_PN = "xorg-server"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \