merge of d6fdb02a91d1c19b5e0e6c9c0e484f3e14b2ca77

     and fc7a16d864477c5d989f50430896d4cf6df31265

11 files changed, 98 insertions, 28 deletions

diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf
index ef601564b1..cef670b450 100644
--- a/conf/machine/zaurus-clamshell-2.4.conf
+++ b/conf/machine/zaurus-clamshell-2.4.conf
@@ -2,14 +2,23 @@ PREFERRED_PROVIDERS_append_c7x0  = " virtual/kernel:c7x0-kernels-2.4-embedix"
 PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x"
 PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x"
 
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel \
-pcmcia-cs apmd hostap-modules orinoco-modules sharp-sdmmc-support chkhinge \
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \
+pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin \
 hostap-utils prism3-firmware prism3-support"
 
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
-pcmcia-cs apm kernel-module-net-fd kernel-module-registers chkhinge \
+pcmcia-cs apm apmd ppp wireless-tools irda-utils console-tools \
 hostap-utils prism3-firmware prism3-support"
 
+# Spitz needs minimal bootstrap
+BOOTSTRAP_EXTRA_DEPENDS_spitz = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \
+pcmcia-cs apmd wireless-tools irda-utils wpa-supplicant-nossl lrzsz hostap-utils prism3-firmware prism3-support"
+BOOTSTRAP_EXTRA_RDEPENDS_spitz = "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
+pcmcia-cs apmd apm wireless-tools irda-utils hostap-utils prism3-firmware prism3-support"
+
+# Misc Modules
+BOOTSTRAP_EXTRA_RDEPENDS += kernel-module-net-fd kernel-module-registers
+
 # USB Client Modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbdcore kernel-module-usbdmonitor"
 
diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf
index 000808f695..3ce5924d04 100644
--- a/conf/machine/zaurus-clamshell-2.6.conf
+++ b/conf/machine/zaurus-clamshell-2.6.conf
@@ -5,10 +5,13 @@ PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils hostap-modules    orinoco-modules \
 pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin \
 hostap-utils prism3-firmware prism3-support"
+
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel        udev sysfsutils hostap-modules-cs orinoco-modules-cs \
 pcmcia-cs apm  ppp wireless-tools irda-utils udev-utils console-tools \
 hostap-utils prism3-firmware prism3-support"
 
+# Ethernet modules
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
 # NFS Modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
 # Crypto Modules
diff --git a/packages/gkdial/gkdial_1.8.1.bb b/packages/gkdial/gkdial_1.8.1.bb
index ac37080d11..6bd9d5131d 100644
--- a/packages/gkdial/gkdial_1.8.1.bb
+++ b/packages/gkdial/gkdial_1.8.1.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 SECTION = "gpe"
 PRIORITY = "optional"
 
-PR = "r2gpe1"
+PR = "r3gpe1"
 
 SRC_URI = "http://familiar.handhelds.org/source/v0.8.2/${PN}-${PV}.tar.gz \
            file://gkdial-pgpe.patch;patch=1 \
@@ -20,7 +20,7 @@ SRC_URI = "http://familiar.handhelds.org/source/v0.8.2/${PN}-${PV}.tar.gz \
 FILES_${PN} = "${sysconfdir}/chatscripts ${bindir} ${datadir}/pixmaps ${datadir}/applications"
 FILES_${PN} += " ${datadir}/gkdial ${datadir}/gkdial/glade ${sysconfdir}/gconf/schemas"
  
