[gentoo-commits] proj/catalyst:master commit in: doc/, examples/

[gentoo-commits] proj/catalyst:master commit in: doc/, examples/

[Matt Turner]

commit:     2861038ae8c3c67f3000c976ed8177f63169712c
Author:     Felix Bier <Felix.Bier <AT> rohde-schwarz <DOT> com>
AuthorDate: Tue Nov 10 00:56:19 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 16:34:57 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2861038a

doc: Make existing multi-overlay support more explicit

The code already supports multiple repositories. This commit adapts the
documentation to make this more explicit.

Signed-off-by: Felix Bier <felix.bier <AT> rohde-schwarz.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 doc/catalyst-spec.5.txt              | 5 +++--
 examples/generic_stage_template.spec | 5 +++--
 examples/livecd-stage1_template.spec | 5 +++--
 examples/livecd-stage2_template.spec | 5 +++--
 examples/netboot_template.spec       | 5 +++--
 examples/stage4_template.spec        | 5 +++--
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index 31e69820..4c1df857 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -81,8 +81,9 @@ This is an optional directory containing portage configuration files
 problems.
 
 *portage_overlay*::
-This option specifies the location to a portage overlay that you would
-like to use when building this target (example: `/usr/local/portage`).
+This option specifies the location of the ebuild repositories that you would
+like to have used when building this target. It takes a space-separated list
+of directory names. (example: `/usr/local/portage`).
 
 *pkgcache_path*::
 This allows the optional directory containing the output packages for

diff --git a/examples/generic_stage_template.spec b/examples/generic_stage_template.spec
index 8f0375c4..8c8889bf 100644
--- a/examples/generic_stage_template.spec
+++ b/examples/generic_stage_template.spec
@@ -89,8 +89,9 @@ decompressor_search_order: lbzip2 bzip2 tar pixz xz gzip squashfs
 # 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.
+# This option specifies the location of the ebuild repositories that you would
+# like to have used when building this target. It takes a space-separated list
+# of directory names.
 # example:
 # portage_overlay: /usr/local/portage
 portage_overlay:

diff --git a/examples/livecd-stage1_template.spec b/examples/livecd-stage1_template.spec
index b921372a..269a1e3d 100644
--- a/examples/livecd-stage1_template.spec
+++ b/examples/livecd-stage1_template.spec
@@ -52,8 +52,9 @@ source_subpath:
 # 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.
+# This option specifies the location of the ebuild repositories that you would
+# like to have used when building this target. It takes a space-separated list
+# of directory names.
 # example:
 # portage_overlay: /usr/local/portage
 portage_overlay:

diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
index ac1cd3e4..4f50919f 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -52,8 +52,9 @@ source_subpath:
 # 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.
+# This option specifies the location of the ebuild repositories that you would
+# like to have used when building this target. It takes a space-separated list
+# of directory names.
 # example:
 # portage_overlay: /usr/local/portage
 portage_overlay:

diff --git a/examples/netboot_template.spec b/examples/netboot_template.spec
index 4f76b8ff..ad9d993c 100644
--- a/examples/netboot_template.spec
+++ b/examples/netboot_template.spec
@@ -6,8 +6,9 @@ profile: uclibc/mips
 snapshot: 20060107
 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.
+# This option specifies the location of the ebuild repositories that you would
+# like to have used when building this target. It takes a space-separated list
+# of directory names.
 # example:
 # portage_overlay: /usr/local/portage
 portage_overlay:

diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec
index c901eabc..aea70e86 100644
--- a/examples/stage4_template.spec
+++ b/examples/stage4_template.spec
@@ -52,8 +52,9 @@ source_subpath:
 # 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.
+# This option specifies the location of the ebuild repositories that you would
+# like to have used when building this target. It takes a space-separated list
+# of directory names.
 # example:
 # portage_overlay: /usr/local/portage
 portage_overlay:

[gentoo-commits] proj/catalyst:wip/mattst88 commit in: doc/, examples/

[Matt Turner]

commit:     2861038ae8c3c67f3000c976ed8177f63169712c
Author:     Felix Bier <Felix.Bier <AT> rohde-schwarz <DOT> com>
AuthorDate: Tue Nov 10 00:56:19 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 16:34:57 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2861038a

doc: Make existing multi-overlay support more explicit

The code already supports multiple repositories. This commit adapts the
documentation to make this more explicit.

Signed-off-by: Felix Bier <felix.bier <AT> rohde-schwarz.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 doc/catalyst-spec.5.txt              | 5 +++--
 examples/generic_stage_template.spec | 5 +++--
 examples/livecd-stage1_template.spec | 5 +++--
 examples/livecd-stage2_template.spec | 5 +++--
 examples/netboot_template.spec       | 5 +++--
 examples/stage4_template.spec        | 5 +++--
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index 31e69820..4c1df857 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -81,8 +81,9 @@ This is an optional directory containing portage configuration files
 problems.
 
 *portage_overlay*::
-This option specifies the location to a portage overlay that you would
-like to use when building this target (example: `/usr/local/portage`).
+This option specifies the location of the ebuild repositories that you would
+like to have used when building this target. It takes a space-separated list
+of directory names. (example: `/usr/local/portage`).
 
 *pkgcache_path*::
 This allows the optional directory containing the output packages for

diff --git a/examples/generic_stage_template.spec b/examples/generic_stage_template.spec
index 8f0375c4..8c8889bf 100644
--- a/examples/generic_stage_template.spec
+++ b/examples/generic_stage_template.spec
@@ -89,8 +89,9 @@ decompressor_search_order: lbzip2 bzip2 tar pixz xz gzip squashfs
 # 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.
