diff --unified genkernel-3.0.2g/gen_cmdline.sh genkernel-3.0.2h/gen_cmdline.sh --- genkernel-3.0.2g/gen_cmdline.sh 2004-09-19 14:05:21.000000000 +0200 +++ genkernel-3.0.2h/gen_cmdline.sh 2004-09-30 12:54:10.145211348 +0200 @@ -34,7 +34,7 @@ echo " --install Install the kernel after building" echo " --no-install Do not install the kernel after building" echo " --no-initrdmodules Don't copy any modules to the initrd" - echo " --udev Add in udev support." + echo " --no-udev Remove udev support." echo " --callback=<...> Run the specified arguments after" echo " the kernel and modules have been" echo " compiled." @@ -237,8 +237,8 @@ CMD_NOINITRDMODULES=1 print_info 2 "CMD_NOINITRDMODULES: $CMD_NOINITRDMODULES" ;; - --udev) - CMD_UDEV=1 + --no-udev) + CMD_NOUDEV=1 print_info 2 "CMD_UDEV: $CMD_UDEV" ;; --callback*) diff --unified genkernel-3.0.2g/gen_compile.sh genkernel-3.0.2h/gen_compile.sh --- genkernel-3.0.2g/gen_compile.sh 2004-09-19 14:05:21.000000000 +0200 +++ genkernel-3.0.2h/gen_compile.sh 2004-09-30 12:54:10.146211150 +0200 @@ -332,6 +332,9 @@ } compile_module_init_tools() { + # I've disabled dietlibc support for the time being since the + # version we use misses a few needed system calls. + local ARGS if [ ! -f "${MODULE_INIT_TOOLS_BINCACHE}" ] then @@ -345,12 +348,12 @@ cd "${MODULE_INIT_TOOLS_DIR}" print_info 1 'module-init-tools: >> Configuring' - if [ "${USE_DIETLIBC}" -eq '1' ] - then - extract_dietlibc_bincache - OLD_CC="${UTILS_CC}" - UTILS_CC="${TEMP}/diet/bin/diet ${UTILS_CC}" - fi +# if [ "${USE_DIETLIBC}" -eq '1' ] +# then +# extract_dietlibc_bincache +# OLD_CC="${UTILS_CC}" +# UTILS_CC="${TEMP}/diet/bin/diet ${UTILS_CC}" +# fi export_utils_args ./configure >> ${DEBUGFILE} 2>&1 || @@ -359,11 +362,11 @@ print_info 1 ' >> Compiling...' compile_generic "all" utils - if [ "${USE_DIETLIBC}" -eq '1' ] - then - clean_dietlibc_bincache - UTILS_CC="${OLD_CC}" - fi +# if [ "${USE_DIETLIBC}" -eq '1' ] +# then +# clean_dietlibc_bincache +# UTILS_CC="${OLD_CC}" +# fi print_info 1 ' >> Copying to cache...' [ -f "${TEMP}/${MODULE_INIT_TOOLS_DIR}/insmod.static" ] || diff --unified genkernel-3.0.2g/gen_determineargs.sh genkernel-3.0.2h/gen_determineargs.sh --- genkernel-3.0.2g/gen_determineargs.sh 2004-09-19 14:05:21.000000000 +0200 +++ genkernel-3.0.2h/gen_determineargs.sh 2004-09-30 12:54:10.970048044 +0200 @@ -191,10 +191,10 @@ OLDCONFIG=0 fi - if isTrue "${CMD_UDEV}" + if isTrue "${CMD_NOUDEV}" then - UDEV=1 + NOUDEV=1 else - UDEV=0 + NOUDEV=0 fi } diff --unified genkernel-3.0.2g/genkernel genkernel-3.0.2h/genkernel --- genkernel-3.0.2g/genkernel 2004-09-19 14:05:21.000000000 +0200 +++ genkernel-3.0.2h/genkernel 2004-09-30 12:54:10.145211348 +0200 @@ -216,8 +216,8 @@ fi compile_devfsd - [ "${VER}" -lt '2' ] || [ "${VER}" -eq '2' -a "${PAT}" -lt '6' -a "${UDEV}" -eq '1' ] && UDEV=0 && print_info 1 'udev: Target is a 2.4 kernel, support disabled.' - [ "${VER}" -gt '2' ] || [ "${VER}" -eq '2' -a "${PAT}" -ge '6' ] && UDEV=1 && print_info 1 'udev: Target is a 2.6 kernel, support enabled.' + UDEV=0 + [ "${VER}" -gt '2' ] || [ "${VER}" -eq '2' -a "${PAT}" -ge '6' -a "${NOUDEV}" -eq '0' ] && UDEV=1 && print_info 1 'udev: Target is a 2.6 kernel, support enabled.' [ "${UDEV}" -eq '1' ] && compile_udev # Create initrd