Fri Oct 20 16:43:05 CEST 2006

Author: mickey
Date: 2006-10-20 14:43:03 +0000 (Fri, 20 Oct 2006)
New Revision: 93

Added:
   trunk/oe/packages/openmoko/
   trunk/oe/packages/openmoko/openmoko-common/
   trunk/oe/packages/openmoko/openmoko-common/pixmaps/
   trunk/oe/packages/openmoko/openmoko-common/pixmaps/openmoko-footer-background.png
   trunk/oe/packages/openmoko/openmoko-common/pixmaps/openmoko-header-background.png
   trunk/oe/packages/openmoko/openmoko-session/
   trunk/oe/packages/openmoko/openmoko-session/etc/
   trunk/oe/packages/openmoko/openmoko-session/etc/matchbox/
   trunk/oe/packages/openmoko/openmoko-session/etc/matchbox/session
   trunk/oe/packages/openmoko/openmoko-session_0.1.bb
   trunk/oe/packages/xserver-kdrive-common/
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager
   trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
   trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init.bb
   trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init/
   trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
Modified:
   trunk/oe/conf/distro/openmoko-gcc3.conf
   trunk/oe/conf/distro/openmoko.conf
   trunk/oe/packages/tasks/task-openmoko.bb
Log:
add openmoko-common, customize openmoko-session, add xserver-kdrive-common (from Poky)


Modified: trunk/oe/conf/distro/openmoko-gcc3.conf
===================================================================

--- trunk/oe/conf/distro/openmoko-gcc3.conf	2006-10-19 11:34:32 UTC (rev 92)
+++ trunk/oe/conf/distro/openmoko-gcc3.conf	2006-10-20 14:43:03 UTC (rev 93)
@@ -8,33 +8,12 @@
 # Header
 #
 DISTRO_NAME = "OpenMoKo"
-DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
+DISTRO_VERSION = ".dev-snapshot-${DATE}-gcc3"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
 
-#
-# Naming schemes
-#
-PARALLEL_INSTALL_MODULES = "1"
-INHERIT += "debian multimachine"
+require conf/distro/include/openmoko.inc
 
-#
-# Packaging and output format
-#
-INHERIT += "package_ipk"
-IMAGE_FSTYPES = "tar.gz ext2.gz jffs2"
-IMAGE_FSTYPES_x86 = "tar.gz"
-
-#
-# Binutils & Compiler
-#
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
 
 # Toolchain
@@ -46,64 +25,3 @@
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
 PREFERRED_VERSION_glibc ?= "2.4"
 PREFERRED_VERSION_glibc-intermediate ?= "2.4"
-
-#
-# Target OS & FPU system
-# 
-TARGET_OS = "linux"
-TARGET_FPU_arm = "soft"
-TARGET_FPU_armeb = "soft"
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
-#
-# Features
-#
-DISTRO_FEATURES = "alsa bluetooth ext2 ipsec nfs ppp smbfs usbgadget"
-
-#
-# Bootstrap & Init
-#
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-require conf/distro/include/sane-srcdates.inc
-
-#
-# Framebuffer & X
-#
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11"
-PREFERRED_PROVIDER_virtual/evas ?= "evas-x11"
-PREFERRED_PROVIDER_virtual/esmart ?= "esmart-x11"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-# PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}"
-require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
-
-#
-# Core System
-#
-PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
-PREFERRED_PROVIDER_gconf = "gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs-dbus"
-PREFERRED_PROVIDER_bluez-utils = "bluez-utils-dbus"
-PREFERRED_VERSION_qemu-native = "0.8.2"
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QTE = "yes"
-require conf/distro/include/preferred-opie-versions.inc
-
-#
-# Enlightenment
-#
-require conf/distro/include/preferred-e-versions.inc
-
-#
-# Versions for OpenMoko
-#
-require conf/distro/include/preferred-openmoko-versions.inc
-

Modified: trunk/oe/conf/distro/openmoko.conf
===================================================================
--- trunk/oe/conf/distro/openmoko.conf	2006-10-19 11:34:32 UTC (rev 92)
+++ trunk/oe/conf/distro/openmoko.conf	2006-10-20 14:43:03 UTC (rev 93)
@@ -8,103 +8,19 @@
 # Header
 #
 DISTRO_NAME = "OpenMoKo"
-DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
+DISTRO_VERSION = ".dev-snapshot-${DATE}"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
 
-#
-# Naming schemes
-#
-PARALLEL_INSTALL_MODULES = "1"
-INHERIT += "debian multimachine"
+require conf/distro/include/openmoko.inc
 
-#
-# Packaging and output format
-#
-INHERIT += "package_ipk"
-IMAGE_FSTYPES = "tar.gz ext2.gz jffs2"
-IMAGE_FSTYPES_x86 = "tar.gz"
-
-#
-# Binutils & Compiler
-#
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-# EABI stuff
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-
 # Toolchain
 PREFERRED_VERSION_gcc ?= "4.1.1"
 PREFERRED_VERSION_gcc-cross ?= "4.1.1"
 PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
 # binutils 2.17 error out during kernel build (relocations in discarded sections)
-PREFERRED_VERSION_binutils ?= "2.17"
-PREFERRED_VERSION_binutils-cross ?= "2.17"
+PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
+PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
-PREFERRED_VERSION_glibc ?= "2.4"
-PREFERRED_VERSION_glibc-intermediate ?= "2.4"
-
-#
-# Target OS & FPU system
-# 
-TARGET_OS = "linux"
-TARGET_FPU_arm = "soft"
-TARGET_FPU_armeb = "soft"
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
-#
-# Features
-#
-DISTRO_FEATURES = "alsa bluetooth ext2 ipsec nfs ppp smbfs usbgadget"
-
-#
-# Bootstrap & Init
-#
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-require conf/distro/include/sane-srcdates.inc
-
-#
-# Framebuffer & X
-#
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11"
-PREFERRED_PROVIDER_virtual/evas ?= "evas-x11"
-PREFERRED_PROVIDER_virtual/esmart ?= "esmart-x11"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-# PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}"
-require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
-
-#
-# Core System
-#
-PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
-PREFERRED_PROVIDER_gconf = "gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs-dbus"
-PREFERRED_PROVIDER_bluez-utils = "bluez-utils-dbus"
-PREFERRED_VERSION_qemu-native = "0.8.2"
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QTE = "yes"
-require conf/distro/include/preferred-opie-versions.inc
-
-#
-# Enlightenment
-#
-require conf/distro/include/preferred-e-versions.inc
-
-#
-# Versions for OpenMoko
-#
-require conf/distro/include/preferred-openmoko-versions.inc
-
+PREFERRED_VERSION_glibc ?= "2.5"
+PREFERRED_VERSION_glibc-intermediate ?= "2.5"

Added: trunk/oe/packages/openmoko/openmoko-common/pixmaps/openmoko-footer-background.png
===================================================================
(Binary files differ)


Property changes on: trunk/oe/packages/openmoko/openmoko-common/pixmaps/openmoko-footer-background.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/oe/packages/openmoko/openmoko-common/pixmaps/openmoko-header-background.png
===================================================================
(Binary files differ)


Property changes on: trunk/oe/packages/openmoko/openmoko-common/pixmaps/openmoko-header-background.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/oe/packages/openmoko/openmoko-session/etc/matchbox/session
===================================================================
--- trunk/oe/packages/openmoko/openmoko-session/etc/matchbox/session	2006-10-19 11:34:32 UTC (rev 92)
+++ trunk/oe/packages/openmoko/openmoko-session/etc/matchbox/session	2006-10-20 14:43:03 UTC (rev 93)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+module_id() {
+    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+}
+
+SHOWCURSOR="no"
+
+## Start up machine specific input devices. Really needs to go in its own session
+case `module_id` in
+	# On Zaurus models, zaurusd takes care of mbinputmgr for us in its hinge scripts
+	"Generic OMAP1510/1610/1710")
+		/usr/bin/mbinputmgr &
+		;;
+        # qemu machines.. likely need better detection 
+	"ARM-IntegratorCP" | "ARM-Versatile PB")
+		/usr/bin/mbinputmgr &
+		SHOWCURSOR="yes"
+		;;
+esac
+
+## All this should be done by themeing/xsettings.. ## 
+matchbox-desktop --icon-size 48 \
+                 --icon-padding 64 \
+                 --font sans-8:bold \
+                 --titlefont sans-8:bold &
+
+mb-applet-startup-monitor &                 
+
+matchbox-panel --orientation east \
+               --padding 4 \
+               --no-menu \
+               --no-session \
+               --default-apps mb-applet-home,mb-applet-clock,mb-applet-battery &
+
+exec matchbox-window-manager -use_cursor $SHOWCURSOR $@
+