+# This option specifies the location of the ebuild repositories that you would
+# like to have used when building this target. It takes a space-separated list
+# of directory names.
 # example:
 # portage_overlay: /usr/local/portage
 portage_overlay:

diff --git a/examples/livecd-stage1_template.spec b/examples/livecd-stage1_template.spec
index b921372a..269a1e3d 100644
--- a/examples/livecd-stage1_template.spec
+++ b/examples/livecd-stage1_template.spec
@@ -52,8 +52,9 @@ source_subpath:
 # 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.
+# This option specifies the location of the ebuild repositories that you would
+# like to have used when building this target. It takes a space-separated list
+# of directory names.
 # example:
 # portage_overlay: /usr/local/portage
 portage_overlay:

diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
index ac1cd3e4..4f50919f 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -52,8 +52,9 @@ source_subpath:
 # 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.
+# This option specifies the location of the ebuild repositories that you would
+# like to have used when building this target. It takes a space-separated list
+# of directory names.
 # example:
 # portage_overlay: /usr/local/portage
 portage_overlay:

diff --git a/examples/netboot_template.spec b/examples/netboot_template.spec
index 4f76b8ff..ad9d993c 100644
--- a/examples/netboot_template.spec
+++ b/examples/netboot_template.spec
@@ -6,8 +6,9 @@ profile: uclibc/mips
 snapshot: 20060107
 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.
+# This option specifies the location of the ebuild repositories that you would
+# like to have used when building this target. It takes a space-separated list
+# of directory names.
 # example:
 # portage_overlay: /usr/local/portage
 portage_overlay:

diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec
index c901eabc..aea70e86 100644
--- a/examples/stage4_template.spec
+++ b/examples/stage4_template.spec
@@ -52,8 +52,9 @@ source_subpath:
 # 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.
+# This option specifies the location of the ebuild repositories that you would
+# like to have used when building this target. It takes a space-separated list
+# of directory names.
 # example:
 # portage_overlay: /usr/local/portage
 portage_overlay:

[gentoo-commits] proj/catalyst:pending/mattst88 commit in: examples/, doc/

[Matt Turner]

commit:     2861038ae8c3c67f3000c976ed8177f63169712c
Author:     Felix Bier <Felix.Bier <AT> rohde-schwarz <DOT> com>
AuthorDate: Tue Nov 10 00:56:19 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 16:34:57 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2861038a

doc: Make existing multi-overlay support more explicit

The code already supports multiple repositories. This commit adapts the
documentation to make this more explicit.

Signed-off-by: Felix Bier <felix.bier <AT> rohde-schwarz.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 doc/catalyst-spec.5.txt              | 5 +++--
 examples/generic_stage_template.spec | 5 +++--
 examples/livecd-stage1_template.spec | 5 +++--
 examples/livecd-stage2_template.spec | 5 +++--
 examples/netboot_template.spec       | 5 +++--
 examples/stage4_template.spec        | 5 +++--
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index 31e69820..4c1df857 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -81,8 +81,9 @@ This is an optional directory containing portage configuration files
 problems.
 
 *portage_overlay*::
-This option specifies the location to a portage overlay that you would
-like to use when building this target (example: `/usr/local/portage`).
+This option specifies the location of the ebuild repositories that you would
+like to have used when building this target. It takes a space-separated list
+of directory names. (example: `/usr/local/portage`).
 
 *pkgcache_path*::
 This allows the optional directory containing the output packages for

diff --git a/examples/generic_stage_template.spec b/examples/generic_stage_template.spec
index 8f0375c4..8c8889bf 100644
--- a/examples/generic_stage_template.spec
+++ b/examples/generic_stage_template.spec
@@ -89,8 +89,9 @@ decompressor_search_order: lbzip2 bzip2 tar pixz xz gzip squashfs
 # 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.
+# This option specifies the location of the ebuild repositories that you would
+# like to have used when building this target. It takes a space-separated list
+# of directory names.
 # example:
 # portage_overlay: /usr/local/portage
 portage_overlay:

diff --git a/examples/livecd-stage1_template.spec b/examples/livecd-stage1_template.spec
index b921372a..269a1e3d 100644
--- a/examples/livecd-stage1_template.spec
+++ b/examples/livecd-stage1_template.spec
@@ -52,8 +52,9 @@ source_subpath:
 # 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.
+# This option specifies the location of the ebuild repositories that you would
+# like to have used when building this target. It takes a space-separated list
+# of directory names.
 # example:
 # portage_overlay: /usr/local/portage
 portage_overlay:

diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
index ac1cd3e4..4f50919f 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -52,8 +52,9 @@ source_subpath:
 # 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.
+# This option specifies the location of the ebuild repositories that you would
+# like to have used when building this target. It takes a space-separated list
+# of directory names.
 # example:
 # portage_overlay: /usr/local/portage
 portage_overlay:

diff --git a/examples/netboot_template.spec b/examples/netboot_template.spec
index 4f76b8ff..ad9d993c 100644
--- a/examples/netboot_template.spec
+++ b/examples/netboot_template.spec
@@ -6,8 +6,9 @@ profile: uclibc/mips
 snapshot: 20060107
 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.
+# This option specifies the location of the ebuild repositories that you would
+# like to have used when building this target. It takes a space-separated list
+# of directory names.
 # example:
 # portage_overlay: /usr/local/portage
 portage_overlay:

diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec
index c901eabc..aea70e86 100644
--- a/examples/stage4_template.spec
+++ b/examples/stage4_template.spec
@@ -52,8 +52,9 @@ source_subpath:
 # 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.
+# This option specifies the location of the ebuild repositories that you would
+# like to have used when building this target. It takes a space-separated list
+# of directory names.
 # example:
 # portage_overlay: /usr/local/portage
 portage_overlay: