Renamed gensplash to splash and marked gensplash as deprecated. This is 3.4.9_pre3...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@536 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index 506d888e67a89ce175f6c375ef7d10785e69ea19..fa21470cfb76ea86d5a59237254d61536b342899 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
+  gen_configkernel.sh, gen_determineargs.sh, gen_initramfs.sh, genkernel,
+  genkernel.8, mips/config.sh:
+  Renamed gensplash to splash and marked gensplash as deprecated. This is
+  3.4.9_pre3 for testing.
+
   17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> TODO,
   alpha/modules_load, gen_cmdline.sh, gen_compile.sh, gen_configkernel.sh,
   gen_determineargs.sh, gen_initramfs.sh, gen_initrd.sh,

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 44415cab3269ebddfc2f1d846a234afd5642fe26..f7c8adbb23c1897ed37960fe5de910e64cb5798a 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -30,8 +30,9 @@ longusage() {
   echo "       --no-clean              Do not run make clean before compilation"
   echo "       --no-mrproper           Do not run make mrproper before compilation"
   echo "       --oldconfig             Implies --no-clean and runs a 'make oldconfig'"
-  echo "       --gensplash             Install gensplash support into bzImage"
-  echo "       --no-gensplash          Do not use gensplash"
+  echo "       --gensplash             Install framebuffer splash support into initramfs"
+  echo "       --splash                Install framebuffer splash support into initramfs"
+  echo "       --no-splash             Do not install framebuffer splash"
   echo "       --install               Install the kernel after building"
   echo "       --no-install            Do not install the kernel after building"
   echo "       --symlink               Manage symlinks in /boot for installed images"
@@ -65,8 +66,10 @@ longusage() {
   echo "       --no-mountboot          Don't mount BOOTDIR automatically"  
   echo "       --bootdir=<dir>         Set the location of the boot-directory, default is /boot"
   echo "  Initialization"
-  echo "       --gensplash=<theme>     Force gensplash using <theme>"
-  echo "       --gensplash-res=<res>   Select gensplash resolutions"
+  echo "       --gensplash=<theme>     Enable framebuffer splash using <theme>"
+  echo "       --gensplash-res=<res>   Select splash theme resolutions to install"
+  echo "       --splash=<theme>        Enable framebuffer splash using <theme>"
+  echo "       --splash-res=<res>      Select splash theme resolutions to install"
   echo "       --do-keymap-auto        Forces keymap selection at boot"
   echo "       --evms                  Include EVMS support"
   echo "                               --> 'emerge evms' in the host operating system"
@@ -315,23 +318,44 @@ parse_cmdline() {
                      print_info 2 "CMD_OLDCONFIG: ${CMD_OLDCONFIG}"
              ;;
              --gensplash=*)
-                     CMD_GENSPLASH=1
-                     GENSPLASH_THEME=`parse_opt "$*"`
-                     print_info 2 "CMD_GENSPLASH: ${CMD_GENSPLASH}"
-                     print_info 2 "GENSPLASH_THEME: ${GENSPLASH_THEME}"
+                     CMD_SPLASH=1
+                     SPLASH_THEME=`parse_opt "$*"`
+                     print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
+                     print_info 2 "SPLASH_THEME: ${SPLASH_THEME}"
+                         echo
+                         print_warning 1 "Please use --splash, as --gensplash is deprecated."
              ;;
              --gensplash)
-                     CMD_GENSPLASH=1
-                     GENSPLASH_THEME='default'
-                     print_info 2 "CMD_GENSPLASH: ${CMD_GENSPLASH}"
+                     CMD_SPLASH=1
+                     SPLASH_THEME='default'
+                     print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
+                         echo
+                         print_warning 1 "Please use --splash, as --gensplash is deprecated."
+             ;;
+             --splash=*)
+                     CMD_SPLASH=1
+                     SPLASH_THEME=`parse_opt "$*"`
+                     print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
+                     print_info 2 "SPLASH_THEME: ${SPLASH_THEME}"
              ;;
-             --no-gensplash)
-                     CMD_GENSPLASH=0
-                     print_info 2 "CMD_GENSPLASH: ${CMD_GENSPLASH}"
+             --splash)
+                     CMD_SPLASH=1
+                     SPLASH_THEME='default'
+                     print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
+             ;;
+             --no-splash)
+                     CMD_SPLASH=0
+                     print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
              ;;
              --gensplash-res=*)
