[oe-commits] Jeremy Lainé : psplash: add config file to pass parameters to psplash

[GIT User account]

Module: openembedded.git
Branch: john_lee/openmoko-toolchain
Commit: 35781184a69de7baf128f9bff1af185ccd3b4d53
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=35781184a69de7baf128f9bff1af185ccd3b4d53

Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Tue Dec 23 13:35:35 2008 +0100

psplash: add config file to pass parameters to psplash

---

 packages/psplash/files/boc01/psplash-default |    2 ++
 packages/psplash/files/psplash-default       |    2 ++
 packages/psplash/files/psplash-init          |    8 ++++----
 packages/psplash/psplash_svn.bb              |    5 ++++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/psplash/files/boc01/psplash-default b/packages/psplash/files/boc01/psplash-default
new file mode 100644
index 0000000..70677b1
--- /dev/null
+++ b/packages/psplash/files/boc01/psplash-default
@@ -0,0 +1,2 @@
+# Parameters to pass to psplash
+PARAMS="-n"
diff --git a/packages/psplash/files/psplash-default b/packages/psplash/files/psplash-default
new file mode 100644
index 0000000..a5a53d7
--- /dev/null
+++ b/packages/psplash/files/psplash-default
@@ -0,0 +1,2 @@
+# Parameters to pass to psplash
+PARAMS=""
diff --git a/packages/psplash/files/psplash-init b/packages/psplash/files/psplash-init
index 7f7eb36..7796a79 100644
--- a/packages/psplash/files/psplash-init
+++ b/packages/psplash/files/psplash-init
@@ -10,19 +10,19 @@ for x in $(cat /proc/cmdline); do
 done
 
 . /etc/init.d/functions
+. /etc/default/psplash
 
-psplash_args=''
 case `machine_id` in
     "hp_ipaq_h3100"|"hp_ipaq_h3800") 
-	pspash_args='-a 90' ;;
+	PARAMS='-a 90' ;;
     "hp_ipaq_3600"|"hp_ipaq_3700"|"hp_ipaq_h3900"|"htc_universal"|*collie|*poodle|*akita|*spitz|*borzoi)
-	psplash_args='-a 270' ;;
+	PARAMS='-a 270' ;;
 esac
 
 export TMPDIR=/mnt/.psplash
 mount tmpfs -t tmpfs $TMPDIR -o,size=40k
 
-/usr/bin/psplash $psplash_args &
+/usr/bin/psplash $PARAMS &
 
 # Timetrap against hanging with splash hiding console messages.
 (sleep 120; psplash-write "QUIT") &
diff --git a/packages/psplash/psplash_svn.bb b/packages/psplash/psplash_svn.bb
index 0fd3864..36c8b39 100644
--- a/packages/psplash/psplash_svn.bb
+++ b/packages/psplash/psplash_svn.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://projects.o-hand.com/psplash"
 SECTION = "base"
 LICENSE = "GPL"
 PV = "0.0+svnr${SRCREV}"
-PR = "r13"
+PR = "r14"
 RDEPENDS = "initscripts"
 
 # You can create your own pslash-hand-img.h by doing
@@ -15,6 +15,7 @@ RDEPENDS = "initscripts"
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \
           file://psplash-hand-img.h \
           file://psplash-bar-img.h \
+          file://psplash-default \
           file://psplash-init"
 S = "${WORKDIR}/psplash"
 
@@ -36,6 +37,8 @@ do_configure_append() {
 
 do_install_prepend() {
 	install -d ${D}/mnt/.psplash/
+	install -d ${D}${sysconfdir}/default/
+	install -m 0644 ${WORKDIR}/psplash-default ${D}${sysconfdir}/default/psplash
 	install -d ${D}${sysconfdir}/init.d/
 	install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash
 }