From: John P. Davis Date: Thu, 1 Apr 2004 15:49:38 +0000 (+0000) Subject: cosmetic touchups X-Git-Tag: CATALYST_2_0_6_916~1036 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c15458c4e5a2793f8cf9e567ceceb06e3ea8a90c;p=catalyst.git cosmetic touchups git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@337 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 509b8ea2..3a9658ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.31 2004/03/31 21:56:23 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.32 2004/04/01 15:49:38 zhen Exp $ + + 01 Apr 2004; John Davis catalyst, files/catalyst.conf, + files/x86-help.msg: + cosmetic touchups for 1.0.5 31 Mar 2004; John Davis targets/stage2/stage2.sh: added support to the stage2 for stackable profiles bootstrap diff --git a/catalyst b/catalyst index 09989d0d..cdc48f69 100755 --- a/catalyst +++ b/catalyst @@ -1,7 +1,7 @@ #!/usr/bin/python # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.31 2004/03/25 00:03:27 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.32 2004/04/01 15:49:38 zhen Exp $ import os,sys,imp,string @@ -17,7 +17,7 @@ def vers(): print "Copyright 2003-2004 Gentoo Technologies, Inc." print "Distributed under the GNU General Public License version 2" -version="1.0" +version="1.0.5" if len(sys.argv)==1 or sys.argv[1] in ["-h","--help"]: usage() diff --git a/files/catalyst.conf b/files/catalyst.conf index 504083b7..c1277ade 100644 --- a/files/catalyst.conf +++ b/files/catalyst.conf @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/files/catalyst.conf,v 1.4 2004/03/04 19:34:11 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/files/catalyst.conf,v 1.5 2004/04/01 15:49:38 zhen Exp $ # Simple desriptions of catalyst settings. Please refer to the online # documentation for more information. @@ -10,10 +10,10 @@ distdir="/usr/portage/distfiles" # options set different build-time options for catalyst. Some examples are: -# ccache = enables build time ccache support (on by default) +# ccache = enables build time ccache support (highly recommended) # pkgcache = keeps a tbz2 of every built package (useful if your build stops prematurely) # distcc = enable distcc support for building. You have to set distcc_hosts in your spec file. -options="pkgcache" +options="ccache pkgcache" # sharedir specifies where all of the catalyst runtime executables are. Most users do # not need to change this. diff --git a/files/x86-help.msg b/files/x86-help.msg deleted file mode 100755 index 3e2ed792..00000000 --- a/files/x86-help.msg +++ /dev/null @@ -1,25 +0,0 @@ -Gentoo Linux 2004.0 LiveCD boot options - [F1 to display available kernels] - -Many kernel profiles exist on a livecd. Please hit F1 -to see the available kernels on this livecd. Please note that -the -nofb counterparts to each kernel disable the framebuffer -and bootsplash. - -Options available to pass to your kernel of choice. -- agpgart loads agpgart (use if you have graphic problems,lockups) -- doscsi scan for scsi devices (breaks some ethernet cards) -- nodetect causes hwsetup/kudzu and hotplug not to run -- dofirewire modprobes firewire modules in initrd (for firewire cdroms,etc) -- nousb disables usb module load from initrd, disables hotplug -- nodhcp dhcp does not automatically start if nic detected -- doataraid loads ide raid modules from initrd -- dopcmcia starts pcmcia service -- noapm disables apm module load -- noraid disables loading of evms modules -- nohotplug disables loading hotplug service -- ide=nodma Force disabling of dma for malfunctioning ide devices -- cdcache Cache the entire runtime portion of cd in ram, allows you - to umount /mnt/cdrom to mount another cdrom. -- noraid disables autoloading of evms modules -- dokeymap enable keymap selection for non-us keyboard layouts -- noapic disable apic (try if having hardware problems ,nics,scsi,etc)