From 1913a0800dc08e2dfb05b25398edec4078763548 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 13 Apr 2006 13:14:06 +0000 Subject: [PATCH] Removed portdir_overlay from the snapshot example spec and added portage_overlay to the example specs for the relevant targets. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1108 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 11 ++++++++++- examples/generic_stage_template.spec | 6 ++++++ examples/grp_template.spec | 6 ++++++ examples/livecd-stage1_template.spec | 6 ++++++ examples/livecd-stage2_template.spec | 6 ++++++ examples/netboot2_template.spec | 6 ++++++ examples/netboot_template.spec | 6 ++++++ examples/snapshot_template.spec | 6 ------ examples/stage4_template.spec | 6 ++++++ examples/tinderbox_template.spec | 6 ++++++ 10 files changed, 58 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index b15b9abc..70374ca7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.593 2006/04/04 16:08:11 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.594 2006/04/13 13:14:05 wolf31o2 Exp $ + + 13 Apr 2006; Chris Gianelloni + 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: + Removed portdir_overlay from the snapshot example spec and added + portage_overlay to the example specs for the relevant targets. 04 Apr 2006; Chris Gianelloni catalyst: This is 2.0_rc41 since it has better LiveCD support. diff --git a/examples/generic_stage_template.spec b/examples/generic_stage_template.spec index 6abdf603..466e2b6b 100644 --- a/examples/generic_stage_template.spec +++ b/examples/generic_stage_template.spec @@ -59,6 +59,12 @@ distcc_hosts: # portage_confdir: /etc/portage portage_confdir: +# This option specifies the location to a portage overlay that you would like to +# have used when building this target. +# example: +# portage_overlay: /usr/local/portage +portage_overlay: + # This allows the optional directory containing the output packages for # catalyst. Mainly used as a way for different spec files to access the same # cache directory. Default behavior is for this location to be autogenerated diff --git a/examples/grp_template.spec b/examples/grp_template.spec index 3e5e3163..fe78ee1b 100644 --- a/examples/grp_template.spec +++ b/examples/grp_template.spec @@ -56,6 +56,12 @@ distcc_hosts: # portage_confdir: /etc/portage portage_confdir: +# This option specifies the location to a portage overlay that you would like to +# have used when building this target. +# example: +# portage_overlay: /usr/local/portage +portage_overlay: + # This allows the optional directory containing the output packages for # catalyst. Mainly used as a way for different spec files to access the same # cache directory. Default behavior is for this location to be autogenerated diff --git a/examples/livecd-stage1_template.spec b/examples/livecd-stage1_template.spec index cadeac20..a0e54632 100644 --- a/examples/livecd-stage1_template.spec +++ b/examples/livecd-stage1_template.spec @@ -56,6 +56,12 @@ distcc_hosts: # portage_confdir: /etc/portage portage_confdir: +# This option specifies the location to a portage overlay that you would like to +# have used when building this target. +# example: +# portage_overlay: /usr/local/portage +portage_overlay: + # This allows the optional directory containing the output packages for # catalyst. Mainly used as a way for different spec files to access the same # cache directory. Default behavior is for this location to be autogenerated diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec index d9f3d7af..3fa956f5 100644 --- a/examples/livecd-stage2_template.spec +++ b/examples/livecd-stage2_template.spec @@ -56,6 +56,12 @@ distcc_hosts: # portage_confdir: /etc/portage portage_confdir: +# This option specifies the location to a portage overlay that you would like to +# have used when building this target. +# example: +# portage_overlay: /usr/local/portage +portage_overlay: + # This allows the optional directory containing the output packages for # catalyst. Mainly used as a way for different spec files to access the same # cache directory. Default behavior is for this location to be autogenerated diff --git a/examples/netboot2_template.spec b/examples/netboot2_template.spec index fe10b274..71e2fe00 100644 --- a/examples/netboot2_template.spec +++ b/examples/netboot2_template.spec @@ -6,6 +6,12 @@ profile: uclibc/mips snapshot: 20060107 source_subpath: default/stage3-mips-uclibc-mips3-20051026 +# This option specifies the location to a portage overlay that you would like to +# have used when building this target. +# example: +# portage_overlay: /usr/local/portage +portage_overlay: + boot/kernel: ip22r4k ip22r5k ip27r10k ip28r10k ip30r10k ip32r5k boot/kernel/ip22r4k/sources: =mips-sources-2.6.14.5 boot/kernel/ip22r5k/sources: =mips-sources-2.6.14.5 diff --git a/examples/netboot_template.spec b/examples/netboot_template.spec index 3b4b1f6e..11a40da0 100644 --- a/examples/netboot_template.spec +++ b/examples/netboot_template.spec @@ -56,6 +56,12 @@ distcc_hosts: # portage_confdir: /etc/portage portage_confdir: +# This option specifies the location to a portage overlay that you would like to +# have used when building this target. +# example: +# portage_overlay: /usr/local/portage +portage_overlay: + # This allows the optional directory containing the output packages for # catalyst. Mainly used as a way for different spec files to access the same # cache directory. Default behavior is for this location to be autogenerated diff --git a/examples/snapshot_template.spec b/examples/snapshot_template.spec index 80ba66a3..b4b6d9fa 100644 --- a/examples/snapshot_template.spec +++ b/examples/snapshot_template.spec @@ -9,9 +9,3 @@ target: # example: # version_stamp: 2005.0 version_stamp: - -# This option specifies the location to a portage overlay that you would like to -# have included in this snapshot. -# example: -# portdir_overlay: /usr/local/portage -portdir_overlay: diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec index ae6c53f8..6e44712b 100644 --- a/examples/stage4_template.spec +++ b/examples/stage4_template.spec @@ -56,6 +56,12 @@ distcc_hosts: # portage_confdir: /etc/portage portage_confdir: +# This option specifies the location to a portage overlay that you would like to +# have used when building this target. +# example: +# portage_overlay: /usr/local/portage +portage_overlay: + # This allows the optional directory containing the output packages for # catalyst. Mainly used as a way for different spec files to access the same # cache directory. Default behavior is for this location to be autogenerated diff --git a/examples/tinderbox_template.spec b/examples/tinderbox_template.spec index d26d880c..892c5adc 100644 --- a/examples/tinderbox_template.spec +++ b/examples/tinderbox_template.spec @@ -54,6 +54,12 @@ distcc_hosts: # portage_confdir: /etc/portage portage_confdir: +# This option specifies the location to a portage overlay that you would like to +# have used when building this target. +# example: +# portage_overlay: /usr/local/portage +portage_overlay: + # This allows the optional directory containing the output packages for # catalyst. Mainly used as a way for different spec files to access the same # cache directory. Default behavior is for this location to be autogenerated -- 2.26.2