diff options
| author |   Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-04 17:28:21 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-04 17:28:21 +0000 |
| commit | 65243f6d4cdc40014ed82b4931812bbcdf4f85a7 (patch) | |
| tree | a93d2a5115314db7d590496772f3eb3e594699af | |
| parent | d814f97a4f6520753f76aa4dcbe1a2599ca8fc30 (diff) | |
| download | openembedded-65243f6d4cdc40014ed82b4931812bbcdf4f85a7.tar.gz | |
opie-init: Update for FHS-compatible OPIE install.
* Per #2254.
| -rwxr-xr-x | packages/opie-init/opie-init/opie | 20 | ||||
| -rw-r--r-- | packages/opie-init/opie-init_1.2.2.bb | 2 |
2 files changed, 8 insertions, 14 deletions
diff --git a/packages/opie-init/opie-init/opie b/packages/opie-init/opie-init/opie index 248ec464da..4a90854507 100755 --- a/packages/opie-init/opie-init/opie +++ b/packages/opie-init/opie-init/opie @@ -9,9 +9,9 @@ export QPEDIR="$QTDIR" export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib export PATH=$PATH:$OPIEDIR/bin -if [ ! -x "$OPIEDIR/bin/qpe" ] ; then +if [ -z `which qpe` ] ; then echo Opie not installed - exit 0 + exit 0 fi . /etc/profile @@ -34,14 +34,8 @@ if [ ! -e "$HOME/systeminfo/linkver" ] ; then 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 - # Turn off psplash if any - sleep is required for anti-race if [ -e /mnt/.psplash ]; then TMPDIR=/mnt/.psplash psplash-write "QUIT" || true @@ -52,7 +46,7 @@ case $1 in echo Starting Opie-login.... $OPIEDIR/bin/opie-login -terminal 3 else - $OPIEDIR/bin/opie-reorgfiles + opie-reorgfiles if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh @@ -60,15 +54,15 @@ case $1 in echo Starting Opie.... ( test -x /usr/bin/ssh-agent && eval $(/usr/bin/ssh-agent -s) && echo $SSH_AGENT_PID>/var/run/opie-ssh-agent.pid ; - $OPIEDIR/bin/qpe -terminal 3 + qpe -terminal 3 ) echo -n >/var/log/opie-qss.log - test -x $OPIEDIR/bin/qpe && { for attempt in 0 1 2 3 4 5 6 7 8 9 a b c d e f ; do + { for attempt in 0 1 2 3 4 5 6 7 8 9 a b c d e f ; do sleep 1 echo "Waiting for qcop to startup: $attempt ..." >>/var/log/opie-qss.log - $OPIEDIR/bin/qcop QPE/System 'ping()' || continue + qcop QPE/System 'ping()' || continue echo "Starting qss" >>/var/log/opie-qss.log - $OPIEDIR/bin/qss </dev/null >>/var/log/opie-qss.log 2>&1 + qss </dev/null >>/var/log/opie-qss.log 2>&1 echo "qss exited, will try to restart" >>/var/log/opie-qss.log done; rm /var/run/opie-qss-loop.pid; } & echo $! >/var/run/opie-qss-loop.pid diff --git a/packages/opie-init/opie-init_1.2.2.bb b/packages/opie-init/opie-init_1.2.2.bb index 419221609a..9a56f87179 100644 --- a/packages/opie-init/opie-init_1.2.2.bb +++ b/packages/opie-init/opie-init_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r5" +PR = "r6" SRC_URI = "file://opie-reorgfiles \ file://opie \ |