From a20617a89a744f4521065324ebe33811a036b098 Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Thu, 13 Apr 2006 18:40:40 +0000
Subject: gpe-bootsplash: Add changes from .oz354x

---
 packages/gpe-bootsplash/files/init.patch         | 60 ++++++++++++++++++++++++
 packages/gpe-bootsplash/files/speed.patch        | 51 --------------------
 packages/gpe-bootsplash/files/tty2-message.patch | 19 --------
 3 files changed, 60 insertions(+), 70 deletions(-)
 create mode 100644 packages/gpe-bootsplash/files/init.patch
 delete mode 100644 packages/gpe-bootsplash/files/speed.patch
 delete mode 100644 packages/gpe-bootsplash/files/tty2-message.patch

(limited to 'packages/gpe-bootsplash/files')

diff --git a/packages/gpe-bootsplash/files/init.patch b/packages/gpe-bootsplash/files/init.patch
new file mode 100644
index 0000000000..8e2cf750d4
--- /dev/null
+++ b/packages/gpe-bootsplash/files/init.patch
@@ -0,0 +1,60 @@
+--- 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 	
++	echo -e "\033c" > /dev/tty2
++	
+ 	chvt 2
+-	/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" 
++
++	# echo "[`cat /etc/bootsplash.name`] = [`readlink /usr/share/gpe/$source_link`]"
++
++	# bootsplash takes quite some time to load external images into an svg file.
++	# We speed things up by dumping the content of fb0, and catting it back (which works instantly)
++	if test -e /etc/bootsplash.raw.gz -a "`cat /etc/bootsplash.name`" = "`readlink /usr/share/gpe/$source_link`"			
++	then
++		echo -e "\nUsing /etc/bootsplash.raw.gz...." > /dev/tty2
++		sleep 1
++
++		# Turn off the cursor on tty2
++		echo -e "\033[?25l\000" > /dev/tty2 
++
++		zcat /etc/bootsplash.raw.gz > /dev/fb0
++	else
++		rm -f /etc/bootsplash.*
++		# Store the symlinks name as an indication which theme is used at the time we dump the image
++		if (/usr/bin/gpe-bootsplash $ARGS)
++		then			
++			readlink /usr/share/gpe/$source_link > /etc/bootsplash.name
++			
++			cat /dev/fb0 | gzip >/etc/bootsplash.raw.gz
++		else
++			echo -e "\nNOTE: gpe-bootsplash failed to start" >/dev/tty2
++			sleep 3
++			chvt 1
++		fi
++		
++	fi	
+ 	;;
+ 'stop')
+ ;;
diff --git a/packages/gpe-bootsplash/files/speed.patch b/packages/gpe-bootsplash/files/speed.patch
deleted file mode 100644
index cc670d00e4..0000000000
--- a/packages/gpe-bootsplash/files/speed.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- 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 @@
- 	esac
- 	echo "0" > /proc/sys/kernel/printk
- 
--	# Clear tty2 
-+	# Clear 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
-+	# 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" 
-+
-+	# echo "[`cat /etc/bootsplash.name`] = [`readlink /usr/share/gpe/$source_link`]"
-+
-+	# bootsplash takes quite some time to load external images into an svg file.
-+	# We speed things up by dumping the content of fb0, and catting it back (which works instantly)
-+	if test -e /etc/bootsplash.raw.gz -a "`cat /etc/bootsplash.name`" = "`readlink /usr/share/gpe/$source_link`"			
-+	then
-+		echo -e "\nUsing /etc/bootsplash.raw.gz...." > /dev/tty2
-+		sleep 1
-+
-+		# Turn off the cursor on tty2
-+		echo -e "\033[?25l\000" > /dev/tty2 
-+
-+		zcat /etc/bootsplash.raw.gz > /dev/fb0
-+	else
-+		rm -f /etc/bootsplash.*
-+		# Store the symlinks name as an indication which theme is used at the time we dump the image
-+		if (/usr/bin/gpe-bootsplash $ARGS)
-+		then			
-+			readlink /usr/share/gpe/$source_link > /etc/bootsplash.name
-+			
-+			cat /dev/fb0 | gzip >/etc/bootsplash.raw.gz
-+		else
-+			echo -e "\nNOTE: gpe-bootsplash failed to start" >/dev/tty2
-+			sleep 3
-+			chvt 1
-+		fi
-+		
-+	fi	
- 	;;
- 'stop')
- ;;
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')
- ;;
-- 
cgit v1.2.3