summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2005-07-22 17:56:34 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-22 17:56:34 +0000
commitc73d8c4f5ddbd976139f3752590a133e779468d7 (patch)
tree29909b76d1c1d22c82bf62b519f6523a9814ff65 /packages
parent4fdde5abb7613d86b374bf8f04bb59d75243038b (diff)
Opie-Taskbar: remove hard coded QWS_DISPLAY setting from initscript
(this was never supposed to be checked in)
Diffstat (limited to 'packages')
-rw-r--r--packages/opie-taskbar/opie-taskbar/c7x0/opie85
-rwxr-xr-xpackages/opie-taskbar/opie-taskbar/opie2
-rw-r--r--packages/opie-taskbar/opie-taskbar_cvs.bb2
3 files changed, 86 insertions, 3 deletions
diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/opie b/packages/opie-taskbar/opie-taskbar/c7x0/opie
new file mode 100644
index 0000000000..dddb7caa0d
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/c7x0/opie
@@ -0,0 +1,85 @@
+#!/bin/sh
+#
+[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
+[ -z $HOME ] && export HOME=/home/$LOGNAME
+
+# we need to tinker directly with qws_display until the ODevice
+# default (which is now W100:Rot0:0) works flawlessly with rotation
+# and survives a suspend/resume cycle
+export QWS_DISPLAY=Transformed:Rot0:0
+# export QWS_DISPLAY=W100:Rot0:0
+export QTDIR=/opt/QtPalmtop
+export OPIEDIR=/opt/QtPalmtop
+export QPEDIR=/opt/QtPalmtop
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
+export PATH=$PATH:$OPIEDIR/bin
+
+if [ ! -x "$OPIEDIR/bin/qpe" ] ; then
+ echo Opie not installed
+ exit 0
+fi
+
+. /etc/profile
+
+for conf in $OPIEDIR/etc/skel/*.conf; do
+ conf_basename=`basename $conf`
+ if [ ! -e "$HOME/Settings/$conf_basename" ] ; then
+ echo "Copying default $conf_basename into $HOME/Settings/"
+ mkdir -p $HOME/Settings/
+ cat $conf >$HOME/Settings/$conf_basename
+ fi
+done
+
+if [ ! -e "$HOME/systeminfo/linkver" ] ; then
+ mkdir -p $HOME/systeminfo/
+ echo "1.13" >$HOME/systeminfo/linkver
+fi
+
+if [ ! -e "/opt/Qtopia" ] ; then
+ ln -sf /opt/QtPalmtop /opt/Qtopia
+fi
+
+case $1 in
+'start')
+ /sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0
+
+ if [ -x "$OPIEDIR/bin/opie-login" ]; then
+ echo Starting Opie-login....
+ $OPIEDIR/bin/opie-login -terminal 2
+ else
+ $OPIEDIR/bin/opie-reorgfiles
+ if [ -x /usr/bin/ssh-agent ]; then
+ SSHAGENT=/usr/bin/ssh-agent
+ else
+ SSHAGENT=""
+ fi
+
+ if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then
+ export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
+ fi
+ echo Starting Opie....
+ $SSHAGENT $OPIEDIR/bin/qpe -terminal 2
+ fi
+
+ ;;
+
+'stop')
+ echo "Stopping Opie..."
+ killall qpe 2>/dev/null
+ killall opie-login 2>/dev/null
+ killall quicklauncher 2>/dev/null
+
+ ;;
+
+'restart')
+ $0 stop && $0 start
+
+ ;;
+
+*)
+ echo "usage: $0 { start | stop | restart }"
+
+ ;;
+
+esac
+
diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-taskbar/opie-taskbar/opie
index 88bfd4fd34..0d9452523e 100755
--- a/packages/opie-taskbar/opie-taskbar/opie
+++ b/packages/opie-taskbar/opie-taskbar/opie
@@ -3,13 +3,11 @@
[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
[ -z $HOME ] && export HOME=/home/$LOGNAME
-export QWS_DISPLAY=Transformed:Rot0:0
export QTDIR=/opt/QtPalmtop
export OPIEDIR=/opt/QtPalmtop
export QPEDIR=/opt/QtPalmtop
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
export PATH=$PATH:$OPIEDIR/bin
-# export QWS_KEYBOARD=KernelTTY
if [ ! -x "$OPIEDIR/bin/qpe" ] ; then
echo Opie not installed
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index f1fd277a9e..ad403c09f1 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,7 +1,7 @@
include ${PN}.inc
PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r5"
+PR = "r6"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \