xserver-kdrive-common: end of line whitespace cleanup of Xserver script
Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: e3fa1fccbfe1cf68df2dcf8ff2178440ba65cc73
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e3fa1fccbfe1cf68df2dcf8ff2178440ba65cc73
Files:
1
packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
Diffs:
#
# mt diff -r0cc65eef5dbf1dca9c8a3fecdf17a3f391b969ae -re3fa1fccbfe1cf68df2dcf8ff2178440ba65cc73
#
#
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/Xserver"
# from [d2388d51184156d1aec429601b0199f1af934529]
# to [0cee85f8c4b24ec8040cc85e3103c5d25f0dc4b2]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
# from [4f68087bab33a8806229c061aa719c9e47a35ce5]
# to [33ac0e6e0bb1404f4451523475479cb061ff2565]
#
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/Xserver d2388d51184156d1aec429601b0199f1af934529
+++ packages/xserver-kdrive-common/xserver-kdrive-common/Xserver 0cee85f8c4b24ec8040cc85e3103c5d25f0dc4b2
@@ -15,12 +15,12 @@ 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
+if [ -f /usr/bin/Xw100 ]; then
+ XSERVER=Xw100
+fi
+if [ -f /usr/bin/Ximageon ]; then
+ XSERVER=Ximageon
+fi
. /etc/profile
@@ -32,7 +32,7 @@ fallback_screen_arg() {
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
@@ -59,35 +59,35 @@ case `module_id` in
# 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 225 -screen 480x640 at 270" ;;
+ "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 225 -screen 480x640 at 270" ;;
"ARM-IntegratorCP" | "ARM-Versatile PB")
ARGS="$ARGS -rgba vrgb" ;;
"Compulab CM-x270")
@@ -101,7 +101,7 @@ case `module_id` in
*)
# 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
+ # it will defualt to trying to achieve 1024x768
S=`fallback_screen_arg`
ARGS="$ARGS -screen $S"
;;
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver 4f68087bab33a8806229c061aa719c9e47a35ce5
+++ packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver 33ac0e6e0bb1404f4451523475479cb061ff2565
@@ -15,12 +15,12 @@ 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
+if [ -f /usr/bin/Xw100 ]; then
+ XSERVER=Xw100
+fi
+if [ -f /usr/bin/Ximageon ]; then
+ XSERVER=Ximageon
+fi
. /etc/profile
@@ -32,7 +32,7 @@ fallback_screen_arg() {
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
@@ -59,35 +59,35 @@ case `module_id` in
# 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" ;;
+ "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 vrg%s
>>> DIFF TRUNCATED @ 16K