-CFLAGS_append = " -I${STAGING_KERNEL_DIR}/include"
+CFLAGS_append = " -I${STAGING_KERNEL_DIR}/include -D_GNU_SOURCE"
 LDFLAGS_append = " -Wl,--export-dynamic"
 
 do_install_append () {
diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-tosa
index 319fc1edfb..c7eba4a337 100644
--- a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-tosa
+++ b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-tosa
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-rc6-mm1
-# Wed Jun 15 22:40:11 2005
+# Linux kernel version: 2.6.12-mm1
+# Mon Jul  4 15:43:10 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -719,7 +719,7 @@ CONFIG_NET_PCMCIA=y
 # CONFIG_PCMCIA_3C589 is not set
 # CONFIG_PCMCIA_3C574 is not set
 # CONFIG_PCMCIA_FMVJ18X is not set
-CONFIG_PCMCIA_PCNET=y
+CONFIG_PCMCIA_PCNET=m
 # CONFIG_PCMCIA_NMCLAN is not set
 # CONFIG_PCMCIA_SMC91C92 is not set
 # CONFIG_PCMCIA_XIRC2PS is not set
@@ -908,10 +908,13 @@ CONFIG_I2C_PXA=y
 # Other I2C Chip support
 #
 # CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -983,11 +986,13 @@ CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 # CONFIG_FONT_8x16 is not set
 # CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
 # CONFIG_FONT_PEARL_8x8 is not set
 # CONFIG_FONT_ACORN_8x8 is not set
 # CONFIG_FONT_MINI_4x6 is not set
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
 
 #
 # Logo configuration
diff --git a/packages/maemo/gconf-osso/gconf-daemon-dbus-oe.sh b/packages/maemo/gconf-osso/gconf-daemon-dbus-oe.sh
new file mode 100644
index 0000000000..90dfdb7eb0
--- /dev/null
+++ b/packages/maemo/gconf-osso/gconf-daemon-dbus-oe.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# GConf daemon startup script for D-BUS activation
+if [ -x /usr/sbin/dsmetool ]; then
+  /usr/sbin/dsmetool -U messagebus -n -1 -t /usr/lib/gconf2/gconfd-2
+else
+  exec /usr/libexec/gconfd-2
+fi
diff --git a/packages/maemo/hildon-initscripts_0.8.14-1.bb b/packages/maemo/hildon-initscripts_0.8.14-1.bb
index dca8e571e9..7eedf32d09 100644
--- a/packages/maemo/hildon-initscripts_0.8.14-1.bb
+++ b/packages/maemo/hildon-initscripts_0.8.14-1.bb
@@ -1,8 +1,8 @@
-PR         = "r1"
+PR         = "r2"
 LICENSE    = "GPL"
 MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 
-DEPENDS = "gtk+-2.6.4-1.osso7 matchbox-wm dbus"
+DEPENDS = "gtk+-2.6.4-1.osso7 matchbox-wm dbus osso-esd"
 
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV}.tar.gz \
            file://hildon-initscripts-source.patch;patch=1;pnum=0"
