Update the examples to have 2006.1 for the dates. This is catalyst 2.0.2, so everyon...

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

diff --git a/ChangeLog b/ChangeLog
index ecbccb35b7de1eb2ba79189adfb33c389af2456b..8ceba423dc815ef7d920796d9264a7167d735ac6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  06 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  examples/generic_stage_template.spec, examples/grp_template.spec,
+  examples/livecd-stage1_template.spec,
+  examples/livecd-stage2_template.spec, examples/netboot2_template.spec,
+  examples/netboot_template.spec, examples/snapshot_template.spec,
+  examples/stage4_template.spec, examples/tinderbox_template.spec:
+  Update the examples to have 2006.1 for the dates. This is catalyst 2.0.2, so
+  everyone enjoy it.
+
   06 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> files/catalyst.conf,
   targets/support/livecdfs-update.sh:
   Make sure the user owns his home directory for bug #147195.

diff --git a/catalyst b/catalyst
index 0dfab97d66d90bd2f1523b7874fe08e7904dd782..6a14c691edd208b06e0d5e0676935032118da3c3 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.1"
+__version__="2.0.2"
 
 conf_values={}
 

diff --git a/examples/generic_stage_template.spec b/examples/generic_stage_template.spec
index 466e2b6bb5e2fbfc404213304c65a8f042d2789b..a1269b55361d99c6674af5f429752fc83238e403 100644 (file)
--- a/examples/generic_stage_template.spec
+++ b/examples/generic_stage_template.spec
@@ -11,7 +11,7 @@ subarch:
 # The version stamp is an identifier for the build.  It can be anything you wish
 # it to be, but it is usually a date.
 # example:
-# version_stamp: 2005.0
+# version_stamp: 2006.1
 version_stamp: 
 
 # The target specifies what target we want catalyst to do. For stages, the
@@ -30,19 +30,19 @@ rel_type:
 # This is the system profile to be used by catalyst to build this target.  It is
 # specified as a relative path from /usr/portage/profiles.
 # example:
-# profile: default-linux/x86/2005.0
+# profile: default-linux/x86/2006.1
 profile:
 
 # This specifies which snapshot to use for building this target.
 # example:
-# snapshot: 20050324
+# snapshot: 2006.1
 snapshot:
 
 # This specifies where the seed stage comes from for this target,  The path is
 # relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix
 # for the seed.
 # example:
-# default/stage3-x86-2004.3
+# default/stage3-x86-2006.1
 source_subpath:
 
 # These are the hosts used as distcc slaves when distcc is enabled in your 

diff --git a/examples/grp_template.spec b/examples/grp_template.spec
index fe78ee1b9b3c5a7a0014cd74a5d0d07c7498fd7c..88e00e6d4404122afcf38e5c4001e01be0200823 100644 (file)
--- a/examples/grp_template.spec
+++ b/examples/grp_template.spec
@@ -10,7 +10,7 @@ subarch:
 
 # The version stamp is an identifier for the build.  It can be anything you wish# it to be, but it is usually a date.
 # example:
-# version_stamp: 2005.0
+# version_stamp: 2006.1
 version_stamp:
 
 # The target specifies what target we want catalyst to do. For GRP, the
@@ -28,18 +28,18 @@ rel_type:
 
 # This is the system profile to be used by catalyst to build this target.  It is# specified as a relative path from /usr/portage/profiles.
 # example:
-# profile: default-linux/x86/2005.0
+# profile: default-linux/x86/2006.1
 profile:
 
 # This specifies which snapshot to use for building this target.
 # example:
-# snapshot: 20050324
+# snapshot: 2006.1
 snapshot:
 
 # This specifies where the seed stage comes from for this target,  The path is
 # relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix# for the seed.
 # example:
-# default/stage3-x86-2004.3
+# default/stage3-x86-2006.1
 source_subpath:
 
 # These are the hosts used as distcc slaves when distcc is enabled in your

diff --git a/examples/livecd-stage1_template.spec b/examples/livecd-stage1_template.spec
index a0e546327181092c41757b7194c9e1df21db4b43..dbd76e00e34368ff33f7b5930c0a8a0c2d273ad6 100644 (file)
--- a/examples/livecd-stage1_template.spec
+++ b/examples/livecd-stage1_template.spec
@@ -10,7 +10,7 @@ subarch:
 
 # The version stamp is an identifier for the build.  It can be anything you wish# it to be, but it is usually a date.
 # example:
-# version_stamp: 2005.0
+# version_stamp: 2006.1
 version_stamp:
 
 # The target specifies what target we want catalyst to do.  For building a CD,
