merge of '242a466ed405559b9394dbf1b3a8678ba25cf86f'

     and '728bbddd3caaaeb9c83d85b9eb213042e12070bb'

11 files changed, 75 insertions, 25 deletions

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/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
index 8c66521f30..02d696aa2e 100644
--- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
@@ -1,7 +1,7 @@
 SRC_URI = "file://30-bootmenu.sh"
-PR = "r11"
+PR = "r12"
 DESCRIPTION = "An initramfs module with UI for selection of boot device."
-RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs"
+RDEPENDS = "klibc-utils-fstype-static initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs"
 # For VFAT mounting.
 RRECOMMENDS = "kernel-module-nls-cp437 kernel-module-nls-iso8859-1"
 
diff --git a/packages/klibc/klibc-utils-fstype_1.1.1.bb b/packages/klibc/klibc-utils-fstype-static_1.1.1.bb
index 2bcc0f6085..2bcc0f6085 100644
--- a/packages/klibc/klibc-utils-fstype_1.1.1.bb
+++ b/packages/klibc/klibc-utils-fstype-static_1.1.1.bb
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/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc
index c6bb6bae69..3bd9f78ea2 100644
--- a/packages/linux/linux-handhelds-2.6.inc
+++ b/packages/linux/linux-handhelds-2.6.inc
@@ -67,12 +67,17 @@ do_compile_prepend() {
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
 	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_FILENAME}
-
+	tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib
+	
 	#reflash.ctl is required to reflash using bootldr
 	# format:
 	# name file md5sumfile destination
 	echo "${MACHINE}-kernel-${DATETIME} ${KERNEL_FILENAME} - kernel" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl
 	gen_haret_startup
+
+	if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" == "glibc" ]; then
+		cp ${DEPLOY_DIR_IMAGE}/${KERNEL_FILENAME} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-$(basename ${KERNEL_INITRAMFS_PATH} | awk -F. '{print $1}')-${PV}-${PR}-${MACHINE}.bin 
+	fi
 }   
    
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
index 8e3ab4d06d..066c17faed 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-PR = "r13"
+PR = "r14"
 
 DEFAULT_PREFERENCE = "-1"
 
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++"]
+ 
+