From: Andrew Gaffney Date: Sun, 7 Dec 2008 04:01:50 +0000 (-0600) Subject: Remove evil hacks that copy gk files around for netboot2 X-Git-Tag: CATALYST_2_0_6_916~62 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d67cca245469d5f3ba02607faf578cfa399caf69;p=catalyst.git Remove evil hacks that copy gk files around for netboot2 --- diff --git a/ChangeLog b/ChangeLog index b0ead2d0..fc72d31d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # Copyright 2002-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney # Distributed under the GPL v2 + 07 Dec 2008; Andrew Gaffney + targets/support/pre-kmerge.sh: + Remove evil hacks that copy gk files around for netboot2 + 04 Dec 2008; Chris Gianelloni catalyst: Bumping version for release. diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh index cd23eda7..c2ea2dd5 100644 --- a/targets/support/pre-kmerge.sh +++ b/targets/support/pre-kmerge.sh @@ -4,22 +4,3 @@ source /tmp/chroot-functions.sh run_merge --oneshot genkernel install -d /tmp/kerncache - -case ${clst_target} in - netboot2) - # Set the netboot builddate/hostname in linuxrc and copy to proper arch - # directory in genkernel - sed -e "s/@@MYDATE@@/$(date '+%Y%m%d')/g" \ - -e "s/@@RELVER@@/${clst_version_stamp}/g" \ - /usr/share/genkernel/netboot/linuxrc.x \ - > /usr/share/genkernel/${clst_hostarch}/linuxrc - - echo ">>> Copying support files to ${clst_root_path} ..." - cp -pPRf /usr/share/genkernel/netboot/misc/* \ - ${clst_merge_path} - - echo ">>> Copying busybox config ..." - cp -f /tmp/busy-config \ - /usr/share/genkernel/${clst_hostarch}/busy-config - ;; -esac