[oe-commits] org.oe.dev psplash svn: Use standard OE init.d library for machine detection.

[pfalcon commit]

psplash svn: Use standard OE init.d library for machine detection.
* Fixes #3471.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: cd5d3c7e2ef73f5f2659e33fcb91e8e40b2560cf
ViewMTN: http://monotone.openembedded.org/revision/info/cd5d3c7e2ef73f5f2659e33fcb91e8e40b2560cf
Files:
1
packages/psplash/files/psplash-init
packages/psplash/psplash_svn.bb
Diffs:

#
# mt diff -rbc06ee21e625dd14292d455d2a082ea263ff1214 -rcd5d3c7e2ef73f5f2659e33fcb91e8e40b2560cf
#
# 
# 
# patch "packages/psplash/files/psplash-init"
#  from [920674c4b9876275351f49712ab0fa731a6ca7a9]
#    to [3482232dc7507af93bf74c94d86bd4f75c1bf2a3]
# 
# patch "packages/psplash/psplash_svn.bb"
#  from [4e90d427d5ad257ee0faf49f0e087779364df998]
#    to [b698aff22a0110395efea1fa894814aa903d798e]
# 
============================================================
--- packages/psplash/files/psplash-init	920674c4b9876275351f49712ab0fa731a6ca7a9
+++ packages/psplash/files/psplash-init	3482232dc7507af93bf74c94d86bd4f75c1bf2a3
@@ -9,10 +9,14 @@ done
         esac
 done
 
+. /etc/init.d/functions
+
 psplash_args=''
-case "`grep ^Hardware /proc/cpuinfo|cut -d: -f2 |tr A-Z a-z`" in
- "hp ipaq h3100"|"hp ipaq h3800") pspash_args='-a 90' ;;
- "hp ipaq 3600"|"hp ipaq 3700"|"hp ipaq h3900"|"htc universal"|*collie|*poodle|*akita|*spitz|*borzoi) psplash_args='-a 270' ;;
+case `machine_id` in
+    "hp_ipaq_h3100"|"hp_ipaq_h3800") 
+	pspash_args='-a 90' ;;
+    "hp_ipaq_3600"|"hp_ipaq_3700"|"hp_ipaq_h3900"|"htc_universal"|*collie|*poodle|*akita|*spitz|*borzoi)
+	psplash_args='-a 270' ;;
 esac
 
 export TMPDIR=/mnt/.psplash
@@ -20,4 +24,5 @@ mount tmpfs -t tmpfs $TMPDIR -o,size=40k
 
 /usr/bin/psplash $psplash_args &
 
+# Timetrap against hanging with splash hiding console messages.
 (sleep 120; psplash-write "QUIT") &
============================================================
--- packages/psplash/psplash_svn.bb	4e90d427d5ad257ee0faf49f0e087779364df998
+++ packages/psplash/psplash_svn.bb	b698aff22a0110395efea1fa894814aa903d798e
@@ -1,9 +1,10 @@ PV = "0.0+svnr${SRCREV}"
 DESCRIPTION = "Userspace framebuffer boot logo based on usplash."
 HOMEPAGE = "http://projects.o-hand.com/psplash"
 SECTION = "base"
 LICENSE = "GPL"
 PV = "0.0+svnr${SRCREV}"
-PR = "r11"
+PR = "r12"
+RDEPENDS = "initscripts"
 
 # You can create your own pslash-hand-img.h by doing
 # ./make-image-header.sh <file>.png HAND