-                     GENSPLASH_RES=`parse_opt "$*"`
-                     print_info 2 "GENSPLASH_RES: ${GENSPLASH_RES}"
+                     SPLASH_RES=`parse_opt "$*"`
+                     print_info 2 "SPLASH_RES: ${SPLASH_RES}"
+                         echo
+                         print_warning 1 "Please use --splash-res, as --gensplash-res is deprecated."
+             ;;
+             --splash-res=*)
+                     SPLASH_RES=`parse_opt "$*"`
+                     print_info 2 "SPLASH_RES: ${SPLASH_RES}"
              ;;
              --install)
                      CMD_NOINSTALL=0

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 5f9ef2f9006fb7278539b0dc4d15048f488cbdb1..7d71e70ca229f867d09db80a5f2c68c2d2e1a034 100644 (file)
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -116,7 +116,7 @@ config_kernel() {
                sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM is.*/CONFIG_BLK_DEV_DM=m/g'
        fi
 
-       if isTrue ${GENSPLASH}
+       if isTrue ${SPLASH}
        then
                sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_FB_SPLASH is.*/CONFIG_FB_SPLASH=y/g'
        fi

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index a1a3f7b8ec681821115d20906ee9dfceb6777b77..7f6986b10123b7f7770bc81460e2391eb698cf39 100644 (file)
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -216,16 +216,16 @@ determine_real_args() {
        UNIONFS_MODULES_BINCACHE=`arch_replace "${UNIONFS_MODULES_BINCACHE}"`
        BLKID_BINCACHE=`arch_replace "${BLKID_BINCACHE}"`
        
-       if [ "${CMD_GENSPLASH}" != '' ]
+       if [ "${CMD_SPLASH}" != '' ]
        then
-               GENSPLASH=${CMD_GENSPLASH}
+               SPLASH=${CMD_SPLASH}
        fi
 
-       if isTrue ${GENSPLASH}
+       if isTrue ${SPLASH}
        then
-               GENSPLASH=1
+               SPLASH=1
        else
-               GENSPLASH=0
+               SPLASH=0
        fi
 
        if isTrue ${COMPRESS_INITRD}

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index b8594d4b382b7bba54862383cde6baaaec5214bb..ae410833ebc6097e5440ef5803b5c5dde305fa32 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -226,29 +226,29 @@ append_evms(){
        rm -r "${TEMP}/initramfs-evms-temp/"
 }
 
-append_gensplash(){
+append_splash(){
        if [ -x /usr/bin/splash_geninitramfs ] || [ -x /sbin/splash_geninitramfs ]
        then
-               [ -z "${GENSPLASH_THEME}" ] && [ -e /etc/conf.d/splash ] && source /etc/conf.d/splash
-               [ -z "${GENSPLASH_THEME}" ] && GENSPLASH_THEME=default
-               print_info 1 "  >> Installing gensplash [ using the ${GENSPLASH_THEME} theme ]..."
-               if [ -d "${TEMP}/initramfs-gensplash-temp" ]
+               [ -z "${SPLASH_THEME}" ] && [ -e /etc/conf.d/splash ] && source /etc/conf.d/splash
+               [ -z "${SPLASH_THEME}" ] && SPLASH_THEME=default
+               print_info 1 "  >> Installing splash [ using the ${SPLASH_THEME} theme ]..."
+               if [ -d "${TEMP}/initramfs-splash-temp" ]
                then
-                       rm -r "${TEMP}/initramfs-gensplash-temp/"
+                       rm -r "${TEMP}/initramfs-splash-temp/"
                fi
-               mkdir -p "${TEMP}/initramfs-gensplash-temp"
+               mkdir -p "${TEMP}/initramfs-splash-temp"
                cd /
                local tmp=""
-               [ -n "${GENSPLASH_RES}" ] && tmp="-r ${GENSPLASH_RES}"
-               splash_geninitramfs -c "${TEMP}/initramfs-gensplash-temp" ${tmp} ${GENSPLASH_THEME} || gen_die "Could not build splash cpio archive"
+               [ -n "${SPLASH_RES}" ] && tmp="-r ${SPLASH_RES}"
+               splash_geninitramfs -c "${TEMP}/initramfs-splash-temp" ${tmp} ${SPLASH_THEME} || gen_die "Could not build splash cpio archive"
                if [ -e "/usr/share/splashutils/initrd.splash" ]; then
-                       mkdir -p "${TEMP}/initramfs-gensplash-temp/etc"
-                       cp -f "/usr/share/splashutils/initrd.splash" "${TEMP}/initramfs-gensplash-temp/etc"
+                       mkdir -p "${TEMP}/initramfs-splash-temp/etc"
+                       cp -f "/usr/share/splashutils/initrd.splash" "${TEMP}/initramfs-splash-temp/etc"
                fi
-               cd "${TEMP}/initramfs-gensplash-temp/"
+               cd "${TEMP}/initramfs-splash-temp/"
                find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
                        || gen_die "compressing splash cpio"
-               rm -r "${TEMP}/initramfs-gensplash-temp/"
+               rm -r "${TEMP}/initramfs-splash-temp/"
        else
                print_warning 1 '               >> No splash detected; skipping!'
        fi
@@ -445,7 +445,7 @@ create_initramfs() {
        fi
 
        append_data 'blkid' "${DISKLABEL}"
-       append_data 'gensplash' "${GENSPLASH}"
+       append_data 'splash' "${SPLASH}"
 
        # This should always be appended last
        if [ "${INITRAMFS_OVERLAY}" != '' ]

diff --git a/genkernel b/genkernel
index 2feab05ee93e21a0f7983a0ce0b516ac57c6f8e8..a4fc1de4390620af5650b977821f403be0ae09eb 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # Genkernel v3
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-GK_V='3.4.9_pre2'
+GK_V='3.4.9_pre3'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.
@@ -375,7 +375,7 @@ then
        echo
        print_info 1 'WARNING... WARNING... WARNING...'
        print_info 1 'Additional kernel cmdline arguments that *may* be required to boot properly...'
-       [ "${GENSPLASH}" -eq '1' ] && print_info 1 "add \"vga=791 splash=silent,theme:${GENSPLASH_THEME} console=tty1 quiet\" if you use a gensplash framebuffer ]"
+       [ "${SPLASH}" -eq '1' ] && print_info 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"
        [ "${LVM}" -eq '1' ] && print_info 1 'add "dolvm" for lvm support'
        [ "${EVMS}" -eq '1' ] && print_info 1 'add "doevms" for evms support'
        [ "${DMRAID}" -eq '1' ] && print_info 1 'add "dodmraid" for dmraid support'

diff --git a/genkernel.8 b/genkernel.8
index badee596e2976fc6a64c2e71b4d04e708d166dfa..27a4b06f0e403126f32c2509ae825b6bccc5a440 100644 (file)
--- a/genkernel.8
+++ b/genkernel.8
@@ -175,14 +175,14 @@ module compilation stage of 2.4 series kernels to avoid bottlenecks; the
 .PP
 .BR Initialization
 .TP
-\fB\-\-\fR[no\-]\fBgensplash=\fR<theme>
-If the extra argument is specified, gensplash is forced using <theme>
-rather than the default theme specified in your gensplash
-configuration. If \fB\-\-no-gensplash\fR is specified, then
-gensplash is disabled.
-.TP
-\fB\-\-gensplash-res=\fR<resolutions>
-Optionally select gensplash resolutions to include.
+\fB\-\-\fR[no\-]\fBsplash=\fR<theme>
+If the extra argument is specified, splash is forced using <theme>
+rather than the default theme specified in your splash
+configuration. If \fB\-\-no-splash\fR is specified, then
+splash is disabled.
+.TP
+\fB\-\-splash-res=\fR<resolutions>
+Optionally select splash resolutions to include.
 .TP
 \fB\-\-do\-keymap\-auto\fR
 Force keymap selection at boot.

diff --git a/mips/config.sh b/mips/config.sh
index 57641b4c5861ca4c67f7dd6e768db5e338bae52e..f4822841062518dafc896f9b45990571e89bc53a 100644 (file)
--- a/mips/config.sh
+++ b/mips/config.sh
@@ -14,7 +14,6 @@ UTILS_LD=ld
 
 # Initrd/Initramfs Options
 COMPRESS_INITRD="yes"
-GENSPLASH=0
 USECOLOR="yes"
 NOINITRDMODULES="yes"
 BUSYBOX=1