From: Chris Gianelloni Date: Tue, 24 Jan 2006 19:30:47 +0000 (+0000) Subject: Added IA64 patch from plasmaroo. This is catalyst 2.0_rc21. X-Git-Tag: CATALYST_2_0_6_916~455 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=97f01f806d4e3f74f4add8b68944f4acb0c7ab0b;p=catalyst.git Added IA64 patch from plasmaroo. This is catalyst 2.0_rc21. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1039 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 68a27087..aa184ad8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.524 2006/01/23 23:09:51 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.525 2006/01/24 19:30:47 wolf31o2 Exp $ + + 24 Jan 2006; Chris Gianelloni catalyst, + targets/support/bootloader-setup.sh: + Added IA64 patch from plasmaroo. This is catalyst 2.0_rc21. 23 Jan 2006; Chris Gianelloni arch/x86.py: Changed mcpu to mtune since mcpu is deprecated on GCC 3.4 and above. diff --git a/catalyst b/catalyst index 829db5f3..d5f868f5 100755 --- a/catalyst +++ b/catalyst @@ -1,7 +1,7 @@ #!/usr/bin/python -OO # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.128 2006/01/20 20:25:18 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.129 2006/01/24 19:30:47 wolf31o2 Exp $ # Maintained in full by: # Eric Edgar @@ -11,7 +11,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__version__="2.0_rc20" +__version__="2.0_rc21" conf_values={} diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index d20a4338..1b24b3e2 100755 --- a/targets/support/bootloader-setup.sh +++ b/targets/support/bootloader-setup.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.23 2006/01/16 15:45:03 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.24 2006/01/24 19:30:47 wolf31o2 Exp $ . ${clst_sharedir}/targets/support/functions.sh . ${clst_sharedir}/targets/support/filesystem-functions.sh @@ -117,6 +117,7 @@ case ${clst_mainarch} in echo 'message=/efi/boot/elilo.msg' >> ${iacfg} echo 'chooser=simple' >> ${iacfg} echo 'timeout=50' >> ${iacfg} + echo 'relocatable' >> ${iacfg} echo >> ${iacfg} for x in ${clst_boot_kernel} do