Merge branch 'bug-425080'

[genkernel.git] / gen_configkernel.sh

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 8c00f8d5e158ee319351226cb69dc25d851adedc..b0837dd05a6c10bba6ffed87518a5bbce580b6b2 100755 (executable)
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 # $Id$
 
+# Fills variable KERNEL_CONFIG
 determine_config_file() {
        if [ "${CMD_KERNEL_CONFIG}" != "" ]
        then
@@ -23,49 +24,70 @@ determine_config_file() {
        else
                gen_die 'Error: No kernel .config specified, or file not found!'
        fi
+    KERNEL_CONFIG="$(readlink -f "${KERNEL_CONFIG}")"
 }
 
 config_kernel() {
        determine_config_file
        cd "${KERNEL_DIR}" || gen_die 'Could not switch to the kernel directory!'
 
-       isTrue "${CLEAN}" && cp "${KERNEL_DIR}/.config" "${KERNEL_DIR}/.config.bak" > /dev/null 2>&1
+       # Backup current kernel .config
+       if isTrue "${MRPROPER}" || [ ! -f "${KERNEL_DIR}/.config" ]
+       then
+               print_info 1 "kernel: Using config from ${KERNEL_CONFIG}"
+               if [ -f "${KERNEL_DIR}/.config" ]
+               then
+                       NOW=`date +--%Y-%m-%d--%H-%M-%S`
+                       cp "${KERNEL_DIR}/.config" "${KERNEL_DIR}/.config${NOW}.bak" \
+                                       || gen_die "Could not backup kernel config (${KERNEL_DIR}/.config)"
+                       print_info 1 "        Previous config backed up to .config${NOW}.bak"
+               fi
+       fi
+
        if isTrue ${MRPROPER}
        then
                print_info 1 'kernel: >> Running mrproper...'
                compile_generic mrproper kernel
+       else
+               print_info 1 "kernel: --mrproper is disabled; not running 'make mrproper'."
        fi
 
-       # If we're not cleaning, then we don't want to try to overwrite the configs
+       # If we're not cleaning a la mrproper, then we don't want to try to overwrite the configs
        # or we might remove configurations someone is trying to test.
-
-       if isTrue "${CLEAN}"
-       then
-               print_info 1 "config: Using config from ${KERNEL_CONFIG}"
-               print_info 1 '        Previous config backed up to .config.bak'
-               cp "${KERNEL_CONFIG}" "${KERNEL_DIR}/.config" || gen_die 'Could not copy configuration file!'
+       if isTrue "${MRPROPER}" || [ ! -f "${KERNEL_DIR}/.config" ]
+       then
+               local message='Could not copy configuration file!'
+               if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then
+                       # Support --kernel-config=/proc/config.gz, mainly
+                       zcat "${KERNEL_CONFIG}" > "${KERNEL_DIR}/.config" || gen_die "${message}"
+               else
+                       cp "${KERNEL_CONFIG}" "${KERNEL_DIR}/.config" || gen_die "${message}"
+               fi
        fi
+
        if isTrue "${OLDCONFIG}"
        then
                print_info 1 '        >> Running oldconfig...'
                yes '' 2>/dev/null | compile_generic oldconfig kernel 2>/dev/null
+       else
+               print_info 1 "kernel: --oldconfig is disabled; not running 'make oldconfig'."
        fi
        if isTrue "${CLEAN}"
        then
                print_info 1 'kernel: >> Cleaning...'
                compile_generic clean kernel
        else
-               print_info 1 "config: --no-clean is enabled; leaving the .config alone."
+               print_info 1 "kernel: --clean is disabled; not running 'make clean'."
        fi
-       
+
        if isTrue ${MENUCONFIG}
        then
-               print_info 1 'config: >> Invoking menuconfig...'
-               compile_generic menuconfig runtask
+               print_info 1 'kernel: >> Invoking menuconfig...'
+               compile_generic menuconfig kernelruntask
                [ "$?" ] || gen_die 'Error: menuconfig failed!'
        elif isTrue ${CMD_GCONFIG}
        then
-               print_info 1 'config: >> Invoking gconfig...'
+               print_info 1 'kernel: >> Invoking gconfig...'
                compile_generic gconfig kernel
                [ "$?" ] || gen_die 'Error: gconfig failed!'
 
@@ -74,7 +96,7 @@ config_kernel() {
 
        if isTrue ${CMD_XCONFIG}
        then
-               print_info 1 'config: >> Invoking xconfig...'
+               print_info 1 'kernel: >> Invoking xconfig...'
                compile_generic xconfig kernel
                [ "$?" ] || gen_die 'Error: xconfig failed!'
        fi