diff options
| author | Matthias Hentges <oe@hentges.net> | 2006-04-13 18:40:40 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-13 18:40:40 +0000 |
| commit | a20617a89a744f4521065324ebe33811a036b098 (patch) | |
| tree | f5187821a093a81611964d3221da5a48090f0e7f | |
| parent | 8519af8d84d717ca002b76b566d9d428c3c1b0b8 (diff) | |
gpe-bootsplash: Add changes from .oz354x
| -rw-r--r-- | packages/gpe-bootsplash/files/init.patch (renamed from packages/gpe-bootsplash/files/speed.patch) | 31 | ||||
| -rw-r--r-- | packages/gpe-bootsplash/files/tty2-message.patch | 19 | ||||
| -rw-r--r-- | packages/gpe-bootsplash/gpe-bootsplash_1.15.bb | 5 |
3 files changed, 22 insertions, 33 deletions
diff --git a/packages/gpe-bootsplash/files/speed.patch b/packages/gpe-bootsplash/files/init.patch index cc670d00e4..8e2cf750d4 100644 --- a/packages/gpe-bootsplash/files/speed.patch +++ b/packages/gpe-bootsplash/files/init.patch @@ -1,19 +1,28 @@ ---- gpe-bootsplash-1.15/gpe-bootsplash.init.orig 2006-02-19 14:34:22.404426869 +0100 -+++ gpe-bootsplash-1.15/gpe-bootsplash.init 2006-02-19 14:29:35.044269116 +0100 -@@ -32,14 +32,46 @@ +--- gpe-bootsplash-1.15/gpe-bootsplash.init.orig 2006-04-13 20:26:28.164825368 +0200 ++++ gpe-bootsplash-1.15/gpe-bootsplash.init 2006-04-13 20:25:28.620877424 +0200 +@@ -7,6 +7,8 @@ + + mount /proc 2>/dev/null + ++mount -o remount,rw / ++ + case $1 in + 'start') + case `module_id` in +@@ -31,8 +33,47 @@ + ;; esac echo "0" > /proc/sys/kernel/printk - -- # Clear tty2 ++ + # Clear tty2 - echo -e "\033c" > /dev/tty2 ++ echo -e "\033c" > /dev/tty2 + chvt 2 - - echo -e "\nLoading bootsplash..." > /dev/tty2 - echo "Use Fn-LeftArrow to see the boot messages." > /dev/tty2 - -- /usr/bin/gpe-bootsplash $ARGS || chvt 1 +- /usr/bin/gpe-bootsplash $ARGS ++ ++ echo -e "\nLoading bootsplash..." > /dev/tty2 ++ echo "Use Alt-LeftArrow to see the boot messages." > /dev/tty2 ++ + # Catch when the user has changed the symlinks manually (normally it doesn't matter which link we check + # as themes always update both of them + echo "$ARGS" | grep -q -- "--force-landscape" && source_link="splash-l.svg" || source_link="splash-p.svg" diff --git a/packages/gpe-bootsplash/files/tty2-message.patch b/packages/gpe-bootsplash/files/tty2-message.patch deleted file mode 100644 index 0c3b2d859b..0000000000 --- a/packages/gpe-bootsplash/files/tty2-message.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- gpe-bootsplash-1.15/gpe-bootsplash.init.orig 2006-02-12 19:36:10.600838563 +0100 -+++ gpe-bootsplash-1.15/gpe-bootsplash.init 2006-02-12 19:36:13.957218949 +0100 -@@ -31,8 +31,15 @@ - ;; - esac - echo "0" > /proc/sys/kernel/printk -+ -+ # Clear tty2 -+ echo -e "\033c" > /dev/tty2 - chvt 2 -- /usr/bin/gpe-bootsplash $ARGS -+ -+ echo -e "\nLoading bootsplash..." > /dev/tty2 -+ echo "Use Fn-LeftArrow to see the boot messages." > /dev/tty2 -+ -+ /usr/bin/gpe-bootsplash $ARGS || chvt 1 - ;; - 'stop') - ;; diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb index 761a0500c7..61dea1d847 100644 --- a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb +++ b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb @@ -5,12 +5,11 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" -PR = "r4" +PR = "r5" SRC_URI += "file://splash-p.svg \ file://splash-l.svg \ - file://tty2-message.patch;patch=1 \ - file://speed.patch;patch=1" + file://init.patch;patch=1" FILES_${PN} += "${datadir}/gpe" |