Property changes on: trunk/oe/packages/openmoko/openmoko-session/etc/matchbox/session
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/oe/packages/openmoko/openmoko-session_0.1.bb
===================================================================
--- trunk/oe/packages/openmoko/openmoko-session_0.1.bb	2006-10-19 11:34:32 UTC (rev 92)
+++ trunk/oe/packages/openmoko/openmoko-session_0.1.bb	2006-10-20 14:43:03 UTC (rev 93)
@@ -0,0 +1,25 @@
+DESCRIPTION = "Custom matchbox session files for OpenMoko"
+HOMEPAGE = "http://www.openmoko.org"
+SECTION = "openmoko/base"
+LICENSE = "GPL"
+RDEPENDS = "matchbox matchbox-applet-startup-monitor gtk-theme-clearlooks"
+PR = "r0"
+
+SRC_URI = "file://etc"
+S = ${WORKDIR}
+
+do_install() {
+	cp -R ${S}/etc ${D}/etc
+	rm -fR ${D}/etc/.svn
+	rm -fR ${D}/etc/matchbox/.svn
+	chmod -R 755 ${D}/etc
+}
+
+pkg_postinst_openmoko-session () {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Clearlooks
+}

Modified: trunk/oe/packages/tasks/task-openmoko.bb
===================================================================
--- trunk/oe/packages/tasks/task-openmoko.bb	2006-10-19 11:34:32 UTC (rev 92)
+++ trunk/oe/packages/tasks/task-openmoko.bb	2006-10-20 14:43:03 UTC (rev 93)
@@ -6,7 +6,7 @@
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
 DEPENDS = "dropbear"
-PR = "r8"
+PR = "r11"
 
 PACKAGES = "\
   task-openmoko-core \
@@ -51,12 +51,17 @@
 DESCRIPTION_task-openmoko-ui = "OpenMoko: The X11/Gtk+2 based native User Interface"
 RDEPENDS_task-openmoko-ui = "\
   gtk+ \
+  matchbox-common \
   matchbox-wm \
   matchbox-themes-gtk \
   matchbox-desktop \
   matchbox-panel-manager \
   matchbox-panel \
+  xserver-kdrive-common \
   xserver-kdrive-fbdev \
+  xserver-nodm-init \
+  openmoko-common \
+  openmoko-session \
 "
 
 #

Added: trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults	2006-10-19 11:34:32 UTC (rev 92)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults	2006-10-20 14:43:03 UTC (rev 93)
@@ -0,0 +1,3 @@
+Rxvt*scrollBar_right: true
+Rxvt*font: xft:Mono:pixelsize=9
+

Added: trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit	2006-10-19 11:34:32 UTC (rev 92)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit	2006-10-20 14:43:03 UTC (rev 93)
@@ -0,0 +1,16 @@
+#!/bin/sh
+# 
+
+export USER=root
+export HOME=/home/root
+if [ ! -d $HOME ] && [ -d /root ]; then
+  HOME=/root
+fi
+export XAPPLRESDIR=/usr/X11R6/lib/app-defaults
+export XFILESEARCHPATH=./%N%S%C.ad:/usr/X11R6/lib/X11/%L/%T/%N%S%C:/usr/X11R6/lib/X11/%l/%T/%N%S%C:/usr/X11R6/lib/X11/%T/%N%S%C:./%N%S.ad:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S:/usr/local/lib/X11/app-defaults/%N%S%C.ad
+
+export PATH=$PATH:/usr/X11R6/bin
+
+SYSSESSIONDIR=/etc/X11/Xinit.d
+
+exec run-parts $SYSSESSIONDIR

