From 94522889dcf63abce6a6dd457243bce6f0f2ac80 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 20 Jan 2011 01:45:36 +0100 Subject: [PATCH 1/4] Be versose about --oldconfig and --no-mrproper --- gen_configkernel.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gen_configkernel.sh b/gen_configkernel.sh index b562287..e5aa023 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -47,6 +47,8 @@ config_kernel() { then print_info 1 'kernel: >> Running mrproper...' compile_generic mrproper kernel + else + print_info 1 "config: --no-mrproper is enabled; not running 'make mrproper'." fi # If we're not cleaning, then we don't want to try to overwrite the configs @@ -56,6 +58,8 @@ config_kernel() { then print_info 1 ' >> Running oldconfig...' yes '' 2>/dev/null | compile_generic oldconfig kernel 2>/dev/null + else + print_info 1 "config: --oldconfig is disabled; not running 'make oldconfig'." fi if isTrue "${CLEAN}" then From 9c2d3acc7e4612d50046ff42e9a30a8c1d5f42fb Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 20 Jan 2011 01:53:37 +0100 Subject: [PATCH 2/4] Move application of kernel config after "make mrproper" as that deletes .config (whereas "make clean" does not) (bug #351906) --- ChangeLog | 4 ++++ gen_configkernel.sh | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d31869..686fcc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ # Distributed under the GPL v2 # $Id$ + 20 Jan 2011; Sebastian Pipping gen_configkernel.sh: + Move application of kernel config after "make mrproper" as that deletes + .config (whereas "make clean" does not) (bug #351906) + 16 Jan 2011; Sebastian Pipping genkernel: Bump version to 3.4.11 diff --git a/gen_configkernel.sh b/gen_configkernel.sh index e5aa023..f4db0e3 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -29,8 +29,8 @@ config_kernel() { determine_config_file cd "${KERNEL_DIR}" || gen_die 'Could not switch to the kernel directory!' - # Backup and replace kernel .config - if isTrue "${CLEAN}" || [ ! -f "${KERNEL_DIR}/.config" ] + # Backup current kernel .config + if isTrue "${MRPROPER}" || [ ! -f "${KERNEL_DIR}/.config" ] then print_info 1 "config: Using config from ${KERNEL_CONFIG}" if [ -f "${KERNEL_DIR}/.config" ] @@ -40,7 +40,6 @@ config_kernel() { || gen_die "Could not backup kernel config (${KERNEL_DIR}/.config)" print_info 1 " Previous config backed up to .config${NOW}.bak" fi - cp "${KERNEL_CONFIG}" "${KERNEL_DIR}/.config" || gen_die 'Could not copy configuration file!' fi if isTrue ${MRPROPER} @@ -51,8 +50,12 @@ config_kernel() { print_info 1 "config: --no-mrproper is enabled; 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 "${MRPROPER}" || [ ! -f "${KERNEL_DIR}/.config" ] + then + cp "${KERNEL_CONFIG}" "${KERNEL_DIR}/.config" || gen_die 'Could not copy configuration file!' + fi if isTrue "${OLDCONFIG}" then From c90ea760205994e27da1af7272f9f3dfaa662830 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 20 Jan 2011 01:56:30 +0100 Subject: [PATCH 3/4] Use "kernel:" instead of "config:" in output consistently --- gen_configkernel.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gen_configkernel.sh b/gen_configkernel.sh index f4db0e3..d458272 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -32,7 +32,7 @@ config_kernel() { # Backup current kernel .config if isTrue "${MRPROPER}" || [ ! -f "${KERNEL_DIR}/.config" ] then - print_info 1 "config: Using config from ${KERNEL_CONFIG}" + print_info 1 "kernel: Using config from ${KERNEL_CONFIG}" if [ -f "${KERNEL_DIR}/.config" ] then NOW=`date +--%Y-%m-%d--%H-%M-%S` @@ -47,7 +47,7 @@ config_kernel() { print_info 1 'kernel: >> Running mrproper...' compile_generic mrproper kernel else - print_info 1 "config: --no-mrproper is enabled; not running 'make mrproper'." + print_info 1 "kernel: --no-mrproper is enabled; not running 'make mrproper'." fi # If we're not cleaning a la mrproper, then we don't want to try to overwrite the configs @@ -62,24 +62,24 @@ config_kernel() { print_info 1 ' >> Running oldconfig...' yes '' 2>/dev/null | compile_generic oldconfig kernel 2>/dev/null else - print_info 1 "config: --oldconfig is disabled; not running 'make oldconfig'." + 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; not running 'make clean'." + print_info 1 "kernel: --no-clean is enabled; not running 'make clean'." fi if isTrue ${MENUCONFIG} then - print_info 1 'config: >> Invoking menuconfig...' + print_info 1 'kernel: >> Invoking menuconfig...' compile_generic menuconfig runtask [ "$?" ] || 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!' @@ -88,7 +88,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 From 0baf1d36fb5aae346ea14e70e68ec98e5de71dc2 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Thu, 20 Jan 2011 02:33:52 +0100 Subject: [PATCH 4/4] Move from "no-foo enabled" to "foo disabled" for consistency --- gen_configkernel.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gen_configkernel.sh b/gen_configkernel.sh index d458272..2f14b4d 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -47,7 +47,7 @@ config_kernel() { print_info 1 'kernel: >> Running mrproper...' compile_generic mrproper kernel else - print_info 1 "kernel: --no-mrproper is enabled; not running 'make mrproper'." + print_info 1 "kernel: --mrproper is disabled; not running 'make mrproper'." fi # If we're not cleaning a la mrproper, then we don't want to try to overwrite the configs @@ -69,7 +69,7 @@ config_kernel() { print_info 1 'kernel: >> Cleaning...' compile_generic clean kernel else - print_info 1 "kernel: --no-clean is enabled; not running 'make clean'." + print_info 1 "kernel: --clean is disabled; not running 'make clean'." fi if isTrue ${MENUCONFIG}