@@ -28,18 +28,18 @@ rel_type:
 
 # This is the system profile to be used by catalyst to build this target.  It is# specified as a relative path from /usr/portage/profiles.
 # example:
-# profile: default-linux/x86/2005.0
+# profile: default-linux/x86/2006.1
 profile:
 
 # This specifies which snapshot to use for building this target.
 # example:
-# snapshot: 20050324
+# snapshot: 2006.1
 snapshot:
 
 # This specifies where the seed stage comes from for this target,  The path is
 # relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix# for the seed.
 # example:
-# default/stage3-x86-2004.3
+# default/stage3-x86-2006.1
 source_subpath:
 
 # These are the hosts used as distcc slaves when distcc is enabled in your

diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
index 34068fae6d3c2e26a4e8303c8dc5ae4b0cbde3c4..05cb0d1d776dbbda61431659636b87f4a3dd8b63 100644 (file)
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -10,7 +10,7 @@ subarch:
 
 # The version stamp is an identifier for the build.  It can be anything you wish# it to be, but it is usually a date.
 # example:
-# version_stamp: 2005.0
+# version_stamp: 2006.1
 version_stamp:
 
 # The target specifies what target we want catalyst to do.  For building a CD,
@@ -28,18 +28,18 @@ rel_type:
 
 # This is the system profile to be used by catalyst to build this target.  It is# specified as a relative path from /usr/portage/profiles.
 # example:
-# profile: default-linux/x86/2005.0
+# profile: default-linux/x86/2006.1
 profile:
 
 # This specifies which snapshot to use for building this target.
 # example:
-# snapshot: 20050324
+# snapshot: 2006.1
 snapshot:
 
 # This specifies where the seed stage comes from for this target,  The path is
 # relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix# for the seed.
 # example:
-# default/livecd-stage1-x86-2004.3
+# default/livecd-stage1-x86-2006.1
 source_subpath:
 
 # These are the hosts used as distcc slaves when distcc is enabled in your
@@ -131,7 +131,7 @@ livecd/splash_type:
 # /etc/splash or /etc/bootsplash, depending on your livecd/splash_type, before
 # the kernel has completed building during the livecd-stage2 target.
 # example:
-# livecd/splash_theme: livecd-2005.0
+# livecd/splash_theme: livecd-2006.1
 livecd/splash_theme:
 
 # This is a set of arguments that get passed to the bootloader for your CD.  It
@@ -268,7 +268,7 @@ livecd/users:
 
 # This option sets the volume ID of the CD created.
 # example:
-# livecd/volid: Gentoo Linux 2005.0 X86
+# livecd/volid: Gentoo Linux 2006.1 X86
 livecd/volid:
 
 # This option is only used when creating a GameCD.  This specifies the file that
@@ -359,5 +359,5 @@ livecd/empty:
 # This option tells catalyst to clean specific files from the filesystem and is
 # very usefu in cleaning up stray files in /etc left over after livecd/unmerge.
 # example:
