Move X scripts which are not GPE specific out of gpe-dm and gpe-session-scripts and into x11-common

For now I have added patches to the makefiles to stop installing of these files but they should be removed from those packagse eventually
I have also added all of these small scripts to OE but these should probably be tarballed somewhere
gpe-dm and gpe-session-scripts now depend on the new x11-common package
Change entrance to depend on the new package

26 files changed, 218 insertions, 19 deletions

diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb
index a4395a93cc..cc316c568e 100644
--- a/packages/e17/entrance_20050810.bb
+++ b/packages/e17/entrance_20050810.bb
@@ -3,7 +3,7 @@ SECTION = "e/apps"
 LICENSE = "MIT"
 # can also use pam and crypt
 DEPENDS = "edb evas-x11 ecore-x11 edje esmart"
-RDEPENDS += "bash keylaunch detect-stylus gpe-session-scripts gpe-dm"
+RDEPENDS += "bash keylaunch detect-stylus x11-common"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
 CVSDATE = "${PV}"
diff --git a/packages/gpe-dm/files/remove-X-scripts.patch b/packages/gpe-dm/files/remove-X-scripts.patch
new file mode 100644
index 0000000000..b3c85be788
--- /dev/null
+++ b/packages/gpe-dm/files/remove-X-scripts.patch
@@ -0,0 +1,14 @@
+diff -Nur gpe-dm-0.47~/Makefile gpe-dm-0.47/Makefile
+--- gpe-dm-0.47~/Makefile	2005-08-19 18:27:54.000000000 -0700
++++ gpe-dm-0.47/Makefile	2005-08-19 18:28:37.000000000 -0700
+@@ -31,10 +31,6 @@
+ 	install -d $(DESTDIR)/etc/init.d
+ 	install -d $(DESTDIR)/etc/rc2.d
+ 	install gpe-dm.init $(DESTDIR)/etc/init.d/gpe-dm
+-	install -d $(DESTDIR)/etc/X11
+-	install Xsession $(DESTDIR)/etc/X11/Xsession
+-	install Xinit $(DESTDIR)/etc/X11/Xinit
+-	install Xserver $(DESTDIR)/etc/X11/Xserver
+ 
+ clean: clean-po
+ 	rm -f gpe-dm gpe-dm.o
diff --git a/packages/gpe-dm/gpe-dm_0.47.bb b/packages/gpe-dm/gpe-dm_0.47.bb
index b98a235ac5..bc290ebf89 100644
--- a/packages/gpe-dm/gpe-dm_0.47.bb
+++ b/packages/gpe-dm/gpe-dm_0.47.bb
@@ -5,11 +5,11 @@ DESCRIPTION = "GPE Desktop Manager"
 SECTION = "gpe"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "glib-2.0"
-PR = "r4"
+DEPENDS = "glib-2.0 x11-common"
+RDEPENDS_${PN} += "x11-common"
+PR = "r5"
 
 INITSCRIPT_NAME = "gpe-dm"
 INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
 
-SRC_URI += "file://collie-suspend-hack.patch;patch=1 \
-	    file://Xserver-cxk.patch;patch=1"
+SRC_URI += "file://remove-X-scripts.patch;patch=1"
diff --git a/packages/gpe-session-scripts/files/remove-x11-common-files.patch b/packages/gpe-session-scripts/files/remove-x11-common-files.patch
new file mode 100644
index 0000000000..1bf896923d
--- /dev/null
+++ b/packages/gpe-session-scripts/files/remove-x11-common-files.patch
@@ -0,0 +1,14 @@
+diff -Nur gpe-session-scripts-0.63~/Makefile gpe-session-scripts-0.63/Makefile
+--- gpe-session-scripts-0.63~/Makefile	2005-08-19 18:32:17.000000000 -0700
++++ gpe-session-scripts-0.63/Makefile	2005-08-19 18:35:46.000000000 -0700
+@@ -23,7 +23,9 @@
+ all:
+ 
+ install-program: gpe-logout.desktop
+-	for i in X11/Xsession.d X11/Xinit.d; do install -d $(DESTDIR)/etc/$$i; FILES=`echo $$i/* | sed "s:$$i/CVS::"`; install -m 755 $$FILES $(DESTDIR)/etc/$$i/; done
++	install -d $(DESTDIR)/etc/X11/Xsession.d
++	install -m 755 X11/Xsession.d/99xWindowManager $(DESTDIR)/etc/X11/Xsession.d
++	install -m 755 X11/Xsession.d/98standard-apps $(DESTDIR)/etc/X11/Xsession.d
+ 	install -d $(DESTDIR)$(PREFIX)/bin
+ 	install -m 755 gpe-xcalibrate.sh $(DESTDIR)$(PREFIX)/bin/gpe-xcalibrate.sh
+ 	install -d $(DESTDIR)/etc/gpe
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
index 454325d2a2..19b6608e2f 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-PR = "r14"
+PR = "r15"
 
 inherit gpe
 
