merge of '388cd6753bc837f738cd188974a81f8d8e983881'

     and 'c052dd40dfd39a1d1849502d02aca39af920a465'

19 files changed, 176 insertions, 33 deletions

diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index 02957aebe9..d4da2c16d4 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
 RRECOMMENDS_alsa-state = "alsa-states"
 PV = "0.1.0"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = " \
   file://asoundrc \
@@ -28,6 +28,7 @@ SRC_URI_append_fic-gta01 = " \
 
 SRC_URI_append_fic-gta02 = "\
   file://stereoout.state \
+  file://gsmhandset.state \
   "
 
 inherit update-rc.d
diff --git a/packages/alsa/alsa-state/fic-gta02/asound.state b/packages/alsa/alsa-state/fic-gta02/asound.state
index 7a8405a16e..04e6f60da9 100644
--- a/packages/alsa/alsa-state/fic-gta02/asound.state
+++ b/packages/alsa/alsa-state/fic-gta02/asound.state
@@ -6,8 +6,8 @@ state.neo1973gta02 {
 		comment.range '0 - 255'
 		iface MIXER
 		name 'PCM Volume'
-		value.0 255
-		value.1 255
+		value.0 235
+		value.1 235
 	}
 	control.2 {
 		comment.access 'read write'
diff --git a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state
index 348b109d8d..cc0d32a7c7 100644
--- a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state
+++ b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state
@@ -6,8 +6,8 @@ state.neo1973gta02 {
 		comment.range '0 - 255'
 		iface MIXER
 		name 'PCM Volume'
-		value.0 255
-		value.1 255
+		value.0 235
+		value.1 235
 	}
 	control.2 {
 		comment.access 'read write'
diff --git a/packages/alsa/alsa-state/fic-gta02/stereoout.state b/packages/alsa/alsa-state/fic-gta02/stereoout.state
index 7a8405a16e..04e6f60da9 100644
--- a/packages/alsa/alsa-state/fic-gta02/stereoout.state
+++ b/packages/alsa/alsa-state/fic-gta02/stereoout.state
@@ -6,8 +6,8 @@ state.neo1973gta02 {
 		comment.range '0 - 255'
 		iface MIXER
 		name 'PCM Volume'
-		value.0 255
-		value.1 255
+		value.0 235
+		value.1 235
 	}
 	control.2 {
 		comment.access 'read write'
diff --git a/packages/freesmartphone/pyneog_svn.bb b/packages/freesmartphone/pyneog_svn.bb
index b640426497..389c7369e5 100644
--- a/packages/freesmartphone/pyneog_svn.bb
+++ b/packages/freesmartphone/pyneog_svn.bb
@@ -15,12 +15,12 @@ do_compile() {
 do_install() {
 	find . -name ".svn"|xargs rm -rf
 	install -d ${D}${datadir}/pyneog
-	for i in media *.py Xsession.d.zadje; do
+	for i in media *.py; do
 		cp -a $i ${D}${datadir}/pyneog/
 	done
 
 	install -d ${D}${sysconfdir}/X11/Xsession.d/
-	ln -sf ${datadir}/pyneog/Xsession.d.zadje ${D}${sysconfdir}/X11/Xsession.d/80zadje
+	install -m 0755 80pyneog ${D}${sysconfdir}/X11/Xsession.d/
 }
 
 FILES_${PN} = "${datadir} ${bindir} ${sysconfdir}"
diff --git a/packages/gcc/gcc-4.2.2/intermask-bigendian.patch b/packages/gcc/gcc-4.2.2/intermask-bigendian.patch
new file mode 100644
index 0000000000..fdff3d3d86
--- /dev/null
+++ b/packages/gcc/gcc-4.2.2/intermask-bigendian.patch
@@ -0,0 +1,24 @@
+--- gcc-4.2.0/gcc/config/arm/bpabi.h
++++ gcc-4.2.0/gcc/config/arm/bpabi.h
+@@ -33,9 +33,19 @@
+ #undef FPUTYPE_DEFAULT
+ #define FPUTYPE_DEFAULT FPUTYPE_VFP
+ 
++/*
++ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
++ * (big endian) configurations.
++ */
++#if TARGET_BIG_ENDIAN_DEFAULT
++#define TARGET_ENDIAN_DEFAULT MASK_BIG_END
++#else
++#define TARGET_ENDIAN_DEFAULT 0
++#endif
++
+ /* EABI targets should enable interworking by default.  */
+ #undef TARGET_DEFAULT
+-#define TARGET_DEFAULT MASK_INTERWORK
++#define TARGET_DEFAULT (MASK_INTERWORK | TARGET_ENDIAN_DEFAULT)
+ 
+ /* The ARM BPABI functions return a boolean; they use no special
+    calling convention.  */
+
diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index c461245ec5..def16597e0 100644
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r5"
+PR = "r6"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb
index 1cfd085b27..0a0e9cdd16 100644
--- a/packages/gcc/gcc_4.2.2.bb
+++ b/packages/gcc/gcc_4.2.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
 
 inherit autotools gettext
 
@@ -43,6 +43,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://gcc-4.0.2-e300c2c3.patch;patch=1 \
 	file://pr34130.patch;patch=1 \
 	file://fortran-static-linking.patch;patch=1 \
+	file://intermask-bigendian.patch;patch=1 \
 "
 
 SRC_URI_append_ep93xx = " \
diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd
index fadae76aee..31dbd34caf 100644
--- a/packages/gsm/files/gsmd
+++ b/packages/gsm/files/gsmd
@@ -20,7 +20,7 @@ case "$1" in
         [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
 
         echo -n "Starting GSM daemon: "
-        start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 &
+        start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS -d -l syslog
 
         if [ $? = 0 ]; then
             echo "gsmd."
diff --git a/packages/images/initramfs-bootmenu-image.bb b/packages/images/initramfs-bootmenu-image.bb
index 6a4974fa9d..dd4f4d8ef6 100644
--- a/packages/images/initramfs-bootmenu-image.bb
+++ b/packages/images/initramfs-bootmenu-image.bb
@@ -4,9 +4,12 @@
 IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu initramfs-module-check-modules initramfs-module-kexecboot"
 IMAGE_LINGUAS = ""
 
+
 # Remove any kernel-image that the kernel-module-* packages may have pulled in.
 PACKAGE_REMOVE = "kernel-image-* update-modules module-init-tools-depmod uclibc update-rc.d"
 ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \
                                 remove ${PACKAGE_REMOVE};"
 
+IMAGE_FSTYPES += " cpio.gz "
+
 inherit image
diff --git a/packages/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch b/packages/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch
new file mode 100644
index 0000000000..b52b3e309b
--- /dev/null
+++ b/packages/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch
@@ -0,0 +1,63 @@
+Index: klibc-1.5/usr/kinit/fstype/fstype.c
+===================================================================
+--- klibc-1.5.orig/usr/kinit/fstype/fstype.c	2008-02-28 00:48:35.319254938 +0100
++++ klibc-1.5/usr/kinit/fstype/fstype.c	2008-02-28 00:52:20.583257793 +0100
+@@ -20,7 +20,7 @@
+ #include <endian.h>
+ #include <netinet/in.h>
+ #include <sys/vfs.h>
+-
++#include <linux/types.h>
+ #define cpu_to_be32(x) __cpu_to_be32(x)	/* Needed by romfs_fs.h */
+ 
+ #include "romfs_fs.h"
+@@ -33,6 +33,12 @@
+ #include "lvm2_sb.h"
+ #include "iso9660_sb.h"
+ 
++#if __BYTE_ORDER == __BIG_ENDIAN
++#include <linux/byteorder/big_endian.h>
++#else
++#include <linux/byteorder/little_endian.h>
++#endif
++
+ /*
+  * Slightly cleaned up version of jfs_superblock to
+  * avoid pulling in other kernel header files.
+@@ -54,6 +60,27 @@
+ /* Swap needs the definition of block size */
+ #include "swap_fs.h"
+ 
++static int jffs2_image(const unsigned char *buf, unsigned long *blocks)
++{
++       // Very sloppy! ;-E
++       if (*buf == 0x85 && buf[1] == 0x19)
++               return 1;
++
++       return 0;
++}
++
++static int vfat_image(const unsigned char *buf, unsigned long *blocks)
++{
++        const struct romfs_super_block *sb =
++               (const struct romfs_super_block *)buf;
++       if (!strncmp(buf + 54, "FAT12   ", 8)
++           || !strncmp(buf + 54, "FAT16   ", 8)
++           || !strncmp(buf + 82, "FAT32   ", 8))
++               return 1;
++
++       return 0;
++}
++
+ static int gzip_image(const void *buf, unsigned long long *bytes)
+ {
+ 	const unsigned char *p = buf;
+@@ -277,6 +304,8 @@
+ 	{1, "ext3", ext3_image},
+ 	{1, "ext2", ext2_image},
+ 	{1, "minix", minix_image},
++	{0, "jffs2", jffs2_image},
++	{0, "vfat", vfat_image},
+ 	{8, "reiserfs", reiserfs_image},
+ 	{64, "reiserfs", reiserfs_image},
+ 	{32, "jfs", jfs_image},
diff --git a/packages/linux/linux-hackndev-2.6_git.bb b/packages/linux/linux-hackndev-2.6_git.bb
index 2d2a37f716..7fdf94f3ac 100644
--- a/packages/linux/linux-hackndev-2.6_git.bb
+++ b/packages/linux/linux-hackndev-2.6_git.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices."
 HOMEPAGE = "http://www.hackndev.com/"
 SECTION = "kernel"
 LICENSE = "GPL"
-PR = "r13"
+PR = "r14"
 
 COMPATIBLE_MACHINE = "(palmld|palmtc|palmtt3|palmtt5|palmtx|palmz31|palmz72|palmt650)"
 
-SRC_URI = "git://git.hackndev.com/git/linux-hnd;protocol=git \
+SRC_URI = "git://git.hackndev.com/linux-hnd;protocol=git \
 	   file://defconfig"
 
 SRC_URI_append_palmtx += "http://www.busybox.net/downloads/busybox-1.1.0.tar.bz2 \
diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb
index a9bf2f8e1e..55f601bcb7 100644
--- a/packages/mono/mono_1.2.5.1.bb
+++ b/packages/mono/mono_1.2.5.1.bb
@@ -14,7 +14,7 @@ EXTRA_OECONF += " --disable-mcs-build "
 do_install_prepend() {
 	install -d ${D}
 	pushd ${D}
-	tar -xzf ${STAGING_DATADIR}/mono-mcs/mono-mcs-${PV}.tar.gz
+	tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz
 	popd
 }
 
diff --git a/packages/ode/files/install.patch b/packages/ode/files/install.patch
new file mode 100644
index 0000000000..d63229f8ec
--- /dev/null
+++ b/packages/ode/files/install.patch
@@ -0,0 +1,22 @@
+Index: ode-0.9/Makefile.am
+===================================================================
+--- ode-0.9.orig/Makefile.am
++++ ode-0.9/Makefile.am
+@@ -25,13 +25,13 @@ dist-zip: ${PACKAGE}-${VERSION}.tar.gz
+ 
+ if USE_SONAME
+ install-exec-hook:
+-	ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
++	ln -sf ./@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+ 	$(libdir)/libode.so
+-	ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
++	ln -sf ./@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+ 	$(libdir)/@ODE_SONAME@
+-	ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
++	ln -sf ./@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+ 	$(libdir)/@ODE_SONAME@.@ODE_REVISION@
+-	/sbin/ldconfig
++	echo /sbin/ldconfig
+ else
+ install-exec-hook:
+ endif
diff --git a/packages/ode/ode_0.9.bb b/packages/ode/ode_0.9.bb
index 9055681a36..31eed3b884 100644
--- a/packages/ode/ode_0.9.bb
+++ b/packages/ode/ode_0.9.bb
@@ -5,26 +5,30 @@ LICENSE = "LGPL"
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-src-${PV}.zip \
-           file://config.h"
+           file://install.patch;patch=1"
 
-inherit autotools
+inherit autotools binconfig
 
-#do_configure() {
-#	touch configurator.exe
-#	chmod a+rx configurator.exe
-#	install -m 0644 ${WORKDIR}/config.h include/ode/
-#}
+EXTRA_OECONF = "--disable-demos --enable-soname"
 
-#do_compile() {
-#	oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}" RANLIB="${RANLIB}" AR="${AR} qf " ode-lib
-#}
+do_configure_append() {
+	echo "#define dInfinity DBL_MAX" >>include/ode/config.h
+}
 
-#do_stage() {
-#	install -d ${STAGING_INCDIR}/ode/
-#	install -m 0644 include/ode/*.h ${STAGING_INCDIR}/ode/
-#	oe_libinstall -C lib -a libode ${STAGING_LIBDIR}
-#}
+do_stage() {
+	oe_runmake install \
+		bindir=${STAGING_BINDIR_CROSS} \
+		libdir=${STAGING_LIBDIR} \
+		includedir=${STAGING_INCDIR} \
+		datadir=${STAGING_DATADIR}
+}
 
-#do_install() {
-#	:
-#}
+do_install() {
+	oe_runmake install \
+		bindir=${D}${bindir} \
+		libdir=${D}${libdir} \
+		includedir=${D}${incdir} \
+		datadir=${D}${datadir}
+}
+
+FILES_${PN} = "${libdir}/lib*.so*"
diff --git a/packages/python/python-pyode/.mtn2git_empty b/packages/python/python-pyode/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-pyode/.mtn2git_empty
diff --git a/packages/python/python-pyode/install.patch b/packages/python/python-pyode/install.patch
new file mode 100644
index 0000000000..6f230972c7
--- /dev/null
+++ b/packages/python/python-pyode/install.patch
@@ -0,0 +1,16 @@
+Index: PyODE-1.2.0/setup.py
+===================================================================
+--- PyODE-1.2.0.orig/setup.py
++++ PyODE-1.2.0/setup.py
+@@ -39,11 +39,6 @@ if sys.platform=="win32":
+ # Linux (and other) specific settings
+ ######################################################################
+ else:
+-
+-   for base in ["/usr", "/usr/local", "/opt/local"]:
+-      INC_DIRS += [os.path.join(base, "include")]
+-      LIB_DIRS += [os.path.join(base, "lib")]
+-
+    LIBS += ["ode", "stdc++"]
+ 
+ 
diff --git a/packages/vagalume/.mtn2git_empty b/packages/vagalume/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/vagalume/.mtn2git_empty
diff --git a/packages/vagalume/vagalume_0.5.1.bb b/packages/vagalume/vagalume_0.5.1.bb
new file mode 100644
index 0000000000..a2d5c5889a
--- /dev/null
+++ b/packages/vagalume/vagalume_0.5.1.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Last.fm client"
+AUTHOR = "agarcia@igalia.com"
+HOMEPAGE = "http://people.igalia.com/berto/"
+SECTION = "x11"
+DEPENDS = "gtk+"
+
+SRC_URI = "http://people.igalia.com/berto/files/vagalume/source/vagalume_0.5.1-1.tar.gz"
+
+inherit autotools