From 364336c8dce9ce1ead11a3d3a6a61b6ee775d2fa Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Mon, 17 Sep 2007 19:25:50 +0000 Subject: [PATCH] Removing bootsplash support since it hasn't been in a kernel we've supported for years now, causes confusion amongst users, and really wasn't being used and caused issues with 2.6/initrd creation in some corner cases. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@534 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- ChangeLog | 11 +++++++++++ README | 9 +-------- alpha/config.sh | 7 ------- gen_bootloader.sh | 4 +--- gen_cmdline.sh | 6 +----- gen_configkernel.sh | 4 ++-- gen_determineargs.sh | 12 ------------ gen_initrd.sh | 22 ---------------------- gen_package.sh | 2 +- genkernel | 5 ++--- genkernel.8 | 15 ++++----------- genkernel.conf | 3 --- ia64/config.sh | 6 ------ mips/config.sh | 2 -- parisc/config.sh | 6 ------ parisc64/config.sh | 5 ----- ppc/config.sh | 5 ----- ppc64/config.sh | 6 ------ sparc/config.sh | 6 ------ sparc64/config.sh | 6 ------ um/config.sh | 5 ----- x86/config.sh | 5 ----- x86_64/config.sh | 4 ---- xen0/config.sh | 5 ----- xenU/config.sh | 5 ----- 25 files changed, 23 insertions(+), 143 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3945092..6d96ce3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,17 @@ # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 17 Sep 2007; Chris Gianelloni README, + alpha/config.sh, gen_bootloader.sh, gen_cmdline.sh, gen_configkernel.sh, + gen_determineargs.sh, gen_initrd.sh, gen_package.sh, genkernel, + genkernel.8, genkernel.conf, ia64/config.sh, mips/config.sh, + parisc/config.sh, parisc64/config.sh, ppc/config.sh, ppc64/config.sh, + sparc/config.sh, sparc64/config.sh, um/config.sh, x86/config.sh, + x86_64/config.sh, xen0/config.sh, xenU/config.sh: + Removing bootsplash support since it hasn't been in a kernel we've supported + for years now, causes confusion amongst users, and really wasn't being used + and caused issues with 2.6/initrd creation in some corner cases. + 17 Sep 2007; Chris Gianelloni -pkg/genkernel-svn-suspend.patch: Removing the reversal patch for the suspend removal, since it will no longer diff --git a/README b/README index 8d7e9ea..f0be325 100644 --- a/README +++ b/README @@ -18,13 +18,6 @@ PORTING: IMPORTANT KERNEL NOTES: - You MUST have /dev/pts turned on. - - If you want Bootsplash, you MUST have VESAFB enabled for 2.6, - other framebuffers won't work. You MUST also enable - "video mode selection support" and "Framebuffer Console support" - - From gentoo-dev-sources-2.6.8 and above, bootsplash has been replaced - with gensplash. Gensplash has the same kernel configuration requirements - as bootsplash, but works properly with any framebuffer device. - - To build a kernel with Genkernel you must have "Block devices->Loopback device support" "Block devices->RAM disk support" - To boot genkernel properly, the kernel config must have @@ -38,7 +31,7 @@ BOOTING A KERNEL WITH INITRD: root= needs to point to the ramdisk (should stay at /dev/ram0) init= needs to point to the linuxrc file to execute on the ramdisk vga= should be the resolution you want your screen. 0x317 is - 1024x768 - 16bpp and you'll get a pretty bootsplash if + 1024x768 - 16bpp and you'll get a pretty splash if configured properly GRUB EXAMPLE ENTRY: diff --git a/alpha/config.sh b/alpha/config.sh index ed4ce83..65b05ad 100644 --- a/alpha/config.sh +++ b/alpha/config.sh @@ -1,14 +1,9 @@ #!/bin/bash -# x86/config.sh KERNEL_MAKE_DIRECTIVE="boot" KERNEL_MAKE_DIRECTIVE_2="" KERNEL_BINARY="arch/alpha/boot/vmlinux.gz" -# The dietlibc portion of busybox is commented out right now -# other stuff seems to compile fine though -USE_DIETLIBC=1 - [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" KERNEL_MAKE=make @@ -23,5 +18,3 @@ UTILS_AS=as UTILS_LD=ld COMPRESS_INITRD=yes - -BOOTSPLASH=no diff --git a/gen_bootloader.sh b/gen_bootloader.sh index 8dc6b7f..3615d0d 100644 --- a/gen_bootloader.sh +++ b/gen_bootloader.sh @@ -61,11 +61,9 @@ EOF echo -e "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=${GRUB_ROOTFS}" >> ${GRUB_CONF} else echo -e "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=/dev/ram0 init=/linuxrc real_root=${GRUB_ROOTFS}" >> ${GRUB_CONF} - if [ "${PAT}" -gt '4' -a "${CMD_BOOTSPLASH}" != '1' ] + if [ "${PAT}" -gt '4' ] then echo -e "\tinitrd /initramfs-${KNAME}-${ARCH}-${KV}" >> ${GRUB_CONF} - else - echo -e "\tinitrd /initrd-${KNAME}-${ARCH}-${KV}" >> ${GRUB_CONF} fi fi echo >> ${GRUB_CONF} diff --git a/gen_cmdline.sh b/gen_cmdline.sh index 4249590..a5d9742 100755 --- a/gen_cmdline.sh +++ b/gen_cmdline.sh @@ -30,8 +30,6 @@ 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 " --bootsplash Install bootsplash support to the initrd" - echo " --no-bootsplash Do not use bootsplash" echo " --gensplash Install gensplash support into bzImage" echo " --no-gensplash Do not use gensplash" echo " --install Install the kernel after building" @@ -67,7 +65,6 @@ longusage() { echo " --no-mountboot Don't mount BOOTDIR automatically" echo " --bootdir= Set the location of the boot-directory, default is /boot" echo " Initialization" - echo " --bootsplash= Force bootsplash using " echo " --gensplash= Force gensplash using " echo " --gensplash-res= Select gensplash resolutions" echo " --do-keymap-auto Forces keymap selection at boot" @@ -110,8 +107,7 @@ longusage() { echo " will be made against a kernel source tree" echo " --initramfs-overlay=" echo " Directory structure to include in the initramfs," - echo " only available on 2.6 kernels that do not use" - echo " bootsplash" + echo " only available on 2.6 kernels" } usage() { diff --git a/gen_configkernel.sh b/gen_configkernel.sh index b984b8e..334de42 100644 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -93,10 +93,10 @@ config_kernel() { fi # Force this on if we are a 2.4 kernel or less - # Force this on if we are using bootsplash # This is required for initrd support # Initramfs doesn't require this - if [ "${KERN_24}" -eq '1' -o "${CMD_BOOTSPLASH}" = '1' ] + # TODO: force on with --genzimage + if [ "${KERN_24}" -eq '1' ] then # Make sure Ext2 support is on... sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_EXT2_FS[ =].*/CONFIG_EXT2_FS=y/g' diff --git a/gen_determineargs.sh b/gen_determineargs.sh index e54c90c..b9b3c91 100644 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -216,18 +216,6 @@ determine_real_args() { UNIONFS_MODULES_BINCACHE=`arch_replace "${UNIONFS_MODULES_BINCACHE}"` BLKID_BINCACHE=`arch_replace "${BLKID_BINCACHE}"` - if [ "${CMD_BOOTSPLASH}" != '' ] - then - BOOTSPLASH=${CMD_BOOTSPLASH} - fi - - if isTrue ${BOOTSPLASH} - then - BOOTSPLASH=1 - else - BOOTSPLASH=0 - fi - if [ "${CMD_GENSPLASH}" != '' ] then GENSPLASH=${CMD_GENSPLASH} diff --git a/gen_initrd.sh b/gen_initrd.sh index 54f87d0..005f5da 100644 --- a/gen_initrd.sh +++ b/gen_initrd.sh @@ -377,28 +377,6 @@ create_initrd() { mv ${TMPDIR}/initrd-${KV}.gz ${TMPDIR}/initrd-${KV} fi - if [ "${BOOTSPLASH}" -eq "1" ] - then - if [ -x /sbin/splash ] - then - [ -z "${BOOTSPLASH_THEME}" ] && [ -e /etc/conf.d/bootsplash.conf ] && source /etc/conf.d/bootsplash.conf - [ -z "${BOOTSPLASH_THEME}" ] && [ -e /etc/conf.d/bootsplash ] && source /etc/conf.d/bootsplash - [ -z "${BOOTSPLASH_THEME}" ] && BOOTSPLASH_THEME=default - print_info 1 " >> Installing bootsplash [ using the ${BOOTSPLASH_THEME} theme ]..." - for bootRes in '800x600' '1024x768' '1280x1024' '1600x1200' - do - if [ -f "/etc/bootsplash/${BOOTSPLASH_THEME}/config/bootsplash-${bootRes}.cfg" ] - then - /sbin/splash -s -f /etc/bootsplash/${BOOTSPLASH_THEME}/config/bootsplash-${bootRes}.cfg >> ${TMPDIR}/initrd-${KV} || - gen_die "Error: could not copy ${bootRes} bootsplash!" - else - print_warning 1 "splash: Did not find a bootsplash for the ${bootRes} resolution..." - fi - done - else - print_warning 1 ' >> No bootsplash detected; skipping!' - fi - fi if ! isTrue "${CMD_NOINSTALL}" then copy_image_with_preserve "initrd" \ diff --git a/gen_package.sh b/gen_package.sh index 54a0984..3b7c281 100644 --- a/gen_package.sh +++ b/gen_package.sh @@ -26,7 +26,7 @@ gen_minkernpackage() if [ "${GENERATE_Z_IMAGE}" != '1' ] then - if [ "${KERN_24}" != '1' -a "${CMD_BOOTSPLASH}" != '1' ] + if [ "${KERN_24}" != '1' ] then [ "${BUILD_INITRD}" -ne 0 ] && { cp "${TMPDIR}/initramfs-${KV}" "${TEMP}/minkernpackage/initramfs-${ARCH}-${KV}" || gen_die 'Could not copy the initramfs for the kernel package!'; } else diff --git a/genkernel b/genkernel index 98dc83b..8ed59a1 100755 --- a/genkernel +++ b/genkernel @@ -295,7 +295,7 @@ then compile_devfsd fi - if [ "${KERN_24}" != '1' -a "${CMD_BOOTSPLASH}" != '1' ] + if [ "${KERN_24}" != '1' ] then if [ "${BUSYBOX}" -eq '1' ] then @@ -345,7 +345,7 @@ then print_info 1 '' print_info 1 ' Where $ROOT is the device node for your root partition as the' print_info 1 ' one specified in /etc/fstab' - elif [ "${KERN_24}" != '1' -a "${CMD_BOOTSPLASH}" != '1' ] + elif [ "${KERN_24}" != '1' ] then print_info 1 ' real_root=/dev/$ROOT' print_info 1 '' @@ -376,7 +376,6 @@ then 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 ]" - [ "${BOOTSPLASH}" -eq '1' ] && print_info 1 'add "vga=791 splash=silent" if you use a bootsplash framebuffer' [ "${LVM2}" -eq '1' ] && print_info 1 'add "dolvm2" for lvm2 support' [ "${EVMS2}" -eq '1' ] && print_info 1 'add "doevms2" for evms support' [ "${DMRAID}" -eq '1' ] && print_info 1 'add "dodmraid" for dmraid support' diff --git a/genkernel.8 b/genkernel.8 index ec72033..adbba9b 100644 --- a/genkernel.8 +++ b/genkernel.8 @@ -17,11 +17,11 @@ parameters to be used. All that is needed to run genkernel is just ``genkernel'' with an action and any flags you might need: .PP -# genkernel --menuconfig --no-clean --no-install --bootsplash all +# genkernel --menuconfig --no-clean --no-install all .PP This would produce a kernel, asking you what how to configure it -to your desire, leaving alone any existing compiled object files, enabling -bootsplash support but not installing anything. +to your desire, leaving alone any existing compiled object files, butt not +installing anything. .SH ACTIONS An action tells genkernel what you want it to do - the following actions are supported: @@ -175,12 +175,6 @@ module compilation stage of 2.4 series kernels to avoid bottlenecks; the .PP .BR Initialization .TP -\fB\-\-\fR[no\-]\fBbootsplash=\fR -If the extra argument is specified, bootsplash is forced using -rather than the default theme specified in your bootsplash -configuration. If \fB\-\-no-bootsplash\fR is specified, then -bootsplash is disabled. -.TP \fB\-\-\fR[no\-]\fBgensplash=\fR If the extra argument is specified, gensplash is forced using rather than the default theme specified in your gensplash @@ -253,8 +247,7 @@ against a kernel source tree. .TP \fB\-\-initramfs\-overlay=\fR Directory structure to inject into the initramfs. -Only available on 2.6 kernels that don't use bootsplash; use a CPIO -archive as a parameter. +use a CPIO archive as a parameter. .SH INITRD OPTIONS The following options can be passed as kernel parameters from the bootloader, which the initrd scripts would recognize. diff --git a/genkernel.conf b/genkernel.conf index b6ea102..3227429 100755 --- a/genkernel.conf +++ b/genkernel.conf @@ -19,9 +19,6 @@ CLEAN="yes" # Run 'make mrproper' before configuration/compilation? MRPROPER="yes" -# Copy bootsplash into the initrd image? -BOOTSPLASH="yes" - # Override the arch detection? # ARCH_OVERRIDE="x86" diff --git a/ia64/config.sh b/ia64/config.sh index 0021730..1204d95 100644 --- a/ia64/config.sh +++ b/ia64/config.sh @@ -1,14 +1,9 @@ #!/bin/bash -# x86/config.sh KERNEL_MAKE_DIRECTIVE="" KERNEL_MAKE_DIRECTIVE_2="" KERNEL_BINARY="vmlinux.gz" -# The dietlibc portion of busybox is commented out right now -# other stuff seems to compile fine though -USE_DIETLIBC=1 - [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" KERNEL_MAKE=make @@ -23,4 +18,3 @@ UTILS_AS=as UTILS_LD=ld COMPRESS_INITRD=yes -BOOTSPLASH=no diff --git a/mips/config.sh b/mips/config.sh index c22be83..92dde07 100644 --- a/mips/config.sh +++ b/mips/config.sh @@ -1,5 +1,4 @@ #!/bin/bash -# genkernel config.sh for mips systems # Kernel Build Info KERNEL_MAKE=make @@ -16,7 +15,6 @@ USE_DIETLIBC=0 # Initrd/Initramfs Options COMPRESS_INITRD="yes" -BOOTSPLASH=0 GENSPLASH=0 USECOLOR="yes" NOINITRDMODULES="yes" diff --git a/parisc/config.sh b/parisc/config.sh index cd1c6cb..fe721cb 100644 --- a/parisc/config.sh +++ b/parisc/config.sh @@ -1,16 +1,11 @@ #!/bin/bash -# parisc/config.sh KERNEL_MAKE_DIRECTIVE="vmlinux" KERNEL_MAKE_DIRECTIVE_2="" KERNEL_BINARY="vmlinux" -USE_DIETLIBC=0 - [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" -BOOTSPLASH=0 - KERNEL_MAKE=make UTILS_MAKE=make @@ -23,4 +18,3 @@ UTILS_AS=as UTILS_LD=ld COMPRESS_INITRD=yes - diff --git a/parisc64/config.sh b/parisc64/config.sh index 2bc68db..fe721cb 100644 --- a/parisc64/config.sh +++ b/parisc64/config.sh @@ -1,16 +1,11 @@ #!/bin/bash -# parisc/config.sh KERNEL_MAKE_DIRECTIVE="vmlinux" KERNEL_MAKE_DIRECTIVE_2="" KERNEL_BINARY="vmlinux" -USE_DIETLIBC=0 - [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" -BOOTSPLASH=0 - KERNEL_MAKE=make UTILS_MAKE=make diff --git a/ppc/config.sh b/ppc/config.sh index 62ea526..119f0a4 100644 --- a/ppc/config.sh +++ b/ppc/config.sh @@ -1,13 +1,8 @@ #!/bin/bash -# ppc/config.sh KERNEL_MAKE_DIRECTIVE="vmlinux" KERNEL_BINARY="vmlinux" -# The dietlibc portion of busybox is commented out right now -# other stuff seems to compile fine though -USE_DIETLIBC=1 - [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" KERNEL_MAKE=make diff --git a/ppc64/config.sh b/ppc64/config.sh index 5d4296e..119f0a4 100644 --- a/ppc64/config.sh +++ b/ppc64/config.sh @@ -1,13 +1,8 @@ #!/bin/bash -# ppc/config.sh KERNEL_MAKE_DIRECTIVE="vmlinux" KERNEL_BINARY="vmlinux" -# The dietlibc portion of busybox is commented out right now -# other stuff seems to compile fine though -USE_DIETLIBC=1 - [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" KERNEL_MAKE=make @@ -22,4 +17,3 @@ UTILS_AS=as UTILS_LD=ld COMPRESS_INITRD=yes - diff --git a/sparc/config.sh b/sparc/config.sh index f9d78bb..4053b4a 100644 --- a/sparc/config.sh +++ b/sparc/config.sh @@ -1,14 +1,9 @@ #!/bin/bash -# sparc/config.sh KERNEL_MAKE_DIRECTIVE="vmlinux" KERNEL_MAKE_DIRECTIVE_2="" KERNEL_BINARY="vmlinux" -# The dietlibc portion of busybox is commented out right now -# other stuff seems to compile fine though -USE_DIETLIBC=0 - [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j1" KERNEL_MAKE=make @@ -21,5 +16,4 @@ UTILS_AS=as UTILS_LD=ld COMPRESS_INITRD=yes -BOOTSPLASH="no" USECOLOR="no" diff --git a/sparc64/config.sh b/sparc64/config.sh index 785cfe9..68c6ea6 100644 --- a/sparc64/config.sh +++ b/sparc64/config.sh @@ -1,14 +1,9 @@ #!/bin/bash -#sparc64-config.sh KERNEL_MAKE_DIRECTIVE="vmlinux" KERNEL_MAKE_DIRECTIVE_2="image" KERNEL_BINARY="arch/sparc64/boot/image" -# Busybox 1.00-pre3 won't build with dietlibc, when it does we -# can turn this flag on -USE_DIETLIBC=0 - [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" KERNEL_MAKE=make @@ -23,5 +18,4 @@ UTILS_AS=as UTILS_LD=ld COMPRESS_INITRD=yes -BOOTSPLASH="no" USECOLOR="no" diff --git a/um/config.sh b/um/config.sh index 7c9b3f1..a4c6b0b 100644 --- a/um/config.sh +++ b/um/config.sh @@ -1,14 +1,9 @@ #!/bin/bash -# x86/config.sh KERNEL_MAKE_DIRECTIVE="linux" KERNEL_MAKE_DIRECTIVE_2="" KERNEL_BINARY="linux" -# The dietlibc portion of busybox is commented out right now -# other stuff seems to compile fine though -USE_DIETLIBC=1 - [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" KERNEL_MAKE="make ARCH=um" diff --git a/x86/config.sh b/x86/config.sh index 0346750..24ddad2 100644 --- a/x86/config.sh +++ b/x86/config.sh @@ -1,14 +1,9 @@ #!/bin/bash -# x86/config.sh KERNEL_MAKE_DIRECTIVE="bzImage" KERNEL_MAKE_DIRECTIVE_2="" KERNEL_BINARY="arch/i386/boot/bzImage" -# The dietlibc portion of busybox is commented out right now -# other stuff seems to compile fine though -USE_DIETLIBC=1 - [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" KERNEL_MAKE=make diff --git a/x86_64/config.sh b/x86_64/config.sh index 00a5c96..fa3ccd0 100644 --- a/x86_64/config.sh +++ b/x86_64/config.sh @@ -1,12 +1,9 @@ #!/bin/bash -# x86_64/config.sh KERNEL_MAKE_DIRECTIVE="bzImage" KERNEL_MAKE_DIRECTIVE_2="" KERNEL_BINARY="arch/x86_64/boot/bzImage" -USE_DIETLIBC=1 - [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" KERNEL_MAKE=make @@ -21,4 +18,3 @@ UTILS_AS=as UTILS_LD=ld COMPRESS_INITRD=yes - diff --git a/xen0/config.sh b/xen0/config.sh index dcbe991..e5a04a9 100644 --- a/xen0/config.sh +++ b/xen0/config.sh @@ -1,14 +1,9 @@ #!/bin/bash -# x86/config.sh KERNEL_MAKE_DIRECTIVE="" KERNEL_MAKE_DIRECTIVE_2="" KERNEL_BINARY="vmlinuz" -# The dietlibc portion of busybox is commented out right now -# other stuff seems to compile fine though -USE_DIETLIBC=0 - [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" KERNEL_MAKE="make ARCH=xen" diff --git a/xenU/config.sh b/xenU/config.sh index f6ef461..e5a04a9 100644 --- a/xenU/config.sh +++ b/xenU/config.sh @@ -1,14 +1,9 @@ #!/bin/bash -# x86/config.sh KERNEL_MAKE_DIRECTIVE="" KERNEL_MAKE_DIRECTIVE_2="" KERNEL_BINARY="vmlinuz" -# The dietlibc portion of busybox is commented out right now -# other stuff seems to compile fine though -USE_DIETLIBC=1 - [ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2" KERNEL_MAKE="make ARCH=xen" -- 2.26.2