Added patch from Gustavo Zacarias <gustavoz@gentoo.org> for sparc/silo parameters...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1156 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index e5c48aedf4175b45c0fd27239bbddddab2a7638f..3981e146bf06e05947ae2b5459488f9a1c0dd8fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.640 2006/06/28 12:51:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.641 2006/07/05 13:59:18 wolf31o2 Exp $
+
+  05 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  -livecd/cdtar/silo-1.2.6-sparc-cdtar.tar.bz2,
+  +livecd/cdtar/silo-1.4.13-sparc-cdtar.tar.bz2,
+  targets/support/bootloader-setup.sh:
+  Added patch from Gustavo Zacarias <gustavoz@gentoo.org> for sparc/silo
+  parameters support. This is for bug #139300.
 
   28 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   modules/generic_stage_target.py, modules/livecd_stage2_target.py,

diff --git a/livecd/cdtar/silo-1.2.6-sparc-cdtar.tar.bz2 b/livecd/cdtar/silo-1.2.6-sparc-cdtar.tar.bz2
deleted file mode 100644 (file)
index 687f06c..0000000
Binary files a/livecd/cdtar/silo-1.2.6-sparc-cdtar.tar.bz2 and /dev/null differ

diff --git a/livecd/cdtar/silo-1.4.13-sparc-cdtar.tar.bz2 b/livecd/cdtar/silo-1.4.13-sparc-cdtar.tar.bz2
new file mode 100644 (file)
index 0000000..169cf99
Binary files /dev/null and b/livecd/cdtar/silo-1.4.13-sparc-cdtar.tar.bz2 differ

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 4c3c1375fdaa02848a72dc5d19217a9496d21be1..17917c5dc47ee209a5e19b75d72782d955b0dbfb 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.38 2006/06/19 19:05:02 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.39 2006/07/05 13:59:18 wolf31o2 Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -306,6 +306,8 @@ case ${clst_mainarch} in
                echo -e "label=\"video\"" >> ${scfg}
                echo "image=\"cat /boot/help.msg\"" >> ${scfg}
                echo -e "label=\"help\"" >> ${scfg}
+               echo "image=\"cat /boot/parameters.msg\"" >> ${scfg}
+               echo -e "label=\"parameters\"" >> ${scfg}
                ;;
        ia64)
                # NO SOFTLEVEL SUPPORT YET