From 10d4607154b1b582cd5debd65709dc9a0ee29343 Mon Sep 17 00:00:00 2001 From: "Andreas V. 'netrunner' Meier" Date: Mon, 1 Aug 2005 15:49:15 +0000 Subject: [PATCH] Andreas V. Meier: bootsplash: correct kernel build adoptions bootsplash: insert configuration option to kernel config menu bootsplash: update kernel patch [2005062314222311425] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6275 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/avm/bootsplash/bootsplash.desc | 5 ++- .../{config.in => pkg_config_linux.in} | 37 +++++++++---------- package/avm/bootsplash/pkg_linux24_pre.conf | 6 --- package/avm/bootsplash/pkg_linux_pre.conf | 8 ++++ 4 files changed, 30 insertions(+), 26 deletions(-) rename package/avm/bootsplash/{config.in => pkg_config_linux.in} (54%) delete mode 100644 package/avm/bootsplash/pkg_linux24_pre.conf create mode 100644 package/avm/bootsplash/pkg_linux_pre.conf diff --git a/package/avm/bootsplash/bootsplash.desc b/package/avm/bootsplash/bootsplash.desc index 63af46d57..720f3a15a 100644 --- a/package/avm/bootsplash/bootsplash.desc +++ b/package/avm/bootsplash/bootsplash.desc @@ -47,7 +47,10 @@ # [D] 4180078131 bootsplash-3.0.7.tar.bz2 ftp://ftp.suse.com/pub/people/stepan/bootsplash/rpm-sources/bootsplash/ [D] 4193909748 bootsplash-3.1.tar.bz2 http://www.bootsplash.de/files/splashutils/ [D] 2757340655 bootsplash-3.0.7-2.4.29-vanilla.diff http://home.in.tum.de/~meiera/projects/rocklinux/download/avm/bootsplash/ -[D] 1662900720 bootsplash-3.1.4-2.6.10.diff http://www.bootsplash.de/files/ +[D] 2565020399 bootsplash-3.0.7-2.4.29.diff http://www.bootsplash.de/files/old/ +[O] bspatchlinux24=bootsplash-3.0.7-2.4.29.diff +[D] 3994465730 bootsplash-3.1.6-2.6.12.diff http://www.bootsplash.de/files/ +[O] bspatchlinux26=bootsplash-3.1.6-2.6.12.diff [D] 136525566 Theme-Linux.tar.bz2 ftp://ftp.suse.com/pub/people/stepan/bootsplash/themes/ [D] 413833771 Theme-Redmond.tar.bz2 ftp://ftp.suse.com/pub/people/stepan/bootsplash/themes/ [D] 4212729406 Theme-Leopard.tar.bz2 ftp://ftp.suse.com/pub/people/stepan/bootsplash/themes/ diff --git a/package/avm/bootsplash/config.in b/package/avm/bootsplash/pkg_config_linux.in similarity index 54% rename from package/avm/bootsplash/config.in rename to package/avm/bootsplash/pkg_config_linux.in index be7dbad00..663d20dfb 100644 --- a/package/avm/bootsplash/config.in +++ b/package/avm/bootsplash/pkg_config_linux.in @@ -22,23 +22,22 @@ if pkgcheck bootsplash X then - menu_begin MENU_PKG_BOOTSPLASH 'BOOTSPLASH Options' - bool 'Patch the kernel with the bootsplash patch' ROCKCFG_KERNEL_BOOTSPLASH 0 - comment 'Please also activate the "Apply custom kernel build configuration"' - comment 'setting (you find it under Linux Kernel Options)' - - if [ $ROCKCFG_KERNEL_BOOTSPLASH == '1' ]; then - for x in CONFIG_FBCON_SPLASHSCREEN ; 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_FBCON_SPLASHSCREEN ; do - grep -s -v $x config/$config.$swpid/linux.cfg > config/$config.$swpid/linux.cfg.$$ - # echo "$x=n" >> config/$config.$swpid/linux.cfg.$$ - mv config/$config.$swpid/linux.cfg.$$ config/$config.$swpid/linux.cfg - done - fi - menu_end + 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_linux24_pre.conf b/package/avm/bootsplash/pkg_linux24_pre.conf deleted file mode 100644 index 14d339655..000000000 --- a/package/avm/bootsplash/pkg_linux24_pre.conf +++ /dev/null @@ -1,6 +0,0 @@ -if [ "$ROCKCFG_KERNEL_BOOTSPLASH" == '1' ] ; then - echo_status "Including Bootsplash Patch for version ${ver}" - bootsplash_patch=$base/download/mirror/b/bootsplash-3.0.7-${ver}-vanilla.diff - var_remove patchfiles " " "$bootsplash_patch" - var_append patchfiles " " "$bootsplash_patch" -fi diff --git a/package/avm/bootsplash/pkg_linux_pre.conf b/package/avm/bootsplash/pkg_linux_pre.conf new file mode 100644 index 000000000..4bc8230ac --- /dev/null +++ b/package/avm/bootsplash/pkg_linux_pre.conf @@ -0,0 +1,8 @@ +if [ "$ROCKCFG_PKG_LINUX_BOOTSPLASH" == '1' ]; then + bspatch=$(grep bspatch${xpkg:0:7} $base/package/avm/bootsplash/bootsplash.desc\ + | 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" +else + echo "No bootsplash in this config" +fi