propagate from branch 'org.openembedded.dev' (head 4c0f1d3f30593f38897aec2a3509ff562c01120e)

            to branch 'org.openembedded.nslu2-linux' (head 2c61fe5bf9a20cefdfb289951f11ee2d7d29cf53)

7 files changed, 61 insertions, 33 deletions

diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf
index 285ab851ab..f55f2d2554 100644
--- a/conf/machine/zaurus-clamshell.conf
+++ b/conf/machine/zaurus-clamshell.conf
@@ -14,8 +14,8 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
 BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater"
 
 GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_DEPENDS += "gaim sylpheed"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
+GPE_EXTRA_DEPENDS += "gaim sylpheed chkhinge"
+GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge"
 
 include conf/machine/handheld-common.conf
 
diff --git a/packages/alsa/alsa-driver/sa11xx.patch b/packages/alsa/alsa-driver/sa11xx.patch
new file mode 100644
index 0000000000..34509b13b0
--- /dev/null
+++ b/packages/alsa/alsa-driver/sa11xx.patch
@@ -0,0 +1,38 @@
+--- ./alsa-kernel/arm/sa11xx-uda1341.c	2005-06-27 12:59:53.000000000 +0200
++++ ./alsa-kernel/arm/sa11xx-uda1341.c.orig	2005-06-27 12:59:29.000000000 +0200
+@@ -366,7 +366,7 @@
+ 	DEBUG("\t request id <%s>\n", s->id);
+ 	DEBUG("\t  request dma_dev = 0x%x \n", s->dma_dev);
+ 	if((ret = sa1100_request_dma((s)->dma_dev, (s)->id, callback, s, &((s)->dma_regs))))
+-		printk(__FUNCTION__ ": sa1100_request_dma returned %d\n",ret);
++		printk("%s: sa1100_request_dma returned %d\n",__FUNCTION__,ret);
+ 	
+ 
+ 
+@@ -978,7 +978,7 @@
+ 	switch (req) {
+ 	case PM_SUSPEND: /* enter D1-D3 */
+ 		if (card->power_state == SNDRV_CTL_POWER_D3hot){
+-			printk(__FUNCTION__ ": exiting eraly from suspend\n");			
++			printk("%s: exiting eraly from suspend\n",__FUNCTION__);			
+ 			return 0;
+ 		}
+ 		snd_power_lock(card);
+@@ -1002,7 +1002,7 @@
+ 	case PM_RESUME:  /* enter D0 */
+ 
+ 		if (card->power_state == SNDRV_CTL_POWER_D0){
+-			printk(__FUNCTION__ ": exiting eraly from resume\n");
++			printk("%s: exiting eraly from resume\n",__FUNCTION__);
+ 			return 0;
+ 		}
+ 		snd_power_lock(card);
+@@ -1020,7 +1020,7 @@
+ 
+ 		break;
+ 	}
+-	printk(KERN_DEBUG __FUNCTION__": exiting...\n");	
++	printk(KERN_DEBUG "%s: exiting...\n",__FUNCTION__);	
+         return 0;
+ 	
+ }
diff --git a/packages/alsa/alsa-driver_0.9.6-hh4c.bb b/packages/alsa/alsa-driver_0.9.6-hh4c.bb
index bf307d13e2..deb4ee4505 100644
--- a/packages/alsa/alsa-driver_0.9.6-hh4c.bb
+++ b/packages/alsa/alsa-driver_0.9.6-hh4c.bb
@@ -1,32 +1,28 @@
 DESCRIPTION = "Alsa Drivers"
 MAINTAINER = "Pigi"
-SECTION = "console/utils"
+SECTION = "base"
 LICENSE = "GPL"
-#DEPENDS = "alsa-lib"
-
+PR = "r4"
 
 SRC_URI = "ftp://ftp.handhelds.org/packages/alsa-driver/alsa-driver-${PV}.tar.gz \
 	file://sound.p.patch;patch=1 \
 	file://h5400.patch;patch=1 \
-	file://adriver.h.patch;patch=1 "
+	file://sa11xx.patch;patch=1 \
+	file://adriver.h.patch;patch=1"
 
-#inherit autotools
-#inherit module
+inherit autotools module
 
-#EXTRA_OECONF = "  --with-isapnp=no "
-EXTRA_OECONF=" --with-sequencer=no --with-isapnp=no --with-oss=yes  --with-cards=${cards} --with-kernel=${STAGING_KERNEL_DIR} --with-kernel-version=${KERNEL_VERSION} --host=arm-linux"
-#EXTRA_OECONF = " /ext/ambient/tmp/work/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4-r5/kernel/ "
+EXTRA_OECONF=" --with-sequencer=no \
+	--with-isapnp=no \
+	--with-oss=yes \
+	--with-kernel=${STAGING_KERNEL_DIR} \
+	--with-kernel-version=${KERNEL_VERSION}"
 
