From: Chris Gianelloni Date: Fri, 29 Oct 2004 21:14:59 +0000 (+0000) Subject: Updated with silo/mkisofs patch from gustavoz. X-Git-Tag: CATALYST_2_0_6_916~896 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7fef26db6ee4f2d5aaf0815e51ff92ddc0697705;p=catalyst.git Updated with silo/mkisofs patch from gustavoz. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@477 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index f19571f8..1643370b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.106 2004/10/28 18:45:00 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.107 2004/10/29 21:14:59 wolf31o2 Exp $ + + 29 Oct 2004; Chris Gianelloni + +livecd/cdtar/silo-1.2.6-sparc-cdtar.tar.bz2, + livecd/runscript/sparc64-archscript.sh: + Updated with silo/mkisofs patch from gustavoz. 28 Oct 2004; Chris Gianelloni livecd/files/x86-help.msg: diff --git a/livecd/cdtar/silo-1.2.6-sparc-cdtar.tar.bz2 b/livecd/cdtar/silo-1.2.6-sparc-cdtar.tar.bz2 new file mode 100644 index 00000000..d68ca13b Binary files /dev/null and b/livecd/cdtar/silo-1.2.6-sparc-cdtar.tar.bz2 differ diff --git a/livecd/runscript/sparc64-archscript.sh b/livecd/runscript/sparc64-archscript.sh index 6358e30e..adbb5486 100644 --- a/livecd/runscript/sparc64-archscript.sh +++ b/livecd/runscript/sparc64-archscript.sh @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc64-archscript.sh,v 1.7 2004/10/21 17:06:21 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc64-archscript.sh,v 1.8 2004/10/29 21:14:59 wolf31o2 Exp $ case $1 in kernel) @@ -71,8 +71,12 @@ case $1 in ;; iso) - # this is for the livecd-final target, and calls the proper - # command to build the iso file - mkisofs -J -R -l -z -o ${2} -G ${clst_cdroot_path}/boot/isofs.b -B ... ${clst_cdroot_path} + # Old silo + patched mkisofs fubar magic + # Only silo 1.2.x seems to work for most hardware + # Seems silo 1.3.x+ breaks on newer machines + # when booting from CD (current as of silo 1.4.8) + mv ${clst_cdroot_path}/boot/mkisofs.sparc.fu /tmp + /tmp/mkisofs.sparc.fu -o ${2} -D -r -pad -quiet -S 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf' -abstract 'Gentoo Linux Sparc' -copyright 'Gentoo Foundation' -P 'Gentoo Linux Sparc' -p 'Gentoo Linux Sparc' -V 'Gentoo Linux Sparc 2004.3' -A 'Gentoo Linux Sparc' ${clst_cdroot_path} + rm /tmp/mkisofs.sparc.fu ;; esac