Applying sparc32 patch from gustavoz. Replacing silo cdtar files with unified sparc3...

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

diff --git a/ChangeLog b/ChangeLog
index 81f92946d85ee8adfa1316a043d9cdef9bb3424d..1b0f7aa57d62f64394ae552e4206859f2a77416d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.182 2005/03/06 14:35:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.183 2005/03/07 00:20:37 wolf31o2 Exp $
+
+  06 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  livecd/cdtar/silo-1.2.6-sparc-cdtar.tar.bz2,
+  -livecd/cdtar/silo-1.3.2-sparc64-cdtar.tar.bz2,
+  -livecd/cdtar/silo-1.4.4-sparc32-cdtar.tar.bz2,
+  livecd/runscript/sparc-archscript.sh:
+  Applying sparc32 patch from gustavoz. Replacing silo cdtar files with
+  unified sparc32/sparc64 cdtar.
 
   06 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd/runscript-support/livecdfs-update.sh,

diff --git a/catalyst b/catalyst
index 8d42b63d4c180db93e1c2e103cbad1a85427a5b8..ca2d9ff8df93f729f958ecf7e46c8173e86c8828 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,14 +1,14 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.64 2005/03/03 22:05:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.65 2005/03/07 00:20:37 wolf31o2 Exp $
 
 # Maintained in full by John Davis <zhen@gentoo.org>
 
 import os,sys,imp,string,getopt
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="1.1.6"
+__version__="1.1.7_pre1"
 
 conf_values={}
 

diff --git a/livecd/cdtar/silo-1.2.6-sparc-cdtar.tar.bz2 b/livecd/cdtar/silo-1.2.6-sparc-cdtar.tar.bz2
index d68ca13bd7d5b9dd4eaed6d085141360481755e6..687f06cc53763c6632a219884bb8de9f0c744f73 100644 (file)
Binary files a/livecd/cdtar/silo-1.2.6-sparc-cdtar.tar.bz2 and b/livecd/cdtar/silo-1.2.6-sparc-cdtar.tar.bz2 differ

diff --git a/livecd/cdtar/silo-1.3.2-sparc64-cdtar.tar.bz2 b/livecd/cdtar/silo-1.3.2-sparc64-cdtar.tar.bz2
deleted file mode 100644 (file)
index deddf88..0000000
Binary files a/livecd/cdtar/silo-1.3.2-sparc64-cdtar.tar.bz2 and /dev/null differ

diff --git a/livecd/cdtar/silo-1.4.4-sparc32-cdtar.tar.bz2 b/livecd/cdtar/silo-1.4.4-sparc32-cdtar.tar.bz2
deleted file mode 100644 (file)
index 84ae18c..0000000
Binary files a/livecd/cdtar/silo-1.4.4-sparc32-cdtar.tar.bz2 and /dev/null differ

diff --git a/livecd/runscript/sparc-archscript.sh b/livecd/runscript/sparc-archscript.sh
index 7e92593f911108b2b8f1560efe7c5d2975d9c77f..4704ed3427ae9cd41aa542674310494d8777165e 100644 (file)
--- a/livecd/runscript/sparc-archscript.sh
+++ b/livecd/runscript/sparc-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/sparc-archscript.sh,v 1.9 2005/03/03 22:36:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc-archscript.sh,v 1.10 2005/03/07 00:20:37 wolf31o2 Exp $
 
 case $1 in
        kernel)
@@ -80,8 +80,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 -o ${2} -G ${clst_cdroot_path}/boot/isofs.b -B ... ${clst_cdroot_path}  || die "Cannot make ISO image"
+               # 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 2005.0' -A 'Gentoo Linux Sparc' ${clst_cdroot_path}  || die "Cannot make ISO image"
+               rm /tmp/mkisofs.sparc.fu
        ;;
 esac