merge of '5744cdb7ad43a125c73b2dd57d51ded57a140c60'

     and 'be4a9a82ecf6de3dc409f7e421e00f48275630a4'

8 files changed, 46 insertions, 3 deletions

diff --git a/packages/fbset/fbset-init.bb b/packages/fbset/fbset-init.bb
new file mode 100644
index 0000000000..f04691d793
--- /dev/null
+++ b/packages/fbset/fbset-init.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Set framebuffer mode during boot"
+PR = "r1"
+
+SRC_URI = "file://fbset.sh file://default-fbset"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "fbset.sh"
+INITSCRIPT_PARAMS = "start 0 S ."
+
+do_install() {
+    install -d ${D}${sysconfdir}/init.d
+    install -d ${D}${sysconfdir}/default
+    install -m 0755 ${WORKDIR}/fbset.sh ${D}${sysconfdir}/init.d/
+    install -m 0644 ${WORKDIR}/default-fbset ${D}${sysconfdir}/default/fbset
+}
+
+PACKAGE_ARCH = "all"
+CONFFILES_${PN} = "${sysconfdir}/default/fbset"
diff --git a/packages/fbset/fbset-init/.mtn2git_empty b/packages/fbset/fbset-init/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fbset/fbset-init/.mtn2git_empty
diff --git a/packages/fbset/fbset-init/default-fbset b/packages/fbset/fbset-init/default-fbset
new file mode 100644
index 0000000000..5c163a7f7c
--- /dev/null
+++ b/packages/fbset/fbset-init/default-fbset
@@ -0,0 +1,3 @@
+# Uncomment and set value below to one of modes from /etc/fb.modes
+# or alternatively to "-xres <width> -yres <height>"
+#FBSET_MODE="vga"
diff --git a/packages/fbset/fbset-init/fbset.sh b/packages/fbset/fbset-init/fbset.sh
new file mode 100755
index 0000000000..900a1d4182
--- /dev/null
+++ b/packages/fbset/fbset-init/fbset.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+. /etc/default/fbset
+[ -n "$FBSET_MODE" ] && fbset -n $FBSET_MODE
diff --git a/packages/fbset/fbset-modes.bb b/packages/fbset/fbset-modes.bb
index 2724252125..403751c90a 100644
--- a/packages/fbset/fbset-modes.bb
+++ b/packages/fbset/fbset-modes.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Default display timings and resolutions for fbset"
 PV = "0.1.0"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "file://fb.modes"
 
diff --git a/packages/fbset/fbset-modes/qemuarm/.mtn2git_empty b/packages/fbset/fbset-modes/qemuarm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fbset/fbset-modes/qemuarm/.mtn2git_empty
diff --git a/packages/fbset/fbset-modes/qemuarm/fb.modes b/packages/fbset/fbset-modes/qemuarm/fb.modes
new file mode 100644
index 0000000000..1114564797
--- /dev/null
+++ b/packages/fbset/fbset-modes/qemuarm/fb.modes
@@ -0,0 +1,17 @@
+# QEMU versatilepb machine, qemuarm in OE
+
+mode "vga" "640x480"
+    geometry 640 480 640 480 16
+endmode
+
+mode "vga-portrait" "480x640"
+    geometry 480 640 480 640 16
+endmode
+
+mode "qvga" "320x240"
+    geometry 320 240 320 240 16
+endmode
+
+mode "qvga-portrait" "240x320"
+    geometry 240 320 240 320 16
+endmode
diff --git a/packages/psplash/psplash_svn.bb b/packages/psplash/psplash_svn.bb
index 17b459a15f..7e19ce3cbb 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 = "r12"
+PR = "r13"
 RDEPENDS = "initscripts"
 
 # You can create your own pslash-hand-img.h by doing
@@ -36,6 +36,6 @@ do_install_prepend() {
 }
 
 INITSCRIPT_NAME = "psplash"
-INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ."
+INITSCRIPT_PARAMS = "start 01 S . stop 20 0 1 6 ."
 
 FILES_${PN} += "/mnt/.psplash"