@@ -10,4 +10,3 @@ SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/h/${PN}/${PN}_${PV
 S = "${WORKDIR}/hildon-initscripts-0.8.14"
 
 inherit autotools pkgconfig
-
diff --git a/packages/maemo/osso-core-config_200515.1.bb b/packages/maemo/osso-core-config_200515.1.bb
index 1010e91e8a..e82e5f092d 100644
--- a/packages/maemo/osso-core-config_200515.1.bb
+++ b/packages/maemo/osso-core-config_200515.1.bb
@@ -1,6 +1,6 @@
-LICENSE =	"unknown"
-MAINTAINER=	"Florian Boor <florian@kernelconcepts.de"
-PR 	= "r4"
+LICENSE    = "unknown"
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de"
+PR         = "r5"
 
 DEPENDS =	"base-passwd osso-af-startup"
 RDEPENDS =	"base-passwd osso-af-startup"
@@ -35,7 +35,15 @@ fi
 MAEMOUSER=user
 MAEMOHOME=/home/user
 
+addgroup "$MAEMOUSER"
 mkdir -p $MAEMOHOME/MyDocs || true
-chgrp "$MAEMOUSER" "$MAEMOHOME" 2>/dev/null || addgroup "$MAEMOUSER"
-adduser --system --home "$MAEMOHOME" --no-create-home --disabled-password --ingroup "$MAEMOUSER" "$MAEMOUSER" || chown -R "$MAEMOUSER"."$MAEMOUSER" "$MAEMOHOME" 2>/dev/null
+adduser --system --home "$MAEMOHOME" --no-create-home --disabled-password --ingroup "$MAEMOUSER" "$MAEMOUSER"
+chown -R "$MAEMOUSER"."$MAEMOUSER" "$MAEMOHOME" 2>/dev/null
+chgrp "$MAEMOUSER" "$MAEMOHOME" 2>/dev/null
+# set up some links to firmware and modules in initrd
+
+mkdir -p /lib/firmware
+ln -sf /mnt/initfs/lib/firmware/* /lib/firmware/
+rm -rf /lib/modules
+ln -s /mnt/initfs/lib/modules /lib/modules
 }
diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb
index 4144a6c284..6f8e886a22 100644
--- a/packages/meta/meta-maemo.bb
+++ b/packages/meta/meta-maemo.bb
@@ -1,6 +1,6 @@
 
-PR          = "r4"
-PACKAGES    = maemo-task-base maemo-task-apps maemo-task-libs-install
+PR          = "r6"
+PACKAGES    = maemo-task-base maemo-task-apps maemo-task-libs-install maemo-task-theme
 DESCRIPTION = "Meta-package for maemo environment"
 MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
 
@@ -28,21 +28,14 @@ RDEPENDS_maemo-task-libs-install := "${maemo-task-libs-install}"
 maemo-task-base = "\
     bluez-utils-dbus \
     matchbox \
-    xcursor-transparent-theme \
-    sdk-default-theme \
-    sdk-default-theme-config \
-    sdk-default-icons \
-    sapwood \
     shared-mime-info \
     rxvt-unicode \
     xst \
     xhost \
     xrdb \
-    ttf-bitstream-vera \
     libgtkstylus \
     detect-stylus \
     outo \
-    sapwood \
     hildon-initscripts \
     libosso \
     osso-af-utils \
@@ -50,7 +43,8 @@ maemo-task-base = "\
     osso-core-config \
     osso-gnome-vfs2 \
     osso-thumbnail \
-    xauth"
+    xauth \
+    esd"
 
 RDEPENDS_maemo-task-base := "gdk-pixbuf-loader-png \
 			   gdk-pixbuf-loader-xpm \
@@ -58,8 +52,26 @@ RDEPENDS_maemo-task-base := "gdk-pixbuf-loader-png \
 			   pango-module-basic-x \
 			   pango-module-basic-fc \
 			   ${maemo-task-base}"
+
 DEPENDS += " ${maemo-task-base}"
 
+
+maemo-task-theme = "\
+    xcursor-transparent-theme \
+    sdk-default-theme \
+    sdk-default-theme-config \
+    sdk-default-icons \
+    sapwood \
+    ttf-bitstream-vera \
+    sapwood \
+    osso-sounds"
+
+RDEPENDS_maemo-task-theme := "${maemo-task-theme}"
+
+DEPENDS += " ${maemo-task-theme}"
+
+
+
 maemo-task-apps = "\
     osso-gwobex \
     osso-gwconnect \
@@ -69,8 +81,10 @@ maemo-task-apps = "\
     hildon-navigator \
     hildon-control-panel \
     osso-application-installer \ 
+    osso-app-killer \
+    osso-screenshot-tool \
     gpe-todo-hildon \
-    gpe-contacts-maemo"
+    gpe-contacts-hildon"
 
 RDEPENDS_maemo-task-apps := "${maemo-task-apps}"
 DEPENDS += " ${maemo-task-apps}"
diff --git a/packages/tslib/tslib/nokia770/.mtn2git_empty b/packages/tslib/tslib/nokia770/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib/nokia770/.mtn2git_empty
diff --git a/packages/tslib/tslib/nokia770/ts.conf b/packages/tslib/tslib/nokia770/ts.conf
new file mode 100644
index 0000000000..1b0da937e8
--- /dev/null
+++ b/packages/tslib/tslib/nokia770/ts.conf
@@ -0,0 +1,25 @@
+# Uncomment if you wish to use the linux input layer event interface
+module_raw input
+
+# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
+# module_raw collie
+
+# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860
+# module_raw corgi
+
+# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface
+# module_raw ucb1x00
+
+# Uncomment if you're using an HP iPaq h3600 or similar
+# module_raw h3600
+
+# Uncomment if you're using a Hitachi Webpad
+# module_raw mk712
+
+# Uncomment if you're using an IBM Arctic II
+# module_raw arctic2
+
+module pthres pmin=1
+module variance delta=30
+module dejitter delta=100
+module linear
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index f83be14b44..b5d073c8e7 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library."
 PV = "0.0cvs${CVSDATE}"
-PR = "r19"
+PR = "r29"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 PACKAGE_ARCH_tslib-conf = "${MACHINE}"