[oe-commits] org.oe.dev xserver-kdrive-common: merge from openmoko svn, merge in fixes from upstream xserver-common
koen commit
openembedded-commits at lists.openembedded.org
Thu Feb 15 09:51:24 UTC 2007
xserver-kdrive-common: merge from openmoko svn, merge in fixes from upstream xserver-common
xserver-nodm-init: merge from openmoko svn
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: f54b8b262d5c4340698dae9f60bdf41d05f26ae3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f54b8b262d5c4340698dae9f60bdf41d05f26ae3
Files:
1
packages/xserver-kdrive-common
packages/xserver-kdrive-common/xserver-kdrive-common
packages/xserver-kdrive-common/xserver-kdrive-common/etc
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d
packages/xserver-kdrive-common/xserver-nodm-init
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
packages/xserver-kdrive-common/xserver-nodm-init.bb
mtn:execute
true
Diffs:
#
# mt diff -rebf3579d45eb991736c42fc847fce1611f12be3c -rf54b8b262d5c4340698dae9f60bdf41d05f26ae3
#
#
#
# add_dir "packages/xserver-kdrive-common"
#
# add_dir "packages/xserver-kdrive-common/xserver-kdrive-common"
#
# add_dir "packages/xserver-kdrive-common/xserver-kdrive-common/etc"
#
# add_dir "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11"
#
# add_dir "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d"
#
# add_dir "packages/xserver-kdrive-common/xserver-nodm-init"
#
# add_file "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults"
# content [416d4d96e5a7e715936eb0f5c0468449aa0a0dc6]
#
# add_file "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit"
# content [8b3af71a57d37655c253fe4d6935cfbc339629a2]
#
# add_file "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver"
# content [41366c98ae5c7a2a3d9a102b5d4faf3a8eae16f1]
#
# add_file "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession"
# content [54765093625e49f2b3201e24ce07e42b07e6b62c]
#
# add_file "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate"
# content [67b1fca22fa1300c1b81f3a648235494fbd31eb7]
#
# add_file "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults"
# content [96c3b53039f37224531a36eef181f6294e17819b]
#
# add_file "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager"
# content [34391a49aa8c81311a8a36a090ce1619e79c16b0]
#
# add_file "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
# content [8fffcbd16b8f7feebdffc333618cea5a07c15f74]
#
# add_file "packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm"
# content [598886e0632ddb6a8338f19dade1c44da94ca257]
#
# add_file "packages/xserver-kdrive-common/xserver-nodm-init.bb"
# content [365c56a087e4405ce95d7cbd98d6f530f5a269db]
#
# set "packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults 416d4d96e5a7e715936eb0f5c0468449aa0a0dc6
+++ packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults 416d4d96e5a7e715936eb0f5c0468449aa0a0dc6
@@ -0,0 +1,3 @@
+Rxvt*scrollBar_right: true
+Rxvt*font: xft:Mono:pixelsize=9
+
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit 8b3af71a57d37655c253fe4d6935cfbc339629a2
+++ packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit 8b3af71a57d37655c253fe4d6935cfbc339629a2
@@ -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
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver 41366c98ae5c7a2a3d9a102b5d4faf3a8eae16f1
+++ packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver 41366c98ae5c7a2a3d9a102b5d4faf3a8eae16f1
@@ -0,0 +1,108 @@
+#!/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
+if [ -f /usr/bin/Xw100 ]; then
+ XSERVER=Xw100
+fi
+if [ -f /usr/bin/Ximageon ]; then
+ XSERVER=Ximageon
+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 -rgba vrgb -screen 320x240 at 90" ;;
+ "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
+ ARGS="$ARGS -dpi 100 -rgba vbgr -screen 320x240 at 270" ;;
+ "HP iPAQ H5400" | "HP iPAQ H2200")
+ ARGS="$ARGS -dpi 100 -rgba rgb" ;;
+ "HP iPAQ HX4700")
+ ARGS="$ARGS -dpi 200" ;;
+ "Ramses")
+ # What is this "vt2" in aid of?
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 90 vt2" ;;
+ # both 'Sharp-Collie' and just 'Collie' have been reported
+ *Poodle)
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 270" ;;
+ *Collie)
+ ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240 at 270"
+ ;;
+ "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+ ARGS="$ARGS -dpi 200 -rgba rgb" ;;
+ "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
+ ARGS="$ARGS -dpi 200 -rgba rgb -screen 480x640 at 270" ;;
+ "Simpad")
+ ARGS="$ARGS -dpi 100 -rgba rgb" ;;
+ "Generic OMAP1510/1610/1710")
+ ARGS="$ARGS -dpi 220 -mouse /dev/input/event0" ;;
+ "Cellon C8000 Board")
+ ARGS="$ARGS -dpi 100 -screen 240x320,10,1" ;;
+ "HTC Universal")
+ ARGS="$ARGS -dpi 100 -screen 480x640 at 270" ;;
+ "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 $*
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession 54765093625e49f2b3201e24ce07e42b07e6b62c
+++ packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession 54765093625e49f2b3201e24ce07e42b07e6b62c
@@ -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
+
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate 67b1fca22fa1300c1b81f3a648235494fbd31eb7
+++ packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate 67b1fca22fa1300c1b81f3a648235494fbd31eb7
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ]
+do
+ /usr/bin/xtscal
+done
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults 96c3b53039f37224531a36eef181f6294e17819b
+++ packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults 96c3b53039f37224531a36eef181f6294e17819b
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ -e $HOME/.Xdefaults ]; then
+ xrdb -merge -nocpp < $HOME/.Xdefaults
+fi
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager 34391a49aa8c81311a8a36a090ce1619e79c16b0
+++ packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager 34391a49aa8c81311a8a36a090ce1619e79c16b0
@@ -0,0 +1,8 @@
+#!/bin/sh
+if [ -x $HOME/.Xsession ]; then
+ exec $HOME/.Xsession
+else
+ exec /usr/bin/x-window-manager
+fi
+
+
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb 8fffcbd16b8f7feebdffc333618cea5a07c15f74
+++ packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb 8fffcbd16b8f7feebdffc333618cea5a07c15f74
@@ -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
+}
============================================================
--- packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm 598886e0632ddb6a8338f19dade1c44da94ca257
+++ packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm 598886e0632ddb6a8338f19dade1c44da94ca257
@@ -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
============================================================
--- packages/xserver-kdrive-common/xserver-nodm-init.bb 365c56a087e4405ce95d7cbd98d6f530f5a269db
+++ packages/xserver-kdrive-common/xserver-nodm-init.bb 365c56a087e4405ce95d7cbd98d6f530f5a269db
@@ -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 ."
More information about the Openembedded-commits
mailing list