-# livecd/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* /etc/dispatch-conf.conf /etc/etc-update.conf /etc/*- /etc/issue* /etc/make.conf /etc/man.conf /etc/*.old /root/.viminfo /usr/sbin/bootsplash* /usr/sbin/fb* /usr/sbin/fsck.cramfs /usr/sbin/fsck.minix /usr/sbin/mkfs.minix /usr/sbin/mkfs.bfs /usr/sbin/mkfs.cramfs /lib/security/pam_access.so /lib/security/pam_chroot.so /lib/security/pam_debug.so /lib/security/pam_ftp.so /lib/security/pam_issue.so /lib/security/pam_mail.so /lib/security/pam_motd.so /lib/security/pam_mkhomedir.so /lib/security/pam_postgresok.so /lib/security/pam_rhosts_auth.so /lib/security/pam_userdb.so /usr/share/consolefonts/1* /usr/share/consolefonts/7* /usr/share/consolefonts/8* /usr/share/consolefonts/9* /usr/share/consolefonts/A* /usr/share/consolefonts/C* /usr/share/consolefonts/E* /usr/share/consolefonts/G* /usr/share/consolefonts/L* /usr/share/consolefonts/M* /usr/share/consolefonts/R* /usr/share/consolefonts/a* /usr/share/consolefonts/c* /usr/share/consolefonts/dr* /usr/share/consolefonts/g* /usr/share/consolefonts/i* /usr/share/consolefonts/k* /usr/share/consolefonts/l* /usr/share/consolefonts/r* /usr/share/consolefonts/s* /usr/share/consolefonts/t* /usr/share/consolefonts/v* /etc/splash/livecd-2005.0/16* /etc/splash/livecd-2005.0/12* /etc/splash/livecd-2005.0/6* /etc/splash/livecd-2005.0/8* /etc/splash/livecd-2005.0/images/silent-16* /etc/splash/livecd-2005.0/images/silent-12* /etc/splash/livecd-2005.0/images/silent-6* /etc/splash/livecd-2005.0/images/silent-8* /etc/splash/livecd-2005.0/images/verbose-16* /etc/splash/livecd-2005.0/images/verbose-12* /etc/splash/livecd-2005.0/images/verbose-6* /etc/splash/livecd-2005.0/images/verbose-8* /etc/make.conf.example /etc/make.globals /etc/resolv.conf
+# livecd/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* /etc/dispatch-conf.conf /etc/etc-update.conf /etc/*- /etc/issue* /etc/make.conf /etc/man.conf /etc/*.old /root/.viminfo /usr/sbin/bootsplash* /usr/sbin/fb* /usr/sbin/fsck.cramfs /usr/sbin/fsck.minix /usr/sbin/mkfs.minix /usr/sbin/mkfs.bfs /usr/sbin/mkfs.cramfs /lib/security/pam_access.so /lib/security/pam_chroot.so /lib/security/pam_debug.so /lib/security/pam_ftp.so /lib/security/pam_issue.so /lib/security/pam_mail.so /lib/security/pam_motd.so /lib/security/pam_mkhomedir.so /lib/security/pam_postgresok.so /lib/security/pam_rhosts_auth.so /lib/security/pam_userdb.so /usr/share/consolefonts/1* /usr/share/consolefonts/7* /usr/share/consolefonts/8* /usr/share/consolefonts/9* /usr/share/consolefonts/A* /usr/share/consolefonts/C* /usr/share/consolefonts/E* /usr/share/consolefonts/G* /usr/share/consolefonts/L* /usr/share/consolefonts/M* /usr/share/consolefonts/R* /usr/share/consolefonts/a* /usr/share/consolefonts/c* /usr/share/consolefonts/dr* /usr/share/consolefonts/g* /usr/share/consolefonts/i* /usr/share/consolefonts/k* /usr/share/consolefonts/l* /usr/share/consolefonts/r* /usr/share/consolefonts/s* /usr/share/consolefonts/t* /usr/share/consolefonts/v* /etc/splash/livecd-2006.1/16* /etc/splash/livecd-2006.1/12* /etc/splash/livecd-2006.1/6* /etc/splash/livecd-2006.1/8* /etc/splash/livecd-2006.1/images/silent-16* /etc/splash/livecd-2006.1/images/silent-12* /etc/splash/livecd-2006.1/images/silent-6* /etc/splash/livecd-2006.1/images/silent-8* /etc/splash/livecd-2006.1/images/verbose-16* /etc/splash/livecd-2006.1/images/verbose-12* /etc/splash/livecd-2006.1/images/verbose-6* /etc/splash/livecd-2006.1/images/verbose-8* /etc/make.conf.example /etc/make.globals /etc/resolv.conf
 livecd/rm:

diff --git a/examples/netboot2_template.spec b/examples/netboot2_template.spec
index 71e2fe005feb76b1ca2831debf8c6d81477f12a3..1c7e32b54850a046d3c67a664c5f83c644352a13 100644 (file)
--- a/examples/netboot2_template.spec
+++ b/examples/netboot2_template.spec
@@ -4,7 +4,7 @@ target: netboot2
 rel_type: default
 profile: uclibc/mips
 snapshot: 20060107
-source_subpath: default/stage3-mips-uclibc-mips3-20051026
+source_subpath: default/stage3-mips-uclibc-mips3-2006.126
 
 # This option specifies the location to a portage overlay that you would like to
 # have used when building this target.

diff --git a/examples/netboot_template.spec b/examples/netboot_template.spec
index 11a40da0ffc8e1607971be2623daa53a1bed9b86..3263a967affd4195f59760fc9e692bd6010cb4b3 100644 (file)
--- a/examples/netboot_template.spec
+++ b/examples/netboot_template.spec
@@ -10,7 +10,7 @@ subarch:
 
 # The version stamp is an identifier for the build.  It can be anything you wish# it to be, but it is usually a date.
 # example:
-# version_stamp: 2005.0
+# version_stamp: 2006.1
 version_stamp:
 
 # The target specifies what target we want catalyst to do.  For building a
@@ -28,18 +28,18 @@ rel_type:
 
 # This is the system profile to be used by catalyst to build this target.  It is# specified as a relative path from /usr/portage/profiles.
 # example:
