Removed portdir_overlay from the snapshot example spec and added portage_overlay...

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

diff --git a/ChangeLog b/ChangeLog
index b15b9abc6ea134b885966db67407112ccaec75d5..70374ca724086a85bd8b3f572c06f60aca765400 100644 (file)
--- 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 <wolf31o2@gentoo.org>
+  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 <wolf31o2@gentoo.org> 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 6abdf60360bdeb74f10809f9952c04f2c5780ea2..466e2b6bb5e2fbfc404213304c65a8f042d2789b 100644 (file)
--- 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 3e5e31639ad2596233905877bf99b35481369ff8..fe78ee1b9b3c5a7a0014cd74a5d0d07c7498fd7c 100644 (file)
--- 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 cadeac20c42634fa8ee20369e963d8b94cc9040f..a0e546327181092c41757b7194c9e1df21db4b43 100644 (file)
--- 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 d9f3d7afc6559707e2cf120cdeb31e0e39e45fe3..3fa956f53e85fff26eb53a0f943a0759cf96773a 100644 (file)
--- 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 fe10b27474d8389df102865d383b2d879ab3e632..71e2fe005feb76b1ca2831debf8c6d81477f12a3 100644 (file)
--- 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 3b4b1f6ebdc4eb12362edc1072a79c9e0ba4fe0d..11a40da0ffc8e1607971be2623daa53a1bed9b86 100644 (file)
--- 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 80ba66a39430763adc5bfc54ecf437c86f320849..b4b6d9fa1636e2f44309a1cfc31df2d4674011af 100644 (file)
--- 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 ae6c53f8a4e24c1a934056608516918e4f94d942..6e44712bf8c40e837bdadff923c829140fc445b5 100644 (file)
--- 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 d26d880c345cb93df002055c7acfb908e8b7d95c..892c5adc6df11cd55beccb04d3b7d6b3bc38b0ce 100644 (file)
--- 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