[oe-commits] org.oe.dev opie-init: Update for FHS-compatible OPIE install.

[pfalcon commit]

opie-init: Update for FHS-compatible OPIE install.
* Per #2254.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 4ad1e0d9686431cd8abd1dd833cffa49a8020e0b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4ad1e0d9686431cd8abd1dd833cffa49a8020e0b
Files:
1
packages/opie-init/opie-init/opie
packages/opie-init/opie-init_1.2.2.bb
Diffs:

#
# mt diff -rd0c8c40d8fb0111f854584d564a2fd6a45606f96 -r4ad1e0d9686431cd8abd1dd833cffa49a8020e0b
#
# 
# 
# patch "packages/opie-init/opie-init/opie"
#  from [939a977703c5c993189c8355d175b621bfe71969]
#    to [73b9b430d7e84543dc155768280a0637d7dd4175]
# 
# patch "packages/opie-init/opie-init_1.2.2.bb"
#  from [c2c9de8c7dd613b8f7b3b095200bb476c7bddaf9]
#    to [498d6c9f6e35eb30079cd3afd4685d82291df346]
# 
============================================================
--- packages/opie-init/opie-init/opie	939a977703c5c993189c8355d175b621bfe71969
+++ packages/opie-init/opie-init/opie	73b9b430d7e84543dc155768280a0637d7dd4175
@@ -9,9 +9,9 @@ export PATH=$PATH:$OPIEDIR/bin
 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 @@ fi
     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
============================================================
--- packages/opie-init/opie-init_1.2.2.bb	c2c9de8c7dd613b8f7b3b095200bb476c7bddaf9
+++ packages/opie-init/opie-init_1.2.2.bb	498d6c9f6e35eb30079cd3afd4685d82291df346
@@ -1,5 +1,5 @@ require ${PN}.inc
 require ${PN}.inc
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "file://opie-reorgfiles \
            file://opie \