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

15 files changed, 51 insertions, 32 deletions

diff --git a/packages/clutter/moblin-proto_git.bb b/packages/clutter/moblin-proto_git.bb
index 8ce97bbeab..25e0418b5d 100644
--- a/packages/clutter/moblin-proto_git.bb
+++ b/packages/clutter/moblin-proto_git.bb
@@ -3,7 +3,7 @@ DEPENDS = "clutter-box2d"
 PV = "0.0+git${SRCREV}"
 PR = "r1"
 
-SRC_URI = "git://moblin.org/repos/users/pippin/prototype.git/;protocol=http \
+SRC_URI = "git://git.moblin.org/repos/users/pippin/prototype.git/;protocol=http \
            file://paths.patch;patch=1"
 
 S = "${WORKDIR}/git"
diff --git a/packages/dbus/dbus-1.0.3/fedora-compile-fix.patch b/packages/dbus/dbus-1.0.3/fedora-compile-fix.patch
new file mode 100644
index 0000000000..eac37f04dd
--- /dev/null
+++ b/packages/dbus/dbus-1.0.3/fedora-compile-fix.patch
@@ -0,0 +1,18 @@
+Do not fail with udrec being unknown and say we are using
+_GNU_SOURCE. This is needed for the libc/header/gcc combo
+fedora 9 is using. bits/socket.h has struct udrec #ifdefed
+with _GNU.
+
+Index: dbus-1.0.3/dbus/dbus-sysdeps-unix.c
+===================================================================
+--- dbus-1.0.3.orig/dbus/dbus-sysdeps-unix.c
++++ dbus-1.0.3/dbus/dbus-sysdeps-unix.c
+@@ -22,6 +22,8 @@
+  *
+  */
+ 
++#define _GNU_SOURCE
++
+ #include "dbus-internals.h"
+ #include "dbus-sysdeps.h"
+ #include "dbus-sysdeps-unix.h"
diff --git a/packages/dbus/dbus-native_1.0.3.bb b/packages/dbus/dbus-native_1.0.3.bb
index 195557b35b..8a4c6fee7d 100644
--- a/packages/dbus/dbus-native_1.0.3.bb
+++ b/packages/dbus/dbus-native_1.0.3.bb
@@ -1,5 +1,6 @@
 require dbus.inc
 
+PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 
 inherit native
@@ -11,6 +12,7 @@ SRC_URI = "\
   http://freedesktop.org/software/dbus/releases/dbus/dbus-${PV}.tar.gz \
   file://cross.patch;patch=1 \
   file://tmpdir.patch;patch=1 \
+  file://fedora-compile-fix.patch;patch=1 \
   file://dbus-1.init \
 "
 
diff --git a/packages/e17/e-wm/Xsession.d/98enlightenment b/packages/e17/e-wm/Xsession.d/98enlightenment
deleted file mode 100644
index 7913888438..0000000000
--- a/packages/e17/e-wm/Xsession.d/98enlightenment
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec enlightenment_start
diff --git a/packages/e17/e-wm_svn.bb b/packages/e17/e-wm_svn.bb
index e16cad051d..acbee85a70 100644
--- a/packages/e17/e-wm_svn.bb
+++ b/packages/e17/e-wm_svn.bb
@@ -1,8 +1,8 @@
-DESCRIPTION = "The Enlightenment Window Mananger Version 17"
+DESCRIPTION = "The Enlightenment Window Manager Version 17"
 DEPENDS = "eet evas ecore edje efreet edbus"
 LICENSE = "MIT BSD"
 PV = "0.16.999.043+svnr${SRCREV}"
-PR = "r14"
+PR = "r15"
 
 inherit e update-alternatives
 
