diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-08-10 11:01:07 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-08-10 11:01:07 +0000 |
| commit | 218897f352d0bed08178a177d186f59c8c73a506 (patch) | |
| tree | 9effb3a35ce2889ec72e5bd649263974b11b7d65 /packages | |
| parent | f309083441acde886c432ffcb41fa06bd790f9d8 (diff) | |
| parent | 2edb67ce2572765431f7791bd13c17e255ff12c6 (diff) | |
merge of '294a7914d9ff32527dddf5266da757d7385372e7'
and '726f50fa46c4db4bf5fb2dc2f6390ca60337cdd0'
Diffstat (limited to 'packages')
4 files changed, 84 insertions, 77 deletions
diff --git a/packages/openmoko2/openmoko-terminal2_1.0.0.bb b/packages/openmoko2/openmoko-terminal2_1.0.0.bb index 8d9a5245ca..84bd470f7a 100644 --- a/packages/openmoko2/openmoko-terminal2_1.0.0.bb +++ b/packages/openmoko2/openmoko-terminal2_1.0.0.bb @@ -1,7 +1,10 @@ DESCRIPTION = "The OpenMoko Command Line Console" SECTION = "openmoko/applications" RDEPENDS += "mrxvt" -PR = "r1" +PR = "r2" + +RCONFLICTS = "openmoko-terminal" +RREPLACES = "openmoko-terminal" inherit openmoko2 diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver index e59460f3b0..709d501dfc 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver @@ -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,37 @@ 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@90" ;; - "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900") - ARGS="$ARGS -dpi 100 -rgba vbgr -screen 320x240@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@90 vt2" ;; - # both 'Sharp-Collie' and just 'Collie' have been reported - *Poodle) - ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" ;; - *Collie) - ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@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@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@270" ;; + "HP iPAQ H3100" | "HP iPAQ H3800") + ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@90" ;; + "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900") + ARGS="$ARGS -dpi 100 -rgba vbgr -screen 320x240@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@90 vt2" ;; + # both 'Sharp-Collie' and just 'Collie' have been reported + *Poodle) + ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@270" ;; + *Collie) + ARGS="$ARGS -dpi 100 -rgba vrgb -screen 320x240@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@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 Magician") + ARGS="$ARGS -dpi 142" ;; + "HTC Universal") + ARGS="$ARGS -dpi 225 -screen 480x640@270" ;; "ARM-IntegratorCP" | "ARM-Versatile PB") ARGS="$ARGS -rgba vrgb" ;; "Compulab CM-x270") @@ -101,7 +103,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" ;; diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver index efed60b2ad..dddced4b6f 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver @@ -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,37 @@ 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@90" ;; - "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900") - ARGS="$ARGS -br -dpi 100 -rgba vbgr -screen 320x240@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@90 vt2" ;; - # both 'Sharp-Collie' and just 'Collie' have been reported - *Poodle) - ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" ;; - *Collie) - ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@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@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@270" ;; + "HP iPAQ H3100" | "HP iPAQ H3800") + ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@90" ;; + "HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900") + ARGS="$ARGS -br -dpi 100 -rgba vbgr -screen 320x240@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@90 vt2" ;; + # both 'Sharp-Collie' and just 'Collie' have been reported + *Poodle) + ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@270" ;; + *Collie) + ARGS="$ARGS -br -dpi 100 -rgba vrgb -screen 320x240@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@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 Magician") + ARGS="$ARGS -br -dpi 142" ;; + "HTC Universal") + ARGS="$ARGS -br -dpi 225 -screen 480x640@270" ;; "ARM-IntegratorCP" | "ARM-Versatile PB") ARGS="$ARGS -br -rgba vrgb" ;; "Compulab CM-x270") @@ -101,7 +103,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" ;; diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb index 293ed8f794..cb3cf4578f 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb +++ b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit" -PR = "r16" +PR = "r17" SRC_URI = "\ file://Xdefaults \ @@ -33,7 +33,7 @@ PACKAGE_ARCH = "all" do_install() { install -d ${D}/${sysconfdir}/X11/Xsession.d - for i in ${etcfiles}; do + for i in ${etcFiles}; do install -m 0755 ${WORKDIR}/$i ${D}/${sysconfdir}/X11/ done for i in ${sessionFiles}; do |