From: Chris Gianelloni Date: Mon, 16 Jan 2006 15:25:08 +0000 (+0000) Subject: Fixing some spacing. This is catalyst 2.0_rc15. X-Git-Tag: CATALYST_2_0_6_916~471 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a6d500277ac27a761c61bf0454b8c32467ab6325;p=catalyst.git Fixing some spacing. This is catalyst 2.0_rc15. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1023 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index c915f128..2686dc9e 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.508 2006/01/16 14:47:01 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.509 2006/01/16 15:25:08 wolf31o2 Exp $ + + 16 Jan 2006; Chris Gianelloni catalyst, + targets/support/create-iso.sh, targets/support/netboot2-final.sh: + Fixing some spacing. This is catalyst 2.0_rc15. 16 Jan 2006; Eric Edgar targets/support/functions.sh: Attempt to fix bug 117649 diff --git a/catalyst b/catalyst index fa948bd3..eb70cdf6 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.122 2006/01/13 14:54:16 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.123 2006/01/16 15:25:08 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_rc14" +__version__="2.0_rc15" conf_values={} diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh index 57953c33..c6259478 100755 --- a/targets/support/create-iso.sh +++ b/targets/support/create-iso.sh @@ -1,7 +1,8 @@ #!/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/create-iso.sh,v 1.20 2006/01/10 15:40:57 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.21 2006/01/16 15:25:08 wolf31o2 Exp $ + . ${clst_sharedir}/targets/support/functions.sh . ${clst_sharedir}/targets/support/filesystem-functions.sh @@ -63,7 +64,7 @@ then sh) clst_iso_volume_id="Gentoo Linux - SH" ;; - sparc|sparc64) + sparc*) clst_iso_volume_id="Gentoo Linux - SPARC" ;; x86) @@ -148,7 +149,7 @@ case ${clst_mainarch} in ;; esac ;; - sparc|sparc64) + sparc*) # 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 diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh index 3c09ddc0..a4b1b182 100755 --- a/targets/support/netboot2-final.sh +++ b/targets/support/netboot2-final.sh @@ -1,7 +1,8 @@ #!/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/netboot2-final.sh,v 1.1 2006/01/13 15:09:07 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/netboot2-final.sh,v 1.2 2006/01/16 15:25:08 wolf31o2 Exp $ + . ${clst_sharedir}/targets/support/functions.sh . ${clst_sharedir}/targets/support/filesystem-functions.sh @@ -17,11 +18,11 @@ for x in ${clst_boot_kernel}; do mv ${clst_target_path}boot/${x} ${clst_target_path}kernels mv ${clst_target_path}boot/${x}.igz ${clst_target_path}kernels/misc done -rmdir ${clst_target_path}boot +rmdir ${clst_target_path}boot -# Any post-processing necessary for each architecture can be done here. This may -# include things like sparc's elftoaout, x86's PXE boot, etc. +# Any post-processing necessary for each architecture can be done here. This +# may include things like sparc's elftoaout, x86's PXE boot, etc. case ${clst_mainarch} in alpha) sleep 0