[oe-commits] org.oe.dev xserver-kdrive-common: enable overriding individual files
mickeyl commit
openembedded-commits at lists.openembedded.org
Fri Aug 10 04:19:02 UTC 2007
xserver-kdrive-common: enable overriding individual files
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 51d54920e9415bae1f8924c1c9e72abf5f918ac6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=51d54920e9415bae1f8924c1c9e72abf5f918ac6
Files:
1
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults
packages/xserver-kdrive-common/xserver-kdrive-common/Xdefaults
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit
packages/xserver-kdrive-common/xserver-kdrive-common/Xinit
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
packages/xserver-kdrive-common/xserver-kdrive-common/Xsession
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate
packages/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults
packages/xserver-kdrive-common/xserver-kdrive-common/60xXDefaults
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager
packages/xserver-kdrive-common/xserver-kdrive-common/90xXWindowManager
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
Diffs:
#
# mt diff -r9b6f61358e380ed0984a30832cb72ee2eb6033db -r51d54920e9415bae1f8924c1c9e72abf5f918ac6
#
#
#
# rename "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xdefaults"
# to "packages/xserver-kdrive-common/xserver-kdrive-common/Xdefaults"
#
# rename "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit"
# to "packages/xserver-kdrive-common/xserver-kdrive-common/Xinit"
#
# rename "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver"
# to "packages/xserver-kdrive-common/xserver-kdrive-common/Xserver"
#
# rename "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession"
# to "packages/xserver-kdrive-common/xserver-kdrive-common/Xsession"
#
# rename "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate"
# to "packages/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate"
#
# rename "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/60xXDefaults"
# to "packages/xserver-kdrive-common/xserver-kdrive-common/60xXDefaults"
#
# rename "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/90xXWindowManager"
# to "packages/xserver-kdrive-common/xserver-kdrive-common/90xXWindowManager"
#
# add_dir "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko"
#
# add_file "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
# content [4f68087bab33a8806229c061aa719c9e47a35ce5]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
# from [5bd12bd7ec1767db6e23bcbccdbbc6991a9eb7f2]
# to [e74da1a7434039b13a4b9e1f9569d213d4d98bd9]
#
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver 4f68087bab33a8806229c061aa719c9e47a35ce5
+++ packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver 4f68087bab33a8806229c061aa719c9e47a35ce5
@@ -0,0 +1,112 @@
+#!/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=" -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 -br -dpi 100 -rgba vrgb -screen 320x240 at 90" ;;
+ "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
+ ARGS="$ARGS -br -dpi 100 -rgba vbgr -screen 320x240 at 270" ;;
+ "HP iPAQ H5400" | "HP iPAQ H2200")
+ ARGS="$ARGS -br -dpi 100 -rgba rgb" ;;
+ "HP iPAQ HX4700")
+ ARGS="$ARGS -br -dpi 200" ;;
+ "Ramses")
+ # What is this "vt2" in aid of?
+ ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240 at 90 vt2" ;;
+ # both 'Sharp-Collie' and just 'Collie' have been reported
+ *Poodle)
+ ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240 at 270" ;;
+ *Collie)
+ ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240 at 270"
+ ;;
+ "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+ ARGS="$ARGS -br -dpi 200 -rgba rgb" ;;
+ "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
+ ARGS="$ARGS -br -dpi 200 -rgba rgb -screen 480x640 at 270" ;;
+ "Simpad")
+ ARGS="$ARGS -br -dpi 100 -rgba rgb" ;;
+ "Generic OMAP1510/1610/1710")
+ ARGS="$ARGS -br -dpi 220 -mouse /dev/input/event0" ;;
+ "Cellon C8000 Board")
+ ARGS="$ARGS -br -dpi 100 -screen 240x320,10,1" ;;
+ "HTC Universal")
+ ARGS="$ARGS -br -dpi 225 -screen 480x640 at 270" ;;
+ "ARM-IntegratorCP" | "ARM-Versatile PB")
+ ARGS="$ARGS -br -rgba vrgb" ;;
+ "Compulab CM-x270")
+ modprobe mbxfb
+ ARGS="$ARGS -br -fb /dev/fb1"
+ ;;
+ "GTA01" | "GTA02")
+ ARGS="$ARGS -dpi 285 -screen 480x640 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash.ppm" ;;
+ "Nokia N800")
+ ARGS="$ARGS -br -dpi 225 -screen 800x480x16 -mouse tslib" ;;
+ *)
+ # 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_0.1.bb 5bd12bd7ec1767db6e23bcbccdbbc6991a9eb7f2
+++ packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb e74da1a7434039b13a4b9e1f9569d213d4d98bd9
@@ -1,18 +1,42 @@ RDEPENDS_${PN} = "xmodmap libxrandr xdpy
DESCRIPTION = "Common X11 scripts"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r14"
+PR = "r15"
-SRC_URI = "file://etc"
-S = ${WORKDIR}
+SRC_URI = "\
+ file://Xdefaults \
+ file://Xinit \
+ file://Xserver \
+ file://Xsession \
+ \
+ file://30xTs_Calibrate \
+ file://60xXDefaults \
+ file://90xXWindowManager \
+ "
+etcFiles = "\
+ Xdefaults \
+ Xinit \
+ Xserver \
+ Xsession \
+ "
+sessionFiles = "\
+ 30xTs_Calibrate \
+ 60xXDefaults \
+ 90xXWindowManager \
+ "
+
+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
+ install -d ${D}/${sysconfdir}/X11/Xsession.d
+ for i in ${etcfiles}; do
+ install -m 0755 ${WORKDIR}/$i ${D}/${sysconfdir}/X11/
+ done
+ for i in ${sessionFiles}; do
+ install -m 0755 ${WORKDIR}/$i ${D}/${sysconfdir}/X11/Xsession.d/
+ done
}
More information about the Openembedded-commits
mailing list