[oe-commits] org.oe.dev opie-taskbar: init.d/opie: explicitly shut down psplash on opie start, plus

[pfalcon commit]

opie-taskbar: init.d/opie: explicitly shut down psplash on opie start, plus
allow it some time for that. Otherwise, there's race between psplash and
opie on some machines (seen on h3900), leading to opie hang. With this change,
opie *could* run on VT 2, but it appears that opie's GUI manager has off-by-one
error, causing it to not use last screen scanline, so old content is seen
there, which is unaesthetic. So, keep running opie on VT 3, which is empty.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 2db2306623cc91965ccb287d7e39b2bcd5c307fc
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2db2306623cc91965ccb287d7e39b2bcd5c307fc
Files:
1
packages/opie-taskbar/opie-taskbar/opie
packages/opie-taskbar/opie-taskbar_1.2.2.bb
packages/opie-taskbar/opie-taskbar_cvs.bb
Diffs:

#
# mt diff -rbbfe92716c8516623c7f965f29e1674c2d9b98dc -r2db2306623cc91965ccb287d7e39b2bcd5c307fc
#
# 
# 
# patch "packages/opie-taskbar/opie-taskbar/opie"
#  from [f52251e64faf0eaf38782170c37b7e229c6ef366]
#    to [50f787ececcbad2ec06a162bc1d84593003e8fec]
# 
# patch "packages/opie-taskbar/opie-taskbar_1.2.2.bb"
#  from [3203b6f23a8065318a8989c58efc8358693aac6d]
#    to [ceb69e883de07873bf98d3ee2a3c404d00655c5b]
# 
# patch "packages/opie-taskbar/opie-taskbar_cvs.bb"
#  from [543d69169649be22255403c61fa9b4f7f1f9f82e]
#    to [3365bf4ffb55550e8cd88ade69e4c5da1bd5ff58]
# 
============================================================
--- packages/opie-taskbar/opie-taskbar/opie	f52251e64faf0eaf38782170c37b7e229c6ef366
+++ packages/opie-taskbar/opie-taskbar/opie	50f787ececcbad2ec06a162bc1d84593003e8fec
@@ -41,6 +41,12 @@ case $1 in
 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
+        sleep 1
+    fi
     
     if [ -x "$OPIEDIR/bin/opie-login" ]; then
             echo Starting Opie-login....
============================================================
--- packages/opie-taskbar/opie-taskbar_1.2.2.bb	3203b6f23a8065318a8989c58efc8358693aac6d
+++ packages/opie-taskbar/opie-taskbar_1.2.2.bb	ceb69e883de07873bf98d3ee2a3c404d00655c5b
@@ -1,5 +1,5 @@ require ${PN}.inc
 require ${PN}.inc
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
============================================================
--- packages/opie-taskbar/opie-taskbar_cvs.bb	543d69169649be22255403c61fa9b4f7f1f9f82e
+++ packages/opie-taskbar/opie-taskbar_cvs.bb	3365bf4ffb55550e8cd88ade69e4c5da1bd5ff58
@@ -1,6 +1,6 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \