From: Andrew Gaffney Date: Fri, 12 Dec 2008 19:08:12 +0000 (-0600) Subject: Disable copying of nb-busybox.cf since it isn't used anyway X-Git-Tag: CATALYST_2_0_6_916~57 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=cb22a08afb3720c3c26cbfbe508a1977bbced729;p=catalyst.git Disable copying of nb-busybox.cf since it isn't used anyway --- diff --git a/ChangeLog b/ChangeLog index d5aca85b..102eae32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # Copyright 2002-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney # Distributed under the GPL v2 + 12 Dec 2008; Andrew Gaffney + targets/netboot2/netboot2-controller.sh: + Disable copying of nb-busybox.cf since it isn't used anyway + 07 Dec 2008; Andrew Gaffney arch/amd64.py, arch/x86.py, catalyst: A few typo and other minor fixes as reported by armin76 diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh index c5ee152a..b46719cb 100644 --- a/targets/netboot2/netboot2-controller.sh +++ b/targets/netboot2/netboot2-controller.sh @@ -14,11 +14,9 @@ case ${1} in ;; pre-kmerge) # Sets up the build environment before any kernels are compiled - if [ -z "${clst_netboot2_busybox_config}" ]; then - cp ${clst_sharedir}/targets/netboot2/nb-busybox.cf ${clst_chroot_path}/tmp/busy-config - else - cp ${clst_netboot2_busybox_config} ${clst_chroot_path}/tmp/busy-config - fi +# if [ -n "${clst_netboot2_busybox_config}" ]; then +# cp ${clst_netboot2_busybox_config} ${clst_chroot_path}/tmp/busy-config +# fi exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh ;; post-kmerge)