Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

25 files changed, 342 insertions, 84 deletions

diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 5cb20101a5..e3e21872b7 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1326,7 +1326,7 @@ PREFERRED_VERSION_net-snmp ?= "5.4.1"
 PREFERRED_VERSION_net-tools ?= "1.60"
 PREFERRED_VERSION_network-manager-applet ?= "0.6.5"
 PREFERRED_VERSION_network-suspend-scripts ?= "1.1"
-PREFERRED_VERSION_nfs-utils ?= "1.0.6"
+PREFERRED_VERSION_nfs-utils ?= "1.1.2"
 PREFERRED_VERSION_ngrep ?= "1.42"
 PREFERRED_VERSION_nis-all ?= "1.0"
 PREFERRED_VERSION_nkf ?= "2.07"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index d606b51f0f..5fe5936f57 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -42,7 +42,7 @@ SRCREV_pn-eds-dbus ?= "736"
 SRCREV_pn-eglibc ?= "8139"
 SRCREV_pn-eglibc-initial ?= "8139"
 SRCREV_pn-enlazar ?= "37"
-SRCREV_pn-essential-dialer ?= "60"
+SRCREV_pn-essential-dialer ?= "111"
 SRCREV_pn-exalt ?= "79"
 SRCREV_pn-exalt-daemon ?= "78"
 SRCREV_pn-exalt-module ?= "78"
@@ -88,7 +88,7 @@ SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
 SRCREV_pn-libeflvala ?= "788101c237133747ee330142b4900774dd282a7c"
-SRCREV_pn-libefso ?= "60"
+SRCREV_pn-libefso ?= "111"
 SRCREV_pn-libexalt ?= "78"
 SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
@@ -257,7 +257,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "39886"
+EFL_SRCREV ?= "39916"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
@@ -309,6 +309,7 @@ SRCREV_pn-edje-editor ?= "${EFL_SRCREV}"
 SRCREV_pn-edje-player ?= "${EFL_SRCREV}"
 SRCREV_pn-edje-viewer ?= "${EFL_SRCREV}"
 SRCREV_pn-elementary-alarm ?= "${EFL_SRCREV}"
+SRCREV_pn-elementary-sms ?= "${EFL_SRCREV}"
 SRCREV_pn-emphasis ?= "${EFL_SRCREV}"
 SRCREV_pn-ephoto ?= "${EFL_SRCREV}"
 SRCREV_pn-examine ?= "${EFL_SRCREV}"
@@ -326,3 +327,7 @@ SRCREV_pn-rage ?= "${EFL_SRCREV}"
 SRCREV_pn-illume ?= "${EFL_SRCREV}"
 SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}"
 SRCREV_pn-waker ?= "${EFL_SRCREV}"
+
+# Swisstelecom E stuff
+SRCREV_pn-libefso ?= "60"
+SRCREV_pn-essential-dialer ?= "60"
diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf
index 272c0dca1c..f81ade3d2e 100644
--- a/conf/machine/palmt650.conf
+++ b/conf/machine/palmt650.conf
@@ -12,6 +12,9 @@ GUI_MACHINE_CLASS = "bigscreen"
 
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-snd-pxa2xx-ac97 \
                            kernel-module-pxa27x-keyboard \
-                           kernel-module-wm97xx-ts"
+                           kernel-module-wm97xx-ts \
+			   "
+
+MACHINE_EXTRA_RDEPENDS += "palmt650-keyboard-modmap"
 
 module_autoload_g_ether = "g_ether"
diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb
index e61bce88d3..7eba8e29ed 100644
--- a/recipes/e17/e-wm_svn.bb
+++ b/recipes/e17/e-wm_svn.bb
@@ -64,6 +64,7 @@ PACKAGE_ARCH_${PN}-other = "all"
 PACKAGE_ARCH_${PN}-input-methods = "all"
 PACKAGE_ARCH_${PN}-sysactions = "all"
 
