merge of '16c96161b634d2e64b9a1b4ba0e3fff5ddf21bcb'

     and '843d33548c0e77469b4859dd4e3b8c77590cb762'

11 files changed, 61 insertions, 12 deletions

diff --git a/packages/gpephone/libmsgenabler2_svn.bb b/packages/gpephone/libmsgenabler2_svn.bb
index 4772b0c8e7..a294dc93b7 100644
--- a/packages/gpephone/libmsgenabler2_svn.bb
+++ b/packages/gpephone/libmsgenabler2_svn.bb
@@ -4,7 +4,7 @@ SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 dbus-glib librecord2 liblipsevent2 telepathy-mission-control libgsmd-lips"
 PV = "0.0+svnr-${SRCREV}"
-PR          = "r1"
+PR          = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -14,7 +14,9 @@ SRC_URI = "${GPEPHONE_SVN}"
 
 S = ${WORKDIR}/${PN}
 
-FILES_${PN} += "$(datadir)/libmsgenabler2"
+FILES_${PN} += "${datadir}/libmsgenabler2 ${libdir}/msg-providers/*.0"
+FILES_${PN}-dev += "${libdir}/msg-providers/*.so ${libdir}/msg-providers/*a"
+FILES_${PN}-dbg += "${libdir}/msg-providers/.debug"
 
 do_stage () {
 	autotools_stage_all
diff --git a/packages/gsm/files/stdint.patch b/packages/gsm/files/stdint.patch
new file mode 100644
index 0000000000..bafe54cd44
--- /dev/null
+++ b/packages/gsm/files/stdint.patch
@@ -0,0 +1,17 @@
+--- include/libtapi/tel_bas_types.h~	2008-01-16 12:48:19.000000000 +0100
++++ include/libtapi/tel_bas_types.h	2008-01-16 12:48:19.000000000 +0100
+@@ -27,13 +27,7 @@
+ /******************************************************************************
+  *  Type definitions
+  *****************************************************************************/
+-#ifndef _STDINT_H
+-typedef unsigned long  	uint32_t;
+-typedef unsigned short 	uint16_t;
+-typedef unsigned char  	uint8_t;
+-/* typedef	long  			int32_t; */
+-typedef unsigned int	size_t;
+-#endif
++#include <stdint.h>
+ 
+ 
+ typedef unsigned long  	tel_bool_t; 
diff --git a/packages/gsm/libgsmd-lips_svn.bb b/packages/gsm/libgsmd-lips_svn.bb
new file mode 100644
index 0000000000..c255245ff1
--- /dev/null
+++ b/packages/gsm/libgsmd-lips_svn.bb
@@ -0,0 +1,15 @@
+BASEPN = "gsmd-lips"
+CONFLICTNAME = "gsmd-devel gsmd"
+
+require gsmd.inc
+
+RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel libtapi libgsmd-dev"
+
+PV = "0.0+svnr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=gsm \
+           file://stdint.patch;patch=1;pnum=0 \
+           file://gsmd \
+           file://default"
+
diff --git a/packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb b/packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb
index 1194f71bb2..48211e54ca 100644
--- a/packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb
+++ b/packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_collie = "1"
@@ -86,13 +86,17 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
 # These patches are extracted from Pavel Machek's git tree
 # (diff against vanilla kernel)
 SRC_URI_append_collie = "\
-           ${DOSRC}/collie/mtd-sharp-flash-hack-r0.patch;patch=1 \
-           ${DOSRC}/collie/collie-r0.patch;patch=1 \
-           ${DOSRC}/collie/locomolcd-backlight-r0.patch;patch=1 \
-           ${DOSRC}/collie/ucb1x00-touch-audio-r0.patch;patch=1 \
-           file://collie-mcp-r1.patch;patch=1 \
-           ${DOSRC}/collie/sa1100-udc-r0.patch;patch=1 \
-#          ${DOSRC}/collie/collie-pm-r1.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/mtd-sharp-flash-hack-r3.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/mcp-sa11x0-r0.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/locomo-r0.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/locomo_spi-4.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/collie-kexec.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/sharpsl_pm-2.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/collie_pm-2.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/locomokeyb_suspendkey-2.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/ucb1x00_suspend.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/collie-ts.patch;patch=1 \
+       ${TKSRC}/${PN}_${PV}/pcmcia_suspend.patch;patch=1 \
 "
 
 SRC_URI_append_tosa = "\
diff --git a/packages/linux/linux-tornado-omap2/htctornado/defconfig b/packages/linux/linux-tornado-omap2/htctornado/defconfig
index 9be1116739..ec67393992 100644
--- a/packages/linux/linux-tornado-omap2/htctornado/defconfig
+++ b/packages/linux/linux-tornado-omap2/htctornado/defconfig
@@ -259,7 +259,10 @@ CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_PNP is not set
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
 # CONFIG_ARPD is not set
diff --git a/packages/linux/linux-tornado-omap2_2.6.16.16.bb b/packages/linux/linux-tornado-omap2_2.6.16.16.bb
index f76442401f..ccbb4cd867 100644
--- a/packages/linux/linux-tornado-omap2_2.6.16.16.bb
+++ b/packages/linux/linux-tornado-omap2_2.6.16.16.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Linux kernel for HTC Tornado/Typhoon/Hurricane phones."
 SECTION = "kernel"
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
 	   http://www.muru.com/linux/omap/patches/old/patch-2.6.16-omap2.bz2;patch=1 \
diff --git a/packages/meta/meta-toolchain-gpe-sbox.bb b/packages/meta/meta-toolchain-gpe-sbox.bb
index d32087b964..74ba03825f 100644
--- a/packages/meta/meta-toolchain-gpe-sbox.bb
+++ b/packages/meta/meta-toolchain-gpe-sbox.bb
@@ -9,3 +9,4 @@ TOOLCHAIN_TARGET_TASK = "\
 
 require meta-toolchain.bb
 
+SDK_SUFFIX = "toolchain-gpe-sbox"
\ No newline at end of file
diff --git a/packages/meta/meta-toolchain-gpe.bb b/packages/meta/meta-toolchain-gpe.bb
index f79ff31bb7..cad03d71a6 100644
--- a/packages/meta/meta-toolchain-gpe.bb
+++ b/packages/meta/meta-toolchain-gpe.bb
@@ -7,3 +7,4 @@ TOOLCHAIN_TARGET_TASK = "\
 
 require meta-toolchain.bb
 
+SDK_SUFFIX = "toolchain-gpe"
\ No newline at end of file
diff --git a/packages/meta/meta-toolchain-openmoko.bb b/packages/meta/meta-toolchain-openmoko.bb
index 90eff20259..b5e392ab1c 100644
--- a/packages/meta/meta-toolchain-openmoko.bb
+++ b/packages/meta/meta-toolchain-openmoko.bb
@@ -2,3 +2,4 @@ TOOLCHAIN_TARGET_TASK = "task-toolchain-openmoko-sdk"
 
 require meta-toolchain.bb
 
+SDK_SUFFIX = "toolchain-openmoko"
\ No newline at end of file
diff --git a/packages/meta/meta-toolchain-sbox.bb b/packages/meta/meta-toolchain-sbox.bb
index 6e31fd0d69..1283c599c6 100644
--- a/packages/meta/meta-toolchain-sbox.bb
+++ b/packages/meta/meta-toolchain-sbox.bb
@@ -4,3 +4,5 @@ TOOLCHAIN_TARGET_TASK = "\
 
 require meta-toolchain.bb
 
+SDK_SUFFIX = "toolchain-sbox"
+
diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index 91467e5140..fc029505c3 100644
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -1,12 +1,14 @@
 DESCRIPTION = "Meta package for building a installable toolchain"
 LICENSE = "MIT"
 DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
+PR = "r1"
 
 inherit sdk meta
 
 SDK_DIR = "${WORKDIR}/sdk"
 SDK_OUTPUT = "${SDK_DIR}/image"
 SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
+SDK_SUFFIX = "toolchain"
 
 FEED_ARCH ?= "${TARGET_ARCH}"
 
@@ -120,7 +122,7 @@ do_populate_sdk() {
 	# package it up
 	mkdir -p ${SDK_DEPLOY}
 	cd ${SDK_OUTPUT}
-	fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-toolchain.tar.bz2 .
+	fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-${SDK_SUFFIX}.tar.bz2 .
 }
 
 do_populate_sdk[nostamp] = "1"