Added: trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver	2006-10-19 11:34:32 UTC (rev 92)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver	2006-10-20 14:43:03 UTC (rev 93)
@@ -0,0 +1,97 @@
+#!/bin/sh
+#
+
+# note xinit needs full server path
+XSERVER=/usr/bin/Xipaq
+if [ -f /usr/bin/Xfbdev ]; then
+  XSERVER=/usr/bin/Xfbdev
+fi
+if [ -f /usr/bin/Xepson ]; then
+  XSERVER=/usr/bin/Xepson
+fi
+if [ -f /usr/bin/Xorg ]; then
+  XSERVER=/usr/bin/Xorg
+fi
+if [ -f /usr/bin/Xomap ]; then
+  XSERVER=/usr/bin/Xomap
+fi
+
+. /etc/profile
+
+fallback_screen_arg() {
+    geom=`fbset | grep geometry`
+    w=`echo $geom | awk '{ print $2 }'`
+    h=`echo $geom | awk '{ print $3 }'`
+    b=`echo $geom | awk '{ print $6 }'`
+    echo -n "${w}x${h}x${b}"
+} 
+
+module_id() {
+    ## used to read from assets, but sometimes assets is corrupted
+    # grep "Module ID" /proc/hal/assets | sed "s/.*://"
+    ## used to read from /proc/hal/model, but that is removed in 2.6
+    # echo ' iPAQ' `cat /proc/hal/model`
+    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+}
+
+export USER=root
+
+ARGS=" -br -pn"
+
+# use ucb 1x00 touchscreen if present
+if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
+  ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
+fi
+
+# use usb mouse if present
+# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically
+if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then
+  ARGS="$ARGS -mouse /dev/input/mice"
+fi
+
+# start off server in conventional location.
+case `module_id` in
+	"HP iPAQ H3100" | "HP iPAQ H3800")
+		ARGS="$ARGS -dpi 100 -screen 320x240 at 90 -rgba vrgb" ;;
+	"HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
+		ARGS="$ARGS -dpi 100 -screen 320x240 at 270 -rgba vbgr" ;;
+	"HP iPAQ H5400" | "HP iPAQ H2200")
+		ARGS="$ARGS -dpi 100 -rgba rgb" ;;
+	"Ramses")
+		# What is this "vt2" in aid of?
+		ARGS="$ARGS -dpi 100 -screen 320x240 at 90 -rgba vrgb vt2" ;;
+	# both 'Sharp-Collie' and just 'Collie' have been reported
+	*Poodle)
+		ARGS="$ARGS -screen 320x240 at 270 -rgba vrgb" ;;
+	*Collie)
+		ARGS="$ARGS -dpi 100 -screen 320x240 at 270 -rgba vrgb"
+		# Horrible hack required to enable resuming after suspend
+		rm -f /dev/apm_bios
+		killall -9 apmd
+		;;
+	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+		ARGS="$ARGS -dpi 150 -rgba rgb" ;;
+	"SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
+		ARGS="$ARGS -dpi 150 -rgba rgb -screen 480x640 at 270" ;;
+	"Simpad")
+		ARGS="$ARGS -rgba rgb" ;;
+	"Generic OMAP1510/1610/1710")
+		ARGS="$ARGS -mouse /dev/input/event0" ;;
+	"ARM-IntegratorCP" | "ARM-Versatile PB")
+		ARGS="$ARGS -rgba vrgb" ;;
+	"Compulab CM-x270")
+                modprobe mbxfb
+	        ARGS="$ARGS -fb /dev/fb1"
+                ;;
+        *)
+		# Its a device we dont know about - in which case force
+                # kdrive to use the current framebuffer geometry otherwise
+		# it will defualt to trying to achieve 1024x768 
+		S=`fallback_screen_arg`
+		ARGS="$ARGS -screen $S"
+		;;
+esac
+
+DISPLAY=':0'
+
+exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*