@@ -7,23 +7,15 @@ DESCRIPTION = "GPE session startup scripts"
 SECTION = "gpe"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo"
+RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo x11-common"
 # more rdepends: keylaunch ipaq-sleep apmd blueprobe
-DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo"
+DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo x11-common"
 
-SRC_URI += "file://zaurus.sh \
-	file://keymap.sh \
-	file://matchbox-session \
-	file://shepherd.xmodmap file://simpad.xmodmap \
-	file://collie.xmodmap \
-	file://disable-composite.xsettings"
+SRC_URI += "file://matchbox-session \
+	file://disable-composite.xsettings \
+        file://remove-x11-common-files.patch;patch=1"
 
 do_install_append() {
-	install ${WORKDIR}/zaurus.sh ${D}${sysconfdir}/X11/Xinit.d/11zaurus
-	install ${WORKDIR}/keymap.sh ${D}${sysconfdir}/X11/Xinit.d/12keymap
-	for m in simpad shepherd collie; do
-		install -m 0644 ${WORKDIR}/$m.xmodmap ${D}${sysconfdir}/X11/
-	done
 	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
 	if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
 		echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar
diff --git a/packages/x11/x11-common/.mtn2git_empty b/packages/x11/x11-common/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/x11/x11-common/.mtn2git_empty
diff --git a/packages/x11/x11-common/etc/.mtn2git_empty b/packages/x11/x11-common/etc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/x11/x11-common/etc/.mtn2git_empty
diff --git a/packages/x11/x11-common/etc/X11/.mtn2git_empty b/packages/x11/x11-common/etc/X11/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/.mtn2git_empty
diff --git a/packages/x11/x11-common/etc/X11/Xdefaults b/packages/x11/x11-common/etc/X11/Xdefaults
new file mode 100644
index 0000000000..f5b69dd516
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xdefaults
@@ -0,0 +1,3 @@
+Rxvt*scrollBar_right: true
+Rxvt*font: xft:Mono:pixelsize=9
+
diff --git a/packages/x11/x11-common/etc/X11/Xinit b/packages/x11/x11-common/etc/X11/Xinit
new file mode 100644
index 0000000000..f566ffe5be
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xinit
@@ -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
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/.mtn2git_empty b/packages/x11/x11-common/etc/X11/Xinit.d/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xinit.d/.mtn2git_empty
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr b/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr
new file mode 100644
index 0000000000..abde87d53c
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+xrandr -o normal
+
diff --git a/packages/gpe-session-scripts/files/zaurus.sh b/packages/x11/x11-common/etc/X11/Xinit.d/11zaurus
index 61ca84b595..61ca84b595 100644
--- a/packages/gpe-session-scripts/files/zaurus.sh
+++ b/packages/x11/x11-common/etc/X11/Xinit.d/11zaurus
diff --git a/packages/gpe-session-scripts/files/keymap.sh b/packages/x11/x11-common/etc/X11/Xinit.d/12keymap
index 0e64aac9f4..0e64aac9f4 100644
--- a/packages/gpe-session-scripts/files/keymap.sh
+++ b/packages/x11/x11-common/etc/X11/Xinit.d/12keymap
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate b/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate
new file mode 100644
index 0000000000..de47b871a2
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ ! -f /etc/pointercal ]; then
+    /usr/bin/xtscal
+fi
+
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap b/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap
new file mode 100644
index 0000000000..7ae3b58860
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -f /proc/hal/model ]; then
+  xmodmap -e 'keycode 104 = Return'
+fi
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver b/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver
new file mode 100644
index 0000000000..5f6d0dae5d
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+xset s 30 180
+xset s off
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults b/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults
new file mode 100644
index 0000000000..6b35e0357c
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+xrdb -load -nocpp < /etc/X11/Xdefaults
diff --git a/packages/x11/x11-common/etc/X11/Xserver b/packages/x11/x11-common/etc/X11/Xserver
new file mode 100644
index 0000000000..e7e6dd1ddb
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xserver
@@ -0,0 +1,73 @@
+#!/bin/sh
+#
+
+XSERVER=Xipaq
+if [ -f /usr/bin/Xfbdev ]; then
+  XSERVER=Xfbdev
+fi
+if [ -f /usr/bin/Xepson ]; then
+  XSERVER=Xepson
+fi
+if [ -f /usr/bin/Xorg ]; then
+  XSERVER=Xorg
+fi
+if [ -f /usr/bin/Xomap ]; then
+  XSERVER=Xomap
+fi
+
+. /etc/profile
+
+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="-dpi 100 -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 -screen 320x240@90 -rgba vrgb" ;;
+	"HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
+		ARGS="$ARGS -screen 320x240@270 -rgba vbgr" ;;
+	"HP iPAQ H5400" | "HP iPAQ H2200")
+		ARGS="$ARGS -rgba rgb" ;;
+	"Ramses")
+		# What is this "vt2" in aid of?
+		ARGS="$ARGS -screen 320x240@90 -rgba vrgb vt2" ;;
+	# both 'Sharp-Collie' and just 'Collie' have been reported
+	*Poodle)
+		ARGS="$ARGS -screen 320x240@270 -rgba vrgb" ;;
+	*Collie)
+		ARGS="$ARGS -screen 320x240@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 -rgba rgb" ;;
+	"SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
+		ARGS="$ARGS -rgba rgb -screen 640x480@270" ;;
+	"Simpad")
+		ARGS="$ARGS -rgba rgb" ;;
+	"Generic OMAP1510/1610/1710")
+		ARGS="$ARGS -mouse /dev/input/event0" ;;
+esac
+
+exec $XSERVER $ARGS $*
diff --git a/packages/x11/x11-common/etc/X11/Xsession b/packages/x11/x11-common/etc/X11/Xsession
new file mode 100644
index 0000000000..cfa3a9a6e3
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xsession
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# this location MUST be consistent with /etc/X11/gpe-login.pre-session
+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-gpe.d
+
+if [ ! -d $SYSSESSIONDIR ]; then
+  SYSSESSIONDIR=/etc/X11/Xsession.d
+fi
+
+# Use run-parts to source every file in the session directory; we source
+# instead of executing so that the variables and functions defined above
+# are available to the scripts, and so that they can pass variables to each
+# other.
+
+# Can't use run-parts like this, busybox doesn't support it. Use ls instead
+#SESSIONFILES=$(run-parts --list $SYSSESSIONDIR)
+
+SESSIONFILES=`ls -X $SYSSESSIONDIR`
+if [ -n "$SESSIONFILES" ]; then
+  for SESSIONFILE in $SESSIONFILES; do
+  # Test if script is executable first before sourcing it
+    if [ -x "$SYSSESSIONDIR/$SESSIONFILE" ]; then
+      . $SYSSESSIONDIR/$SESSIONFILE
+    fi
+  done
+fi
+
+exit 0
+
diff --git a/packages/x11/x11-common/etc/X11/Xsession.d/.mtn2git_empty b/packages/x11/x11-common/etc/X11/Xsession.d/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xsession.d/.mtn2git_empty
diff --git a/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults b/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults
new file mode 100644
index 0000000000..d3a284d8da
--- /dev/null
+++ b/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -e $HOME/.Xdefaults ]; then
+    xrdb -merge -nocpp < $HOME/.Xdefaults
+fi
diff --git a/packages/gpe-session-scripts/files/collie.xmodmap b/packages/x11/x11-common/etc/X11/collie.xmodmap
index 5c0b39dc88..5c0b39dc88 100644
--- a/packages/gpe-session-scripts/files/collie.xmodmap
+++ b/packages/x11/x11-common/etc/X11/collie.xmodmap
diff --git a/packages/gpe-session-scripts/files/shepherd.xmodmap b/packages/x11/x11-common/etc/X11/shepherd.xmodmap
index 0a03b4f426..0a03b4f426 100644
--- a/packages/gpe-session-scripts/files/shepherd.xmodmap
+++ b/packages/x11/x11-common/etc/X11/shepherd.xmodmap
diff --git a/packages/gpe-session-scripts/files/simpad.xmodmap b/packages/x11/x11-common/etc/X11/simpad.xmodmap
index d8b73b207f..d8b73b207f 100644
--- a/packages/gpe-session-scripts/files/simpad.xmodmap
+++ b/packages/x11/x11-common/etc/X11/simpad.xmodmap
diff --git a/packages/x11/x11-common_0.1.bb b/packages/x11/x11-common_0.1.bb
new file mode 100644
index 0000000000..707c766555
--- /dev/null
+++ b/packages/x11/x11-common_0.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Common X11 scripts"
+LICENSE = "GPL"
+SECTION = "x11"
+DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+PR = "r0"
+
+SRC_URI = "file://etc"
+S = ${WORKDIR}
+
+do_install() {
+	cp -R ${S}/etc ${D}/etc
+	chmod -R 755 ${D}/etc
+}
\ No newline at end of file