diff --git a/ChangeLog b/ChangeLog index e27555d..8e0b65c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 13 Mar 2008; Andrew Gaffney gen_arch.sh, genkernel: + Remove unsetting of ARCH for callback and change set_kernel_arch debug to + use print_info + 13 Mar 2008; Andrew Gaffney gen_cmdline.sh: It helps to actually add the handling for the --integrated-initramfs option diff --git a/gen_arch.sh b/gen_arch.sh index 484436d..5dd5c6b 100755 --- a/gen_arch.sh +++ b/gen_arch.sh @@ -78,5 +78,5 @@ set_kernel_arch() { ;; esac export KERNEL_ARCH - echo "DEBUG: set_kernel_arch: KERNEL_ARCH=${KERNEL_ARCH}" + print_info 2 "KERNEL_ARCH=${KERNEL_ARCH}" } diff --git a/genkernel b/genkernel index 552205b..30608b5 100755 --- a/genkernel +++ b/genkernel @@ -280,15 +280,11 @@ then if [ "${CALLBACK_ESCAPE}" -eq '0' ] then echo - echo "DEBUG: callback: ARCH=${ARCH}" - ORIG_ARCH=${ARCH} - unset ARCH echo eval ${CMD_CALLBACK} | tee -a ${LOGFILE} CMD_STATUS="${PIPESTATUS[0]}" echo print_info 1 "<<< Callback exit status: ${CMD_STATUS}" - export ARCH=${ORIG_ARCH} [ "${CMD_STATUS}" -ne 0 ] && gen_die '--callback failed!' else echo