Added: trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession	2006-10-19 11:34:32 UTC (rev 92)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession	2006-10-20 14:43:03 UTC (rev 93)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+HOME_VOLATILE=/home/$USER/ramdisk
+export HOME_VOLATILE
+
+if [ -f /usr/bin/dbus-launch ]; then
+  ## test for an existing bus daemon, just to be safe
+  if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+     ## if not found, launch a new one
+     eval `dbus-launch --auto-syntax --exit-with-session`
+     echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
+  fi
+fi
+
+. /etc/profile
+
+if [ -f $HOME/.profile ]; then
+ . $HOME/.profile
+fi
+
+SYSSESSIONDIR=/etc/X11/Xsession.d
+
+run-parts $SYSSESSIONDIR
+
+exit 0
+

Added: trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate	2006-10-19 11:34:32 UTC (rev 92)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate	2006-10-20 14:43:03 UTC (rev 93)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ]
+do
+   /usr/bin/xtscal
+done

Added: trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults	2006-10-19 11:34:32 UTC (rev 92)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults	2006-10-20 14:43:03 UTC (rev 93)
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -e $HOME/.Xdefaults ]; then
+    xrdb -merge -nocpp < $HOME/.Xdefaults
+fi

Added: trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager	2006-10-19 11:34:32 UTC (rev 92)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager	2006-10-20 14:43:03 UTC (rev 93)
@@ -0,0 +1,8 @@
+#!/bin/sh
+if [ -x $HOME/.Xsession ]; then
+    exec $HOME/.Xsession
+else
+    exec /usr/bin/x-window-manager
+fi
+
+

Added: trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb	2006-10-19 11:34:32 UTC (rev 92)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb	2006-10-20 14:43:03 UTC (rev 93)
@@ -0,0 +1,18 @@
+DESCRIPTION = "Common X11 scripts"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
+PR = "r9"
+
+SRC_URI = "file://etc"
+S = ${WORKDIR}
+
+PACKAGE_ARCH = "all"
+
+do_install() {
+	cp -R ${S}/etc ${D}/etc
+	rm -fR ${D}/etc/.svn
+	rm -fR ${D}/etc/*/.svn
+	rm -fR ${D}/etc/*/*/.svn
+	chmod -R 755 ${D}/etc
+}
\ No newline at end of file

Added: trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm	2006-10-19 11:34:32 UTC (rev 92)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm	2006-10-20 14:43:03 UTC (rev 93)
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+killproc() {            # kill the named process(es)
+        pid=`/bin/ps -e x |
+             /bin/grep $1 |
+             /bin/grep -v grep |
+             /bin/sed -e 's/^  *//' -e 's/ .*//'`
+        [ "$pid" != "" ] && kill $pid
+}
+
+for x in $(cat /proc/cmdline); do
+        case $x in
+        x11=false)
+		echo "X Server disabled" 
+		exit 0;
+                ;;
+        esac
+done
+
+case "$1" in
+  start)
+    # We don't want this script to block the rest of the boot process
+    if [ "$2" != "background" ]; then
+      $0 $1 background &
+    else
+       . /etc/profile
+
+       echo "Starting Xserver"
+       /etc/X11/Xserver &
+    fi 
+  ;;
+
+  stop)
+        echo "Stopping XServer"
+        killproc xinit
+  ;;
+
+  restart)
+	$0 stop
+        sleep 1
+        $0 start
+  ;;
+
+  *)
+        echo "usage: $0 { start | stop | restart }"
+  ;;
+esac
+
+exit 0


Property changes on: trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init.bb
===================================================================
--- trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init.bb	2006-10-19 11:34:32 UTC (rev 92)
+++ trunk/oe/packages/xserver-kdrive-common/xserver-nodm-init.bb	2006-10-20 14:43:03 UTC (rev 93)
@@ -0,0 +1,21 @@
+DESCRIPTION = "Simple Xserver Init Script (no dm)"
+LICENSE = "GPL"
+SECTION = "x11"
+PRIORITY = "optional"
+PR = "r8"
+
+SRC_URI = "file://xserver-nodm"
+S = ${WORKDIR}
+
+PACKAGE_ARCH = "all"
+
+do_install() {
+    install -d ${D}/etc
+    install -d ${D}/etc/init.d
+    install xserver-nodm ${D}/etc/init.d
+}    
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "xserver-nodm"
+INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."