diff --git a/packages/freenote/freenote_1.12.0.bb b/packages/freenote/freenote_1.12.0.bb
index e28689ebf0..8f77776131 100644
--- a/packages/freenote/freenote_1.12.0.bb
+++ b/packages/freenote/freenote_1.12.0.bb
@@ -16,8 +16,9 @@ do_configure_prepend() {
 	mv -f FreeNote subdir1
 	mv -f FreeNoteSetup subdir2
 	printf "TEMPLATE=subdirs\nSUBDIRS=subdir1 subdir2\n" >> freenote.pro
-	pushd ${S}/subdir1 && rm *.pro && qmake -project && echo "TARGET=FreeNote" >> subdir1.pro && popd
-	pushd ${S}/subdir2 && rm *.pro && qmake -project && echo "TARGET=FreeNoteSetup" >> subdir2.pro && popd
+	cd ${S}/subdir1 && rm *.pro && qmake -project && echo "TARGET=FreeNote" >> subdir1.pro
+	cd ${S}/subdir2 && rm *.pro && qmake -project && echo "TARGET=FreeNoteSetup" >> subdir2.pro
+	cd ${S}
 }
 
 do_install() {
diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb
index d073aa7d98..8c56d9b835 100644
--- a/packages/mono/mono_1.2.5.1.bb
+++ b/packages/mono/mono_1.2.5.1.bb
@@ -14,9 +14,9 @@ EXTRA_OECONF += " --disable-mcs-build "
 
 do_install_prepend() {
 	install -d ${D}
-	pushd ${D}
+	cd ${D}
 	tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz
-	popd
+	cd ${S}
 }
 
 do_install_append() {
@@ -24,11 +24,11 @@ do_install_append() {
 	# however, jay is not being cross-compiled and thus only
 	# available for the buildhost architecture, so remove it
 	# entirely
-	pushd ${D}
+	cd ${D}
 	rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \
 	    ./usr/share/jay/README.jay \
 	    ./usr/bin/jay
-	popd
+	cd ${S}
 
 	# Not packaged with the default rules and apparently
 	# not used for anything
diff --git a/packages/mono/mono_1.2.6.bb b/packages/mono/mono_1.2.6.bb
index f436a67df5..c039828180 100644
--- a/packages/mono/mono_1.2.6.bb
+++ b/packages/mono/mono_1.2.6.bb
@@ -12,9 +12,9 @@ EXTRA_OECONF += " --disable-mcs-build "
 
 do_install_prepend() {
 	install -d ${D}
-	pushd ${D}
+	cd ${D}
 	tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz
-	popd
+	cd ${S}
 }
 
 do_install_append() {
@@ -22,11 +22,11 @@ do_install_append() {
 	# however, jay is not being cross-compiled and thus only
 	# available for the buildhost architecture, so remove it
 	# entirely
-	pushd ${D}
+	cd ${D}
 	rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \
 	    ./usr/share/jay/README.jay \
 	    ./usr/bin/jay
-	popd
+	cd ${S}
 
 	# Not packaged with the default rules and apparently
 	# not used for anything
diff --git a/packages/mono/mono_svn.bb b/packages/mono/mono_svn.bb
index a42ddd8231..a5ba966796 100644
--- a/packages/mono/mono_svn.bb
+++ b/packages/mono/mono_svn.bb
@@ -13,9 +13,9 @@ EXTRA_OECONF += " --disable-mcs-build "
 
 do_install_prepend() {
 	install -d ${D}
-	pushd ${D}
+	cd ${D}
 	tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz
-	popd
+	cd ${S}
 }
 
 do_install_append() {
@@ -23,11 +23,11 @@ do_install_append() {
 	# however, jay is not being cross-compiled and thus only
 	# available for the buildhost architecture, so remove it
 	# entirely
-	pushd ${D}
+	cd ${D}
 	rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \
 	    ./usr/share/jay/README.jay \
 	    ./usr/bin/jay
-	popd
+	cd ${S}
 
 	# Not packaged with the default rules and apparently
 	# not used for anything
diff --git a/packages/mono/mono_svn.inc b/packages/mono/mono_svn.inc
index be007e4b9e..908fd3da70 100644
--- a/packages/mono/mono_svn.inc
+++ b/packages/mono/mono_svn.inc
@@ -3,8 +3,9 @@ SECTION = "devel/mono"
 LICENSE = "GPL LGPL X11"
 
 SRCREV = "87352"
-SRC_URI = "svn://anonsvn.mono-project.com/source/trunk/;module=mcs;rev=${SRCREV} \
-	svn://anonsvn.mono-project.com/source/trunk/;module=mono;rev=${SRCREV} "
+SRC_URI = "svn://anonsvn.mono-project.com/source/trunk/;module=mcs;rev=${SRCREV};name=mcs \
+	svn://anonsvn.mono-project.com/source/trunk/;module=mono;rev=${SRCREV};name=mono "
+SRCREV_FORMAT = "rmono"
 
 PV = "1.2.5.1+svnr${SRCREV}"
 S = "${WORKDIR}/mono"
diff --git a/packages/nunome/nunome_1.0.2.bb b/packages/nunome/nunome_1.0.2.bb
index 4dd1519536..bf297b0699 100644
--- a/packages/nunome/nunome_1.0.2.bb
+++ b/packages/nunome/nunome_1.0.2.bb
@@ -21,10 +21,10 @@ do_configure_prepend() {
 	sed -i -e 's,/opt/QtPalmtop/bin/,${bindir}/,g' "${S}/ui/nunome.h"
 	sed -i -e 's,/opt/QtPalmtop/,${palmtopdir}/,g' "${S}/ui/nunome.h"
 	printf "TEMPLATE=subdirs\nSUBDIRS=Nnmlib server ui dicman ui\n" >nunome.pro
-	pushd Nnmlib && qmake -project -t lib && popd
-	pushd server && qmake -project && printf "LIBS+=-lNnmlib\nTARGET=server.bin\n" >> server.pro && popd
-	pushd dicman && qmake -project && printf "LIBS+=-lnunome -lNnmlib\nTARGET=dicman.bin\n" >> dicman.pro && popd
-	pushd ui && qmake -project -t lib && printf "LIBS+=-lNnmlib\nTARGET=nunome\n" >> ui.pro && popd
+	cd Nnmlib && qmake -project -t lib && cd ../
+	cd server && qmake -project && printf "LIBS+=-lNnmlib\nTARGET=server.bin\n" >> server.pro && cd ../
+	cd dicman && qmake -project && printf "LIBS+=-lnunome -lNnmlib\nTARGET=dicman.bin\n" >> dicman.pro && cd ../
+	cd ui && qmake -project -t lib && printf "LIBS+=-lNnmlib\nTARGET=nunome\n" >> ui.pro && cd ../
 	find . -name "moc*"|xargs rm -f
 	find . -name "Makefile"|xargs rm -f
 }
diff --git a/packages/tasks/task-mipl.bb b/packages/tasks/task-mipl.bb
index 9e2dce52f1..a2eff400a7 100644
--- a/packages/tasks/task-mipl.bb
+++ b/packages/tasks/task-mipl.bb
@@ -7,8 +7,6 @@ DESCRIPTION = "Mobile ipv6 extensions"
 
 inherit task
 
-PACKAGE_ARCH = "all"
-
 RDEPENDS = "mipv6"
 RRECOMMENDS = "kernel-module-ipv6 \
                kernel-module-mip6 \
diff --git a/packages/tasks/task-openmoko-asu.bb b/packages/tasks/task-openmoko-asu.bb
index 0cdb6aee7b..4c02abc260 100644
--- a/packages/tasks/task-openmoko-asu.bb
+++ b/packages/tasks/task-openmoko-asu.bb
@@ -2,12 +2,12 @@ DESCRIPTION = "Openmoko: Om 2008.8 August Software Update"
 
 SECTION = "openmoko/base"
 ALLOW_EMPTY = "1"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 LICENSE = "MIT"
-PR = "r2.02"
+PR = "r2.03"
 
 inherit task
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 PACKAGES = "task-openmoko-asu"
 RDEPENDS_task-openmoko-asu = "\
   bluez-hcidump \
diff --git a/packages/tasks/task-openprotium.bb b/packages/tasks/task-openprotium.bb
index 4c5d762f8f..a8e7bd7766 100644
--- a/packages/tasks/task-openprotium.bb
+++ b/packages/tasks/task-openprotium.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "Basic image for openprotium"
 HOMEPAGE = "http://www.openprotium.org"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
 PR = "r1"
 
 inherit task
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 # be sure to build the kernel:
 DEPENDS = "virtual/kernel"
 
diff --git a/packages/xorg-xserver/xserver-xorg_cvs.bb b/packages/xorg-xserver/xserver-xorg_cvs.bb
index c1574a621b..c120dc713d 100644
--- a/packages/xorg-xserver/xserver-xorg_cvs.bb
+++ b/packages/xorg-xserver/xserver-xorg_cvs.bb
@@ -54,7 +54,9 @@ do_install() {
 do_stage() {
 	install -d ${STAGING_INCDIR}/xserver-xorg
 	for i in i810 via; do
-	  pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd
+	  cd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/
 	done
+
+	cd ${S}
 	install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
 }