New release:

[genkernel.git] / gen_determineargs.sh

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index aded8d8bbee08147854339d715d226ced82eb95e..74d7b1bbdb9f486a1c1fc960463efcb4a4a1af27 100644 (file)
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 
 get_KV() {
-# don't want VER local anymore, used when finding kernelconfig to use
-#      local VER
-# don't want PAT local anymore, used in initrd
-#      local PAT
        local SUB
        local EXV
        
@@ -16,63 +12,72 @@ get_KV() {
 }
 
 determine_real_args() {
-       MAKEOPTS="-j2"
-       if [ "${CMD_KERNELDIR}" != "" ]
+       if [ "${CMD_DEBUGFILE}" != '' ]
+       then
+               DEBUGFILE="${CMD_DEBUGFILE}"
+       fi
+
+       if [ "${CMD_MAKEOPTS}" != '' ]
+       then
+               MAKEOPTS="${CMD_MAKEOPTS}"
+       fi
+
+       if [ "${CMD_KERNELDIR}" != '' ]
        then
                KERNEL_DIR=${CMD_KERNELDIR}
        else
                KERNEL_DIR=${DEFAULT_KERNEL_SOURCE}
        fi
-       [ "${KERNEL_DIR}" = "" ] && gen_die "no kernel source directory"
+       [ "${KERNEL_DIR}" = '' ] && gen_die 'No kernel source directory!'
 
        get_KV
 
-       if [ "${CMD_KERNEL_MAKE}" != "" ]
+       if [ "${CMD_KERNEL_MAKE}" != '' ]
        then
                KERNEL_MAKE="${CMD_KERNEL_MAKE}"
        fi
 
-       if [ "${KERNEL_MAKE}" = "" ]
+       if [ "${KERNEL_MAKE}" = '' ]
        then
-               KERNEL_MAKE="make"
+               KERNEL_MAKE='make'
        fi
 
-       if [ "${CMD_UTILS_MAKE}" != "" ]
+       if [ "${CMD_UTILS_MAKE}" != '' ]
        then
                UTILS_MAKE="${CMD_UTILS_MAKE}"
        fi
 
-       if [ "${UTILS_MAKE}" = "" ]
+       if [ "${UTILS_MAKE}" = '' ]
        then
-               UTILS_MAKE="make"
+               UTILS_MAKE='make'
        fi
 
-       if [ "${CMD_KERNEL_CC}" != "" ]
+       if [ "${CMD_KERNEL_CC}" != '' ]
        then
                KERNEL_CC="${CMD_KERNEL_CC}"
        fi
 
-       if [ "${CMD_KERNEL_LD}" != "" ]
+       if [ "${CMD_KERNEL_LD}" != '' ]
        then
                KERNEL_LD="${CMD_KERNEL_LD}"
        fi
 
-       if [ "${CMD_KERNEL_AS}" != "" ]
+       if [ "${CMD_KERNEL_AS}" != '' ]
        then
                KERNEL_AS="${CMD_KERNEL_AS}"
        fi
 
-       if [ "${CMD_UTILS_CC}" != "" ]
+       if [ "${CMD_UTILS_CC}" != '' ]
        then
                UTILS_CC="${CMD_UTILS_CC}"
        fi
 
-       if [ "${CMD_UTILS_LD}" != "" ]
+       if [ "${CMD_UTILS_LD}" != '' ]
        then
                UTILS_LD="${CMD_UTILS_LD}"
        fi
 
-       if [ "${CMD_UTILS_AS}" != "" ]
+       if [ "${CMD_UTILS_AS}" != '' ]
        then
                UTILS_AS="${CMD_UTILS_AS}"
        fi
@@ -86,6 +91,12 @@ determine_real_args() {
        DIETLIBC_BINCACHE_TEMP=`arch_replace "${DIETLIBC_BINCACHE_TEMP}"`
        DEVFSD_BINCACHE=`arch_replace "${DEVFSD_BINCACHE}"`
        DEVFSD_CONF_BINCACHE=`arch_replace "${DEVFSD_CONF_BINCACHE}"`
+       
+       if [ "${CMD_BOOTSPLASH}" != '' ]
+       then
+               BOOTSPLASH=${CMD_BOOTSPLASH}
+       fi
+
        if isTrue ${BOOTSPLASH}
        then
                BOOTSPLASH=1
@@ -100,15 +111,15 @@ determine_real_args() {
                COMPRESS_INITRD=0
        fi
 
-       if [ "${CMD_MRPROPER}" != "" ]
+       if [ "${CMD_MRPROPER}" != '' ]
        then
                MRPROPER="${CMD_MRPROPER}"
        fi
-       if [ "${CMD_MENUCONFIG}" != "" ]
+       if [ "${CMD_MENUCONFIG}" != '' ]
        then
                MENUCONFIG="${CMD_MENUCONFIG}"
        fi
-       if [ "${CMD_CLEAN}" != "" ]
+       if [ "${CMD_CLEAN}" != '' ]
        then
                CLEAN="${CMD_CLEAN}"
                if ! isTrue ${CLEAN}
@@ -117,4 +128,13 @@ determine_real_args() {
                fi
        fi
 
+       if [ "${CMD_MINKERNPACKAGE}" != '' ]
+       then
+               MINKERNPACKAGE="${CMD_MINKERNPACKAGE}"
+       fi
+
+       if [ "${CMD_NOINITRDMODULES}" != '' ]
+       then
+               NOINITRDMODULES="${CMD_NOINITRDMODULES}"
+       fi
 }