+#  file://${HOME}/C/svn/ssh+svn/e/trunk/e \
 SRC_URI = "\
   svn://svn.enlightenment.org/svn/e/trunk;module=e;proto=http \
   file://enlightenment_start.oe \
@@ -107,6 +108,7 @@ do_install_append() {
 
 FILES_${PN} = "\
   ${bindir}/* \
+  ${libdir}/enlightenment/utils/* \
   ${libdir}/enlightenment/modules/*/*.* \
   ${libdir}/enlightenment/modules/*/*/* \
   ${libdir}/enlightenment/preload/e_precache.so \
@@ -116,6 +118,7 @@ FILES_${PN} = "\
   ${datadir}/enlightenment/data/config/profile.cfg \
   ${datadir}/enlightenment/AUTHORS \
   ${datadir}/enlightenment/COPYING \
+  ${datadir}/xsessions/enlightenment.desktop \
   ${sysconfdir}/xdg \
 "
 FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default"
diff --git a/recipes/e17/elementary-sms_svn.bb b/recipes/e17/elementary-sms_svn.bb
new file mode 100644
index 0000000000..2f0eec3a85
--- /dev/null
+++ b/recipes/e17/elementary-sms_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "An Elementary based SMS app"
+LICENSE = "GPL"
+DEPENDS = "ecore edbus elementary libefso"
+SECTION = "x11"
+PV = "0.0.0+svnr${SRCREV}"
+PR = "r1"
+
+inherit e
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/TMP/st;module=elementary-sms;proto=http"
+S = "${WORKDIR}/elementary-sms"
+
+FILES_${PN} += "${bindir}/*"
+FILES_${PN} += "${datadir}/${PN}"
+FILES_${PN} += "${datadir}/icons/*"
+FILES_${PN} += "${datadir}/applications/*"
diff --git a/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch b/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch
new file mode 100644
index 0000000000..97679d6ff9
--- /dev/null
+++ b/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch
@@ -0,0 +1,11 @@
+--- e2fsprogs-1.38/lib/ext2fs/ismounted.c~	2005-06-06 06:05:22.000000000 +1000
++++ e2fsprogs-1.38/lib/ext2fs/ismounted.c	2009-04-03 15:07:35.000000000 +1100
+@@ -147,7 +147,7 @@
+ is_root:
+ #define TEST_FILE "/.ismount-test-file"		
+ 		*mount_flags |= EXT2_MF_ISROOT;
+-		fd = open(TEST_FILE, O_RDWR|O_CREAT);
++		fd = open(TEST_FILE, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
+ 		if (fd < 0) {
+ 			if (errno == EROFS)
+ 				*mount_flags |= EXT2_MF_READONLY;
diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
index 388c519d0c..af49b0d7dd 100644
--- a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
+++ b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
@@ -2,11 +2,12 @@ SECTION = "base"
 require e2fsprogs.inc
 inherit native
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1 \
 	    file://mkinstalldirs.patch;patch=1 \
-	   "
+            file://file-open-mode.patch;patch=1 \
+            "
 
 EXTRA_OECONF = ""
 
diff --git a/recipes/e2fsprogs/e2fsprogs_1.38.bb b/recipes/e2fsprogs/e2fsprogs_1.38.bb
index 5687556c78..8ec469a84a 100644
--- a/recipes/e2fsprogs/e2fsprogs_1.38.bb
+++ b/recipes/e2fsprogs/e2fsprogs_1.38.bb
@@ -1,10 +1,11 @@
 require e2fsprogs.inc
 
-PR = "r19"
+PR = "r20"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1 \
 	    file://mkinstalldirs.patch;patch=1 \
-	   "
+            file://file-open-mode.patch;patch=1 \
+           "
 
 TARGET_CC_ARCH += "${LDFLAGS}"
 
diff --git a/recipes/efl1/edje-native_svn.bb b/recipes/efl1/edje-native_svn.bb
index 238bfd00dc..e7650cd639 100644
--- a/recipes/efl1/edje-native_svn.bb
+++ b/recipes/efl1/edje-native_svn.bb
@@ -1,11 +1,11 @@
 require edje_${PV}.bb
 inherit native
-PR = "r1"
+PR = "r3"
 
 DEPENDS = "evas-native ecore-native eet-native embryo-native"
 
 do_configure_prepend() {
 	sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c
-	sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c
-	sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c
+	sed -i 's: cpp -I: /usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c
+	sed -i 's:\"gcc -I:\"/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c
 }
diff --git a/recipes/efl1/edje-sdk_svn.bb b/recipes/efl1/edje-sdk_svn.bb
index 2bd75a0672..1733380c0b 100644
--- a/recipes/efl1/edje-sdk_svn.bb
+++ b/recipes/efl1/edje-sdk_svn.bb
@@ -1,7 +1,7 @@
 require edje_svn.bb
 
 inherit sdk
-PR = "r1"
+PR = "r3"
 
 SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-sdk', '')}"
 DEPENDS = "evas-native ecore-native eet-native embryo-native"
diff --git a/recipes/efl1/edje_svn.bb b/recipes/efl1/edje_svn.bb
index 7cf257f62a..31d47e6fb8 100644
--- a/recipes/efl1/edje_svn.bb
+++ b/recipes/efl1/edje_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
 DEPENDS = "eet evas ecore embryo edje-native"
 LICENSE = "MIT BSD"
 PV = "0.5.0.050+svnr${SRCREV}"
-PR = "r1"
+PR = "r3"
 
 inherit efl
 
@@ -17,7 +17,6 @@ RRECOMMENDS_${PN}-utils = "\
   libevas-saver-png \
   libevas-saver-jpeg \
   libevas-saver-eet \
-  libevas-saver-tiff \
 "
 
 DEBIAN_NOAUTONAME_${PN}-utils = "1"
diff --git a/recipes/efl1/elementary_svn.bb b/recipes/efl1/elementary_svn.bb
index 82a099f00d..13ca29543d 100644
--- a/recipes/efl1/elementary_svn.bb
+++ b/recipes/efl1/elementary_svn.bb
@@ -31,3 +31,7 @@ FILES_${PN}-tests = "\
   ${datadir}/applications/* \
   ${datadir}/icons/* \
 "
+
+EXTRA_OECONF = "\
+  --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+"
diff --git a/recipes/efl1/evas-native_svn.bb b/recipes/efl1/evas-native_svn.bb
index dbd03f5257..56723ca9ab 100644
--- a/recipes/efl1/evas-native_svn.bb
+++ b/recipes/efl1/evas-native_svn.bb
@@ -1,7 +1,7 @@
 require evas.inc
 inherit native
 DEPENDS = "freetype-native libpng-native jpeg-native eet-native eina-native"
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
diff --git a/recipes/efl1/evas.inc b/recipes/efl1/evas.inc
index ff7a184fb2..0fb01f31a7 100644
--- a/recipes/efl1/evas.inc
+++ b/recipes/efl1/evas.inc
@@ -3,6 +3,7 @@ LICENSE = "MIT BSD"
 # can also depend on valgrind, libsdl-x11, directfb
 DEPENDS = "eina eet freetype jpeg libpng virtual/libx11 libxext libxrender fontconfig"
 PV = "0.9.9.050+svnr${SRCREV}"
+PR = "r1"
 
 
 # disable thumb mode for arm
diff --git a/recipes/glibc/glibc_2.6.1.bb b/recipes/glibc/glibc_2.6.1.bb
index ab343ea0a6..c1a95987bf 100644
--- a/recipes/glibc/glibc_2.6.1.bb
+++ b/recipes/glibc/glibc_2.6.1.bb
@@ -41,7 +41,6 @@ SRC_URI = "\
   file://arm-longlong.patch;patch=1 \
   file://fhs-linux-paths.patch;patch=1 \
   file://dl-cache-libcmp.patch;patch=1 \
-  file://ldsocache-varrun.patch;patch=1 \
   file://nptl-crosscompile.patch;patch=1 \
   file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1;pnum=0 \
   file://glibc-check_pf.patch;patch=1;pnum=0 \
@@ -61,6 +60,8 @@ SRC_URI = "\
   file://march-i686.patch;patch=1;pnum=0 \
 "
 
+#  file://ldsocache-varrun.patch;patch=1 \
+
 # Build fails on sh3 and sh4 without additional patches
 SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
 SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"
diff --git a/recipes/images/illume-image.bb b/recipes/images/illume-image.bb
index 857d5b080f..9c2b1befed 100644
--- a/recipes/images/illume-image.bb
+++ b/recipes/images/illume-image.bb
@@ -11,12 +11,15 @@ BASE_INSTALL = "\
   task-base \
   netbase \
   sysfsutils \
+  wireless-tools \
   modutils-initscripts \
   module-init-tools-depmod \
+  pointercal \
+  tslib-conf \
 #  prelink \
-  exquisite \
-  exquisite-themes \
-  exquisite-theme-illume \
+#  exquisite \
+#  exquisite-themes \
+#  exquisite-theme-illume \
 #  rsync \
 #  screen \
 #  fbset \
@@ -29,8 +32,13 @@ XSERVER ?= "xserver-kdrive-fbdev"
 
 # getting an X window system up
 X_INSTALL = "\
+  libx11-locale \
+  localedef \
   glibc-charmap-utf-8 \
+  shared-mime-info \
+  mime-support \
   e-wm \
+  e-wm-sysactions \
   e-wm-config-illume \
   e-wm-config-standard \
   e-wm-config-netbook \
@@ -49,26 +57,31 @@ X_INSTALL = "\
   \
   ttf-dejavu-common \
   ttf-dejavu-sans \
-#  ttf-dejavu-serif \
+  ttf-dejavu-serif \
   ttf-dejavu-sans-mono \
   ttf-arphic-uming \
-  \
+"
+DEV_INSTALL = "\
+  task-native-sdk \
+  e-wm-dev \
+  task-proper-tools \
+  ntpdate \
+  nfs-utils-client \
+  gdb \
+  pkgconfig \
+  ltrace \
+  perl-module-file-path \
 "
 
 # useful command line tools
 TOOLS_INSTALL = "\
-#  bash \
   dosfstools \
-#  iptables \
   lsof \
   mickeydbus \
-  mickeyterm \
   mtd-utils \
   nano \
   powertop \
-  s3c24xx-gpio \
   sysstat \
-#  tcpdump \
 "
 
 # audio
@@ -85,30 +98,31 @@ AUDIO_INSTALL = "\
 "
 
 GTK_INSTALL = "\
-#  openmoko-calculator2 \
   vala-terminal \
-#  gpe-scap \
-#  tangogps \
-"
-
-GAMES_INSTALL = "\
-#  numptyphysics \
+  gpe-scap \
 "
 
 # FIXME these should rather be part of alsa-state,
 # once Om stabilizes them...
-AUDIO_INSTALL_append_om-gta01 = "\
-  openmoko-alsa-scenarios \
-"
-AUDIO_INSTALL_append_om-gta02 = "\
-  openmoko-alsa-scenarios \
-"
+AUDIO_INSTALL_append_om-gta01 = "openmoko-alsa-scenarios"
+AUDIO_INSTALL_append_om-gta02 = "openmoko-alsa-scenarios"
+
+# GLES libs - put them on if the platform has them
+GLES_INSTALL = ""
+GLES_INSTALL_append_beagleboard  = "libgles-omap3 devmem2"
+GLES_INSTALL_append_omap-3430sdp = "libgles-omap3"
+GLES_INSTALL_append_omap-3430ldp = "libgles-omap3"
+GLES_INSTALL_append_omap3evm     = "libgles-omap3"
+#GLES_INSTALL_append_overo        = "libgles-omap3"
+GLES_INSTALL_append_mx31ads      = "libgles-mx31"
+GLES_INSTALL_append_mx31litekit  = "libgles-mx31"
+GLES_INSTALL_append_zylonite     = "libgles-zylonite"
 
 # python
 PYTHON_INSTALL = "\
-  task-python-efl \
-  python-codecs \
-  python-gst \
+#  task-python-efl \
+#  python-codecs \
+#  python-gst \
 "
 
 # zhone
@@ -116,35 +130,30 @@ ZHONE_INSTALL = "\
   fso-gsm0710muxd \
   frameworkd \
   fso-gpsd \
-#  zhone \
+  zhone \
 "
 
 # additional apps
 APPS_INSTALL = "\
-#  tichy \
-#  gpe-gallery \
-#  gpe-sketchbook \
-#  gpe-filemanager \
-#  vagalume \
-#  starling \
-   rxvt-unicode \
-   gpe-terminal \
    elementary-alarm \
-   gpe-scap \
+   expedite \
+   expedite-themes \
    libefso \
    essential-dialer \
+   elementary-sms \
 "
 
 IMAGE_INSTALL = "\
   ${BASE_INSTALL} \
+  ${GLES_INSTALL} \
   ${X_INSTALL} \
   ${GTK_INSTALL} \
-  ${GAMES_INSTALL} \
   ${AUDIO_INSTALL} \
   ${TOOLS_INSTALL} \
   ${PYTHON_INSTALL} \
-  ${ZHONE_INSTALL} \
+#  ${ZHONE_INSTALL} \
   ${APPS_INSTALL} \
+  ${DEV_INSTALL} \
 "
 inherit image
 
@@ -156,7 +165,6 @@ fso_rootfs_postprocess() {
     date "+%m%d%H%M%Y" >./etc/timestamp
     # alias foo
     echo "alias pico=nano" >>./etc/profile
-#    echo "alias fso='cd /local/pkg/fso'" >>./etc/profile
     echo "alias ipkg='opkg'" >>./etc/profile
     # dns
     echo "nameserver 208.67.222.222" >>./etc/resolv.conf
diff --git a/recipes/palmt650/palmt650-keyboard-modmap.bb b/recipes/palmt650/palmt650-keyboard-modmap.bb
new file mode 100644
index 0000000000..c005136761
--- /dev/null
+++ b/recipes/palmt650/palmt650-keyboard-modmap.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "A X keyboard modifier mapping for the Treo650"
+LICENSE = "GPL"
+PV = "0.0.3"
+PR = "r0.02"
+
+SRC_URI = "\
+  file://60xXmodmap \
+  file://Xmodmap \
+"
+
+S = "${WORKDIR}"
+
+do_install() {
+  install -d ${D}/etc/X11/
+  install ${WORKDIR}/Xmodmap ${D}/etc/X11/Xmodmap
+  install -d ${D}/etc/X11/Xsession.d
+  install ${WORKDIR}/60xXmodmap ${D}/etc/X11/Xsession.d/60xXmodmap
+}
+
+PACKAGE_ARCH = "all"
+
+FILES_${PN} += "/etc/X11/Xmodmap"
+FILES_${PN} += "/etc/X11/Xsession.d/60xXmodmap"
diff --git a/recipes/palmt650/palmt650-keyboard-modmap/60xXmodmap b/recipes/palmt650/palmt650-keyboard-modmap/60xXmodmap
new file mode 100644
index 0000000000..db814a06a8
--- /dev/null
+++ b/recipes/palmt650/palmt650-keyboard-modmap/60xXmodmap
@@ -0,0 +1,8 @@
+# -*- sh -*-
+# Xsession.d script for Xmodmap
+#
+#
+# This file is sourced by Xsession(5), not executed.
+
+xmodmap /etc/X11/Xmodmap
+xmodmap -e 'remove Control = Mode_switch'
diff --git a/recipes/palmt650/palmt650-keyboard-modmap/Xmodmap b/recipes/palmt650/palmt650-keyboard-modmap/Xmodmap
new file mode 100644
index 0000000000..9086cd1a79
--- /dev/null
+++ b/recipes/palmt650/palmt650-keyboard-modmap/Xmodmap
@@ -0,0 +1,118 @@
+!!!!! get modifiers right
+remove Control = Mode_switch
+remove Control = Shift_R
+remove Shift = Menu
+remove Shift = Control_R
+! Alt key -> Alt_R
+keycode 108 = Alt_R
+! Shift(R) key -> Shift_R
+!keycode 105 = Shift_R
+!add Shift = Shift_R
+! hack - should be Control_R for terminal
+keycode 105 = Control_R
+add Control = Control_R
+! blue key -> Mode_switch
+keycode 37 = Mode_switch
+add mod5 = Mode_switch
+
+!!!!! top mute/unmute
+! keycode mute = has no keycode
+
+!!!!! side buttons
+keycode 123 = Prior
+keycode 122 = Next
+keycode 71 = End
+
+!!!!! top 2 buttons left/right and up from arrow key nav
+!! below - added hacked symbols: percent asciicircum
+keycode 69 = Home percent asciicircum
+!! below - added hacked symbols: percent asciicircum
+keycode 9 = Menu Delete Insert
+
+!!!!! arrowkeys
+keycode 111 = Up
+keycode 116 = Down
+keycode 113 = Left
+keycode 114 = Right
+keycode 104 = KP_Enter
+
+!!!!! answer, calendar, mail, hangup/power
+!!!! CHECKME
+!! below - added hacked symbols: Escape Print
+keycode 72 = F1 Escape Print
+!! below - added hacked symbols: equal semicolon
+keycode 67 = F2 equal semicolon
+!! below - added hacked symbols: bracketleft braceleft
+keycode 68 = F3 bracketleft braceleft
+!! below - added hacked symbols: bracketright braceright
+keycode 70 = F4 bracketright braceright
+
+!!!!! 1st row
+keycode 24 = q Q slash
+keycode 25 = w W plus
+keycode 26 = e E 1
+keycode 27 = r R 2
+keycode 28 = t T 3
+keycode 29 = y Y parenleft
+keycode 30 = u U parenright
+keycode 31 = i I at
+keycode 32 = o O quotedbl
+!! below - added hacked symbols: underscore
+keycode 33 = p P underscore
+!!!!! 2nd row
+keycode 38 = a A ampersand
+keycode 39 = s S minus
+keycode 40 = d D 4
+keycode 41 = f F 5
+keycode 42 = g G 6
+keycode 43 = h H dollar
+keycode 44 = j J exclam
+keycode 45 = k K colon
+keycode 46 = l L apostrophe
+!! below - added hacked symbols: backslash asciitilde
+keycode 22 = BackSpace backslash asciitilde
+!!!!! 3rd row
+keycode 37 = Mode_switch
+keycode 52 = z S asterisk
+keycode 53 = x D 7
+keycode 54 = c F 8
+keycode 55 = v G 9
+keycode 56 = b H numbersign
+keycode 57 = n J question
+keycode 58 = m K comma
+!! below - added hacked symbols: bar grave
+keycode 60 = period bar grave
+keycode 36 = Return
+!!!!! bottom row
+keycode 50 = Shift_L
+!! below - added hacked symbols: less greater
+keycode 19 = 0 less greater
+keycode 65 = space
+keycode 108 = Alt_R
+!! below - hacked to be Control_R instead of Shift_R
+keycode 105 = Control_R
+
+!!!!! missing standard key symbols:
+! % hacked
+! ^ hacked
+! _ hacked
+! = hacked
+! [ hacked
+! ] hacked
+! { hacked
+! } hacked
+! ; hacked
+! < hacked
+! > hacked
+! \ hacked
+! | hacked
+! ` hacked
+! ~ hacked
+! Escape hacked
+! Delete hacked
+! Insert hacked
+! Print hacked
+! Pause
+! Caps_Lock
+! Num_Lock
+! Sroll_Lock
diff --git a/recipes/pointercal/files/palmt650/pointercal b/recipes/pointercal/files/palmt650/pointercal
new file mode 100644
index 0000000000..76070aea27
--- /dev/null
+++ b/recipes/pointercal/files/palmt650/pointercal
@@ -0,0 +1 @@
+6542 -110 -2499320 6 -6625 24172268 65536
diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate b/recipes/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate
index 8e6a8b22cb..70786908b6 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ]
+while [ ! -z $TSLIB_TSDEVICE ] && [ -f $TSLIB_TSDEVICE] && [ ! -f /etc/pointercal ]
 do
    /usr/bin/xtscal
 done
diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver
index 76a09b51dc..f6f5943847 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver
@@ -41,7 +41,8 @@ export USER=root
 
 SCREEN_SIZE=`fallback_screen_arg`
 
-ARGS=" -br -pn"
+ARGS=" -pn"
+PPM=" -br"
 
 # use ucb 1x00 touchscreen if present
 if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
@@ -104,18 +105,30 @@ case `module_id` in
                 ARGS="$ARGS -fb /dev/fb1" ;;
         "GTA01")
                 if [ `screen_width` -gt 330 ] ; then
+                     if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then
+                          PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm"
+                     fi
                      DPI=285
                 else
-                     DPI=140
+                     if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then
+                          PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm"
+                     fi
+                     DPI=142
                 fi 
-                ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib" ;;
+                ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" ;;
        "GTA02")
                 if [ `screen_width` -gt 330 ] ; then
+                     if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then
+                          PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm"
+                     fi
                      DPI=285
                 else 
-                     DPI=140
+                     if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then
+                          PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm"
+                     fi
+                     DPI=142
                 fi 
-                ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib" 
+                ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" 
 		XSERVER=/usr/bin/Xglamo 
 		;;
 	"Nokia N770")
@@ -125,14 +138,28 @@ case `module_id` in
                 ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" 
                 XSERVER=/usr/bin/Xomap ;;
 	"Palm Treo 650")
-		ARGS="$ARGS -dpi 181 -screen 320x320 -hide-cursor" ;;
+                if [ -f "/usr/share/pixmaps/xsplash-qvga-square.ppm" ]; then
+                     PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga-square.ppm"
+                fi
+                ARGS="$ARGS -dpi 181 -screen 320x320 -mouse tslib -hide-cursor ${PPM}" ;;
         "Motorola Ezx Platform")
+                if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then
+                     PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm ${PPM}"
+                fi
                 ARGS="$ARGS -dpi 170 -screen ${SCREEN_SIZE}" ;;
 	"Glofiish M800")
-                ARGS="$ARGS -dpi 285 -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor" ;;
+                if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then
+                     PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm"
+                fi
+                ARGS="$ARGS -dpi 285 -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" ;;
         "Freescale MX21ADS")
 	# That's what /proc/cpuinfo shows as hardware on the chumby
                  ARGS="$ARGS -dpi 121 -screen 320x240 -hide-cursor -mouse tslib" ;;
+        "OMAP3 Beagle Board")
+                 ARGS="$ARGS ${PPM}"
+# 32bpp - we'll enable it once newer kernels are.. working.                 
+#                 ARGS="$ARGS -fbbpp32"
+                 XSERVER=/usr/bin/Xorg ;;
         *)
                 # It is a device we do not know about, in which case we force
                 # kdrive to use the current framebuffer geometry -- otherwise
diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver b/recipes/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
index 7c70b2f82f..3ad9747dab 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
@@ -40,8 +40,8 @@ module_id() {
 export USER=root
 
 SCREEN_SIZE=`fallback_screen_arg`
-
-ARGS=" -br -pn"
+PPM="-br"
+ARGS=" -pn"
 
 # use ucb 1x00 touchscreen if present
 if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
@@ -102,18 +102,30 @@ case `module_id` in
                 ARGS="$ARGS -fb /dev/fb1" ;;
         "GTA01")
                 if [ `screen_width` -gt 330 ] ; then
+                     if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then
+                          PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm"
+                     fi
                      DPI=285
                 else
+                     if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then
+                          PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm"
+                     fi
                      DPI=140
                 fi 
-                ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor -root-ppm /usr/share/pixmaps/xsplash-vga.ppm vt1" ;;
+                ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" ;;
        "GTA02")
                 if [ `screen_width` -gt 330 ] ; then
+                     if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then
+                          PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm"
+                     fi
                      DPI=285
                 else 
+                     if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then
+                          PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm"
+                     fi
                      DPI=140
                 fi 
-                ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor -root-ppm /usr/share/pixmaps/xsplash-vga.ppm vt1" 
+                ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1"
 		XSERVER=/usr/bin/Xglamo 
 		;;
 	"Nokia N770")
@@ -123,18 +135,31 @@ case `module_id` in
                 ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" 
                 XSERVER=/usr/bin/Xomap ;;
         "Palm Treo 650")
-	        if [ -f "/usr/share/pixmaps/xsplash-qvga-square.ppm" ]; then
-		  PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga-square.ppm"
-		fi
-                ARGS="$ARGS -dpi 181 -screen 320x320 -hide-cursor $PPM" ;;
+                if [ -f "/usr/share/pixmaps/xsplash-qvga-square.ppm" ]; then
+                     PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga-square.ppm"
+                fi
+                ARGS="$ARGS -dpi 181 -screen 320x320 -hide-cursor ${PPM}" ;;
         "Motorola Ezx Platform")
-                ARGS="$ARGS -dpi 170 -screen ${SCREEN_SIZE} -hide-cursor -mouse tslib -root-ppm /usr/share/pixmaps/xsplash-qvga.ppm vt1" ;;
+                if [ -f "/usr/share/pixmaps/xsplash-qvga.ppm" ]; then
+                     PPM="-root-ppm /usr/share/pixmaps/xsplash-qvga.ppm"
+                fi
+                ARGS="$ARGS -dpi 170 -screen ${SCREEN_SIZE} -hide-cursor -mouse tslib ${PPM} vt1" ;;
         "Glofiish M800")
-                ARGS="$ARGS -dpi 285 -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor -root-ppm /usr/share/pixmaps/xsplash-vga.ppm vt1" ;;
+                if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then
+                     PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm"
+                fi
+                ARGS="$ARGS -dpi 285 -screen ${SCREEN_SIZE} -mouse tslib -hide-cursor ${PPM} vt1" ;;
         "Freescale MX21ADS")
          # That's what /proc/cpuinfo shows as hardware on the chumby
-                ARGS="$ARGS -dpi 121 -screen 320x240 -hide-cursor -mouse tslib -root-ppm /usr/share/pixmaps/xsplash-qvga.ppm vt1" ;;
-
+                if [ -f "/usr/share/pixmaps/xsplash-vga.ppm" ]; then
+                     PPM="-root-ppm /usr/share/pixmaps/xsplash-vga.ppm"
+                fi
+                ARGS="$ARGS -dpi 121 -screen 320x240 -hide-cursor -mouse tslib ${PPM} vt1" ;;
+        "OMAP3 Beagle Board")
+                ARGS="$ARGS -br"
+# 32bpp - we'll enable it once newer kernels are.. working.
+#                 ARGS="$ARGS -fbbpp32"
+                XSERVER=/usr/bin/Xorg ;;
         *)
                 # It is a device we do not know about, in which case we force
                 # kdrive to use the current framebuffer geometry -- otherwise
diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index 9667c479f6..6b585c44e0 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
-PR = "r34"
+PR = "r36"
 
 SRC_URI = "\
   file://Xdefaults \
diff --git a/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
index 28ba65cd52..1f0fa47be6 100755
--- a/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
+++ b/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
@@ -19,13 +19,16 @@ done
 
 case "$1" in
   start)
-        . /etc/profile
-        [ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
-        [ -z $HOME ] && export HOME=/home/$LOGNAME
-
-
-        echo "Starting Xserver"
-        /etc/X11/Xserver &
+    # We don't want this script to block the rest of the boot process
+    if [ "$2" != "background" ]; then
+      $0 $1 background &
+    else
+       . /etc/profile
+       [ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
+       [ -z $HOME ] && export HOME=/home/$LOGNAME
+       echo "Starting Xserver"
+       /etc/X11/Xserver &
+    fi 
   ;;
 
   stop)