-# profile: default-linux/x86/2005.0
+# profile: default-linux/x86/2006.1
 profile:
 
 # This specifies which snapshot to use for building this target.
 # example:
-# snapshot: 20050324
+# snapshot: 2006.1
 snapshot:
 
 # This specifies where the seed stage comes from for this target,  The path is
 # relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix# for the seed.
 # example:
-# default/stage3-x86-2004.3
+# default/stage3-x86-2006.1
 source_subpath:
 
 # These are the hosts used as distcc slaves when distcc is enabled in your

diff --git a/examples/snapshot_template.spec b/examples/snapshot_template.spec
index b4b6d9fa1636e2f44309a1cfc31df2d4674011af..f683f25d32175f1afdd2ff6bcaa8cb46d23a0e05 100644 (file)
--- a/examples/snapshot_template.spec
+++ b/examples/snapshot_template.spec
@@ -7,5 +7,5 @@ target:
 
 # The version stamp is an identifier for the build.  It can be anything you wish# it to be, but it is usually a date.
 # example:
-# version_stamp: 2005.0
+# version_stamp: 2006.1
 version_stamp:

diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec
index 6e44712bf8c40e837bdadff923c829140fc445b5..1a05c8d4989d03cf21b27948f45dc8001db58a5b 100644 (file)
--- a/examples/stage4_template.spec
+++ b/examples/stage4_template.spec
@@ -10,7 +10,7 @@ subarch:
 
 # The version stamp is an identifier for the build.  It can be anything you wish# it to be, but it is usually a date.
 # example:
-# version_stamp: 2005.0
+# version_stamp: 2006.1
 version_stamp:
 
 # The target specifies what target we want catalyst to do.  For building a CD,
@@ -28,18 +28,18 @@ rel_type:
 
 # This is the system profile to be used by catalyst to build this target.  It is# specified as a relative path from /usr/portage/profiles.
 # example:
-# profile: default-linux/x86/2005.0
+# profile: default-linux/x86/2006.1
 profile:
 
 # This specifies which snapshot to use for building this target.
 # example:
-# snapshot: 20050324
+# snapshot: 2006.1
 snapshot:
 
 # This specifies where the seed stage comes from for this target,  The path is
 # relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix# for the seed.
 # example:
-# default/stage3-x86-2004.3
+# default/stage3-x86-2006.1
 source_subpath:
 
 # These are the hosts used as distcc slaves when distcc is enabled in your
@@ -116,7 +116,7 @@ stage4/splash_type:
 # /etc/splash or /etc/bootsplash, depending on your stage4/splash_type, before
 # the kernel has completed building during the stage4-stage2 target.
 # example:
-# stage4/splash_theme: livecd-2005.0
+# stage4/splash_theme: livecd-2006.1
 stage4/splash_theme:
 
 # This is a set of arguments that will be passed to genkernel for all kernels
@@ -268,5 +268,5 @@ stage4/empty:
 # This option tells catalyst to clean specific files from the filesystem and is
 # very usefu in cleaning up stray files in /etc left over after stage4/unmerge.
 # example:
