Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev

3 files changed, 67 insertions, 1 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index bd78008dd0..60d53abc71 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -111,7 +111,7 @@ SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxcalibrate ?= "209d83af61ed38a002c8096377deac292b3e396c"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-bfin ?= "3758"
-SRCREV_pn-linux-bug ?= "8996"
+SRCREV_pn-linux-bug ?= "9110"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1089"
 SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
diff --git a/recipes/fbprogress/fbprogress/fbprogress-init b/recipes/fbprogress/fbprogress/fbprogress-init
new file mode 100755
index 0000000000..c1dd3787b1
--- /dev/null
+++ b/recipes/fbprogress/fbprogress/fbprogress-init
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+. /etc/init.d/functions
+
+case "$1" in
+    start)
+    # We don't want this script to block the rest of the boot process
+    if [ "$2" != "background" ]; then
+	$0 $1 background &
+    else
+	. /etc/profile
+
+	echo "Starting FBProgress"
+	fbprogress.sh &
+    fi 
+    ;;
+
+    stop)
+    echo "Stopping FBProgress"
+    killproc fbprogress.sh
+    ;;
+
+    restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+
+    *)
+    echo "usage: $0 { start | stop | restart }"
+    ;;
+esac
+
+exit 0
diff --git a/recipes/fbprogress/fbprogress_1.1.bb b/recipes/fbprogress/fbprogress_1.1.bb
new file mode 100644
index 0000000000..8d603b8a3e
--- /dev/null
+++ b/recipes/fbprogress/fbprogress_1.1.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Bug framebuffer progress indicator"
+AUTHOR = "Angel Roman"
+HOMEPAGE = "http://www.buglabs.net/"
+LICENSE = "GPL"
+DEPENDS = "freetype zlib virtual/kernel"
+SRCREV = "9118"
+PR = "r1"
+
+SRC_URI = "svn://svn.buglabs.net/bug/trunk;module=com.buglabs.bug.native.fbprogress;proto=svn \
+           file://fbprogress-init"
+
+S = "${WORKDIR}/com.buglabs.bug.native.fbprogress"
+
+inherit update-rc.d
+
+EXTRA_OEMAKE = "BUG_LINUX_SRC=${STAGING_KERNEL_DIR}"
+
+do_install() {
+  install -d ${D}/${sysconfdir}/fbprogress
+  install -m 0644 ${S}/images/* ${D}/${sysconfdir}/fbprogress/
+  install -d ${D}${layout_bindir}
+  install -m 0755 fbprogress ${D}${layout_bindir}
+  install -m 0755 fbprogress.sh ${D}${layout_bindir}
+  install -d ${D}/${sysconfdir}/init.d
+  install -m 0755 ${WORKDIR}/fbprogress-init ${D}/${sysconfdir}/init.d/fbprogress
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "bug"
+
+INITSCRIPT_NAME = "fbprogress"
+INITSCRIPT_PARAMS = "start 01 S . stop 15  0 1 2 3 4 5 6 ."