+FILES_${PN} = "/lib/modules/*/misc/snd* \
+	${sysconfdir}/modutils/*"
 
 do_configure() {
 
-VERS=`grep "^VERSION =" ${STAGING_KERNEL_DIR}/Makefile | awk '{print $3}'`
-PATLEV=`grep "^PATCHLEVEL =" ${STAGING_KERNEL_DIR}/Makefile | awk '{print $3}'`
-SBLEV=`grep "^SUBLEVEL =" ${STAGING_KERNEL_DIR}/Makefile | awk '{print $3}'`
-EXVER=`grep "^EXTRAVERSION =" ${STAGING_KERNEL_DIR}/Makefile | awk '{print $3}'`
-
-KERNEL_VERSION=$VERS.$PATLEV.$SBLEV$EXVER
-
 cards=
 if egrep "CONFIG_SA1100_H3[168]00=y" "${STAGING_KERNEL_DIR}/.config" ; then
   cards="$cards,sa11xx-uda1341"
@@ -38,13 +34,10 @@ if grep "CONFIG_ARCH_H3900=y" "${STAGING_KERNEL_DIR}/.config" ; then
 fi
 cards="$cards,bluez-sco,pdaudiocf"
 
-   configure ${EXTRA_OECONF}
-   #./config.ipaq ${STAGING_KERNEL_DIR}
-
+   oe_runconf --with-cards=${cards}
 }
 
 
-
 do_install() {
 
 if egrep "CONFIG_SA1100_H3[168]00=y" "${STAGING_KERNEL_DIR}/.config" ; then
@@ -63,13 +56,10 @@ extra_modules="snd-gus-synth.o snd-emu8000-synth.o snd-emux-synth.o \
         do rm -f ${D}/lib/modules/*/misc/$i; 
       done
 
-      if [ -d ${D}/${sysconfdir}/modutils/ ] ; then 
-         rm -r ${D}/${sysconfdir}/modutils/ ;
+      if [ -d ${D}${sysconfdir}/modutils/ ] ; then 
+         rm -r ${D}${sysconfdir}/modutils/ ;
       fi
-      mkdir ${D}/${sysconfdir}/modutils/
-      cp familiar/alsa-modules-${familiar_arch} ${D}/${sysconfdir}/modutils/
+      mkdir -p ${D}${sysconfdir}/modutils/
+      cp familiar/alsa-modules-${familiar_arch} ${D}${sysconfdir}/modutils/
 }
 
-#FILES_alsa-driver = "/lib/modules/${KERNEL_VERSION}/misc/snd* /${sysconfdir}/init.d/ /${sysconfdir}"
-FILES_${PN} = "/lib/modules/*/misc/snd* ${sysconfdir}/modutils/* "
-
diff --git a/packages/uicmoc/uicmoc3-native_3.3.2.bb b/packages/uicmoc/uicmoc3-native_3.3.2.bb
index 3871c80c04..271dd1fcd3 100644
--- a/packages/uicmoc/uicmoc3-native_3.3.2.bb
+++ b/packages/uicmoc/uicmoc3-native_3.3.2.bb
@@ -31,8 +31,8 @@ do_stage() {
 	install -d ${OE_QMAKE_INCDIR_QT}
 	install -d ${OE_QMAKE_LIBDIR_QT}
 
-	install -m 0755 bin/moc ${OE_QMAKE_UIC}
-	install -m 0755 bin/uic ${OE_QMAKE_MOC}
+	install -m 0755 bin/moc ${OE_QMAKE_MOC}
+	install -m 0755 bin/uic ${OE_QMAKE_UIC}
 	install -m 0655 lib/*.a ${OE_QMAKE_LIBDIR_QT}
 
 	for f in include/*.h
diff --git a/packages/uicmoc/uicmoc4-native-4.0.0/.mtn2git_empty b/packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uicmoc/uicmoc4-native-4.0.0/.mtn2git_empty
+++ b/packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty
diff --git a/packages/uicmoc/uicmoc4-native-4.0.0/fix-mkspecs.patch b/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch
index 491edde370..491edde370 100644
--- a/packages/uicmoc/uicmoc4-native-4.0.0/fix-mkspecs.patch
+++ b/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch
diff --git a/packages/uicmoc/uicmoc4-native_4.0.0.bb b/packages/uicmoc/uicmoc4-native_4.0.1.bb
index 7d986b20dd..399215c0eb 100644
--- a/packages/uicmoc/uicmoc4-native_4.0.0.bb
+++ b/packages/uicmoc/uicmoc4-native_4.0.1.bb
@@ -4,9 +4,9 @@ PRIORITY = "optional"
 LICENSE = "GPL QPL"
 PR = "r1"
 
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-desktop-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
            file://fix-mkspecs.patch;patch=1 "
-S = "${WORKDIR}/qt-x11-opensource-desktop-${PV}"
+S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
 
 inherit native