-# stage4/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* /etc/dispatch-conf.conf /etc/etc-update.conf /etc/*- /etc/issue* /etc/make.conf /etc/man.conf /etc/*.old /root/.viminfo /usr/sbin/bootsplash* /usr/sbin/fb* /usr/sbin/fsck.cramfs /usr/sbin/fsck.minix /usr/sbin/mkfs.minix /usr/sbin/mkfs.bfs /usr/sbin/mkfs.cramfs /lib/security/pam_access.so /lib/security/pam_chroot.so /lib/security/pam_debug.so /lib/security/pam_ftp.so /lib/security/pam_issue.so /lib/security/pam_mail.so /lib/security/pam_motd.so /lib/security/pam_mkhomedir.so /lib/security/pam_postgresok.so /lib/security/pam_rhosts_auth.so /lib/security/pam_userdb.so /usr/share/consolefonts/1* /usr/share/consolefonts/7* /usr/share/consolefonts/8* /usr/share/consolefonts/9* /usr/share/consolefonts/A* /usr/share/consolefonts/C* /usr/share/consolefonts/E* /usr/share/consolefonts/G* /usr/share/consolefonts/L* /usr/share/consolefonts/M* /usr/share/consolefonts/R* /usr/share/consolefonts/a* /usr/share/consolefonts/c* /usr/share/consolefonts/dr* /usr/share/consolefonts/g* /usr/share/consolefonts/i* /usr/share/consolefonts/k* /usr/share/consolefonts/l* /usr/share/consolefonts/r* /usr/share/consolefonts/s* /usr/share/consolefonts/t* /usr/share/consolefonts/v* /etc/splash/livecd-2005.0/16* /etc/splash/livecd-2005.0/12* /etc/splash/livecd-2005.0/6* /etc/splash/livecd-2005.0/8* /etc/splash/livecd-2005.0/images/silent-16* /etc/splash/livecd-2005.0/images/silent-12* /etc/splash/livecd-2005.0/images/silent-6* /etc/splash/livecd-2005.0/images/silent-8* /etc/splash/livecd-2005.0/images/verbose-16* /etc/splash/livecd-2005.0/images/verbose-12* /etc/splash/livecd-2005.0/images/verbose-6* /etc/splash/livecd-2005.0/images/verbose-8* /etc/make.conf.example /etc/make.globals /etc/resolv.conf
+# stage4/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* /etc/dispatch-conf.conf /etc/etc-update.conf /etc/*- /etc/issue* /etc/make.conf /etc/man.conf /etc/*.old /root/.viminfo /usr/sbin/bootsplash* /usr/sbin/fb* /usr/sbin/fsck.cramfs /usr/sbin/fsck.minix /usr/sbin/mkfs.minix /usr/sbin/mkfs.bfs /usr/sbin/mkfs.cramfs /lib/security/pam_access.so /lib/security/pam_chroot.so /lib/security/pam_debug.so /lib/security/pam_ftp.so /lib/security/pam_issue.so /lib/security/pam_mail.so /lib/security/pam_motd.so /lib/security/pam_mkhomedir.so /lib/security/pam_postgresok.so /lib/security/pam_rhosts_auth.so /lib/security/pam_userdb.so /usr/share/consolefonts/1* /usr/share/consolefonts/7* /usr/share/consolefonts/8* /usr/share/consolefonts/9* /usr/share/consolefonts/A* /usr/share/consolefonts/C* /usr/share/consolefonts/E* /usr/share/consolefonts/G* /usr/share/consolefonts/L* /usr/share/consolefonts/M* /usr/share/consolefonts/R* /usr/share/consolefonts/a* /usr/share/consolefonts/c* /usr/share/consolefonts/dr* /usr/share/consolefonts/g* /usr/share/consolefonts/i* /usr/share/consolefonts/k* /usr/share/consolefonts/l* /usr/share/consolefonts/r* /usr/share/consolefonts/s* /usr/share/consolefonts/t* /usr/share/consolefonts/v* /etc/splash/livecd-2006.1/16* /etc/splash/livecd-2006.1/12* /etc/splash/livecd-2006.1/6* /etc/splash/livecd-2006.1/8* /etc/splash/livecd-2006.1/images/silent-16* /etc/splash/livecd-2006.1/images/silent-12* /etc/splash/livecd-2006.1/images/silent-6* /etc/splash/livecd-2006.1/images/silent-8* /etc/splash/livecd-2006.1/images/verbose-16* /etc/splash/livecd-2006.1/images/verbose-12* /etc/splash/livecd-2006.1/images/verbose-6* /etc/splash/livecd-2006.1/images/verbose-8* /etc/make.conf.example /etc/make.globals /etc/resolv.conf
 stage4/rm:

diff --git a/examples/tinderbox_template.spec b/examples/tinderbox_template.spec
index 892c5adc6df11cd55beccb04d3b7d6b3bc38b0ce..2d70ffa86e9dbf5fe062a379414eccb5eeaeccff 100644 (file)
--- a/examples/tinderbox_template.spec
+++ b/examples/tinderbox_template.spec
@@ -9,7 +9,7 @@ subarch:
 
 # The version stamp is an identifier for the build.  It can be anything you wish# it to be, but it is usually a date.
 # example:
-# version_stamp: 2005.0
+# version_stamp: 2006.1
 version_stamp:
 
 # The target specifies what target we want catalyst to do.
@@ -26,18 +26,18 @@ rel_type:
 
 # This is the system profile to be used by catalyst to build this target.  It is# specified as a relative path from /usr/portage/profiles.
 # example:
-# profile: default-linux/x86/2005.0
+# profile: default-linux/x86/2006.1
 profile:
 
 # This specifies which snapshot to use for building this target.
 # example:
-# snapshot: 20050324
+# snapshot: 2006.1
 snapshot:
 
 # This specifies where the seed stage comes from for this target,  The path is
 # relative to $clst_sharedir/builds.  The rel_type is also used as a path prefix# for the seed.
 # example:
-# default/stage3-x86-2004.3
+# default/stage3-x86-2006.1
 source_subpath:
 
 # These are the hosts used as distcc slaves when distcc is enabled in your