Remove unsetting of ARCH for callback and change set_kernel_arch debug to use print_info

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@639 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Andrew Gaffney 17 years ago
parent db54f339a4
commit 9ef70b96fd

@ -2,6 +2,10 @@
# Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $ # $Header: $
13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> 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 <agaffney@gentoo.org> gen_cmdline.sh: 13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_cmdline.sh:
It helps to actually add the handling for the --integrated-initramfs option It helps to actually add the handling for the --integrated-initramfs option

@ -78,5 +78,5 @@ set_kernel_arch() {
;; ;;
esac esac
export KERNEL_ARCH export KERNEL_ARCH
echo "DEBUG: set_kernel_arch: KERNEL_ARCH=${KERNEL_ARCH}" print_info 2 "KERNEL_ARCH=${KERNEL_ARCH}"
} }

@ -280,15 +280,11 @@ then
if [ "${CALLBACK_ESCAPE}" -eq '0' ] if [ "${CALLBACK_ESCAPE}" -eq '0' ]
then then
echo echo
echo "DEBUG: callback: ARCH=${ARCH}"
ORIG_ARCH=${ARCH}
unset ARCH
echo echo
eval ${CMD_CALLBACK} | tee -a ${LOGFILE} eval ${CMD_CALLBACK} | tee -a ${LOGFILE}
CMD_STATUS="${PIPESTATUS[0]}" CMD_STATUS="${PIPESTATUS[0]}"
echo echo
print_info 1 "<<< Callback exit status: ${CMD_STATUS}" print_info 1 "<<< Callback exit status: ${CMD_STATUS}"
export ARCH=${ORIG_ARCH}
[ "${CMD_STATUS}" -ne 0 ] && gen_die '--callback failed!' [ "${CMD_STATUS}" -ne 0 ] && gen_die '--callback failed!'
else else
echo echo

Loading…
Cancel
Save