From ba3d604b4b0c9f6d6976d3bacddd7b1244a83f66 Mon Sep 17 00:00:00 2001
From: "Andreas V. 'netrunner' Meier" <avmeier@web.de>
Date: Mon, 1 Aug 2005 15:49:45 +0000
Subject: [PATCH] Andreas V. Meier: 	 bootsplash: change linux .config
 appending method to use a confscript

[2005071216050420174] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6277 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/avm/bootsplash/kernelconfig.sh     | 10 ++++++++++
 package/avm/bootsplash/pkg_config_linux.in | 16 ----------------
 package/avm/bootsplash/pkg_linux_pre.conf  |  1 +
 3 files changed, 11 insertions(+), 16 deletions(-)
 create mode 100644 package/avm/bootsplash/kernelconfig.sh

diff --git a/package/avm/bootsplash/kernelconfig.sh b/package/avm/bootsplash/kernelconfig.sh
new file mode 100644
index 000000000..c62782259
--- /dev/null
+++ b/package/avm/bootsplash/kernelconfig.sh
@@ -0,0 +1,10 @@
+if [ x"$ROCKCFG_PKG_LINUX_BOOTSPLASH" == x'1' ]; then
+	for x in CONFIG_{FRAMEBUFFER_CONSOLE,FBCON_SPLASHSCREEN,BOOTSPLASH}; do 
+		 sed -i "/$x/d" $1
+		 echo "$x=y" >> $1
+	done
+else
+	for x in CONFIG_{FRAMEBUFFER_CONSOLE,FBCON_SPLASHSCREEN,BOOTSPLASH}; do 
+		 sed -i "/$x/d" $1
+ 	done
+fi 
diff --git a/package/avm/bootsplash/pkg_config_linux.in b/package/avm/bootsplash/pkg_config_linux.in
index 663d20dfb..406900726 100644
--- a/package/avm/bootsplash/pkg_config_linux.in
+++ b/package/avm/bootsplash/pkg_config_linux.in
@@ -23,21 +23,5 @@
 if pkgcheck bootsplash X
 then
 	bool 'Patch the kernel with the bootsplash patch' ROCKCFG_PKG_LINUX_BOOTSPLASH 0
-	if [ ! x"$ROCKCFG_PKG_LINUX_CUSTCONFIG" == x"1" ]; then
-        comment "Please activate custom kernel configuration above"
-        comment " to activate bootsplash during kernel build"
-    fi
 
-	if [ x"$ROCKCFG_PKG_LINUX_BOOTSPLASH" == x'1' ]; then
-		for x in CONFIG_{FRAMEBUFFER_CONSOLE,FBCON_SPLASHSCREEN,BOOTSPLASH}; do 
-			 grep -s -v $x config/$config.$swpid/linux.cfg > config/$config.$swpid/linux.cfg.$$
-			 echo "$x=y" >> config/$config.$swpid/linux.cfg.$$
-			 mv config/$config.$swpid/linux.cfg.$$ config/$config.$swpid/linux.cfg
-		done
-	else
-		for x in CONFIG_{FRAMEBUFFER_CONSOLE,FBCON_SPLASHSCREEN,BOOTSPLASH}; do 
-	 	 	 grep -s -v $x config/$config.$swpid/linux.cfg > config/$config.$swpid/linux.cfg.$$
-	 	 	 mv config/$config.$swpid/linux.cfg.$$ config/$config.$swpid/linux.cfg
-	 	 done
-	fi 
 fi
diff --git a/package/avm/bootsplash/pkg_linux_pre.conf b/package/avm/bootsplash/pkg_linux_pre.conf
index 4bc8230ac..89f5d61e1 100644
--- a/package/avm/bootsplash/pkg_linux_pre.conf
+++ b/package/avm/bootsplash/pkg_linux_pre.conf
@@ -3,6 +3,7 @@ if [ "$ROCKCFG_PKG_LINUX_BOOTSPLASH" == '1' ]; then
 		  | awk 'BEGIN{FS="="}{print $2}')
 	var_remove patchfiles " " "$base/download/mirror/${bspatch:0:1}/$bspatch"
 	var_append patchfiles " " "$base/download/mirror/${bspatch:0:1}/$bspatch"
+	var_append confscripts " " "$base/package/avm/bootsplash/kernelconfig.sh"
 else
 	echo "No bootsplash in this config"
 fi