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 68a27087cb9b52add6ae5198a4032b3851274bbe..aa184ad88c28832450dce1078855a24166241433 100644 (file)
--- 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 <wolf31o2@gentoo.org> catalyst,
+  targets/support/bootloader-setup.sh:
+  Added IA64 patch from plasmaroo.  This is catalyst 2.0_rc21.
 
   23 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> arch/x86.py:
   Changed mcpu to mtune since mcpu is deprecated on GCC 3.4 and above.

diff --git a/catalyst b/catalyst
index 829db5f33f49c5797c05a97b89cbfbc4ce66aa99..d5f868f5a19033b7cd8d0a8da0bb895d9939c9df 100755 (executable)
--- 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 <rocket@gentoo.org>
@@ -11,7 +11,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__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 d20a4338dda446267fc10411a789a763415d89ea..1b24b3e2df2a79748cfe91585488ea72726b3ea3 100755 (executable)
--- 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