Removing bootsplash support since it hasn't been in a kernel we've supported for...
authorChris Gianelloni <wolf31o2@gentoo.org>
Mon, 17 Sep 2007 19:25:50 +0000 (19:25 +0000)
committerChris Gianelloni <wolf31o2@gentoo.org>
Mon, 17 Sep 2007 19:25:50 +0000 (19:25 +0000)
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@534 67a159dc-881f-0410-a524-ba9dfbe2cb84

25 files changed:
ChangeLog
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

index 39450922d8ab98b1fca002d36f119d521a2a36de..6d96ce391523a254ff655668013d0ab4d6bb9a8e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> 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 <wolf31o2@gentoo.org>
   -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 8d7e9ea0486008be94f875d1c5ec5889fe2dd0a0..f0be325b6e3f051543edaaaa7b751113bec30e34 100644 (file)
--- 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:
index ed4ce83ea4ad8b7d4d501a05531238f1d0d39858..65b05addf085d9306f23e5ced247e06918e83c86 100644 (file)
@@ -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
index 8dc6b7f780f4765e8a9c1e9c6f2de2c7cb5c697c..3615d0d242383cc66d8dacaf22f8a3e7b164c726 100644 (file)
@@ -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}
index 42495908719c4679a34ebefa4164d55ec9b218a6..a5d9742150a7eb2dfcd100e2abfac885d46964b5 100755 (executable)
@@ -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=<dir>         Set the location of the boot-directory, default is /boot"
   echo "  Initialization"
-  echo "       --bootsplash=<theme>    Force bootsplash using <theme>"
   echo "       --gensplash=<theme>     Force gensplash using <theme>"
   echo "       --gensplash-res=<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=<dir>"
   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() {
index b984b8e748f77f759d6c4885dca52d54fd5070ef..334de426b4779519d856f8947235f0edc9a24792 100644 (file)
@@ -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'
index e54c90ce203b3eea82fe0095796679e1c6c6dcad..b9b3c918be10f995540f5718bcb9a835a8e88a6f 100644 (file)
@@ -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}
index 54f87d05c801ae99709f5d01e81cb019a17f8e34..005f5da204876deb418e5e540350d6b296aedd91 100644 (file)
@@ -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" \
index 54a0984d45698f2c53e035326b7d4ba301aa5dba..3b7c281a7a5a1fdf72e03c6307a9498e8ea65183 100644 (file)
@@ -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
index 98dc83b5fca2bb5319fd8fe1e220881c408ea99c..8ed59a12e024cce71d5db0fbacf9bea2a8ffbf09 100755 (executable)
--- 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'
index ec72033f57c7e4829159d4151fbc47586811c14d..adbba9b8484e6bcbe1f4eb51ddeb0ab06022ec75 100644 (file)
@@ -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<theme>
-If the extra argument is specified, bootsplash is forced using <theme>
-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<theme>
 If the extra argument is specified, gensplash is forced using <theme>
 rather than the default theme specified in your gensplash
@@ -253,8 +247,7 @@ against a kernel source tree.
 .TP
 \fB\-\-initramfs\-overlay=\fR<dir>
 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.
index b6ea102f65c20fe6e77dceb356b4e29e3f64731b..32274295128fefc12f80b733496456483928a9da 100755 (executable)
@@ -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"
 
index 00217305ac2c2d599db584333d7f61bbaaba6b06..1204d951ba0b0be16098d9cb783bffcac5a88936 100644 (file)
@@ -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
index c22be83395a908d2fda5a2e4116d93f9e1f6f20c..92dde074b5ade9802a2d90f9a7b870ba12ab1aba 100644 (file)
@@ -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"
index cd1c6cb903c98f43308aa93fee53057cd3168d93..fe721cb1117237d75c080c736949ba936daa8ef7 100644 (file)
@@ -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
-
index 2bc68dbbce3db9d177faa099b2c35a27322fa0bf..fe721cb1117237d75c080c736949ba936daa8ef7 100644 (file)
@@ -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
 
index 62ea52672b3dbe2c066c0d1b49399d4ed8426e2f..119f0a4f3cdda9f027ccd29a91500ac6b2e89f27 100644 (file)
@@ -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
index 5d4296ea30b60a5a1c0f199bcf56bc2ec3c41064..119f0a4f3cdda9f027ccd29a91500ac6b2e89f27 100644 (file)
@@ -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
-
index f9d78bb58c511fd13b9a98e23de931dc14bfef5e..4053b4abb3ac8a29abdf4f098d7ee916bde83413 100644 (file)
@@ -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"
index 785cfe949d312865cf06e077c3f12297e219aa19..68c6ea601d02fee23e7326da44ac0cfd1aeeedb6 100644 (file)
@@ -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"
index 7c9b3f192c88e391cd733118bdfb1a1246f81bd1..a4c6b0bfc9486b34fc06811f435ba6af7e84f506 100644 (file)
@@ -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"
index 03467501d79a911cc7e05f37655e019ff7145065..24ddad2cbe616e1c8eb0240444248c6417aac67d 100644 (file)
@@ -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
index 00a5c96f6c062babde17e97c7cd3320ac4add9eb..fa3ccd0608f878403bcba70d4cab307763d3f243 100644 (file)
@@ -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
-
index dcbe991ab4ad03cc04824c32281235582f873786..e5a04a9c6aa54743cad9d597f20f26e4e6d70cd7 100644 (file)
@@ -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"
index f6ef461b0659d0d1d18154ffe5e339a4f18817cb..e5a04a9c6aa54743cad9d597f20f26e4e6d70cd7 100644 (file)
@@ -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"