Gentoo Archives: gentoo-catalyst

From: Felix Bier <Felix.Bier@×××××××××××××.com>
To: "gentoo-catalyst@l.g.o" <gentoo-catalyst@l.g.o>
Subject: [gentoo-catalyst] Re: [PATCH] Documentation: Make existing multi-overlay support more explicit
Date: Sun, 18 Oct 2020 15:07:25
Message-Id: a1dec589d03cb9230c50186bd0099bcfa15da8d6.camel@rohde-schwarz.com
In Reply to: [gentoo-catalyst] [PATCH] Documentation: Make existing multi-overlay support more explicit by Felix Bier
1 The code already supports multiple overlays. This commit adapts the
2 documentation to make this more explicit.
3 ---
4 doc/catalyst-spec.5.txt | 5 +++--
5 examples/generic_stage_template.spec | 5 +++--
6 examples/livecd-stage1_template.spec | 5 +++--
7 examples/livecd-stage2_template.spec | 5 +++--
8 examples/netboot_template.spec | 5 +++--
9 examples/stage4_template.spec | 5 +++--
10 6 files changed, 18 insertions(+), 12 deletions(-)
11
12 diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
13 index 43cd5d2f..beabd1b3 100644
14 --- a/doc/catalyst-spec.5.txt
15 +++ b/doc/catalyst-spec.5.txt
16 @@ -87,8 +87,9 @@ This is an optional directory containing portage configuration files
17 problems.
18
19 *portage_overlay*::
20 -This option specifies the location to a portage overlay that you would
21 -like to use when building this target (example: `/usr/local/portage`).
22 +This option specifies the location of the portage overlays that you would
23 +like to have used when building this target. It takes a space-separated list
24 +of directory names. (example: `/usr/local/portage`).
25
26 *pkgcache_path*::
27 This allows the optional directory containing the output packages for
28 diff --git a/examples/generic_stage_template.spec b/examples/generic_stage_template.spec
29 index 01c37789..f8cda40a 100644
30 --- a/examples/generic_stage_template.spec
31 +++ b/examples/generic_stage_template.spec
32 @@ -96,8 +96,9 @@ distcc_hosts:
33 # portage_confdir: /etc/portage
34 portage_confdir:
35
36 -# This option specifies the location to a portage overlay that you would like to
37 -# have used when building this target.
38 +# This option specifies the location of the portage overlays that you would
39 +# like to have used when building this target. It takes a space-separated list
40 +# of directory names.
41 # example:
42 # portage_overlay: /usr/local/portage
43 portage_overlay:
44 diff --git a/examples/livecd-stage1_template.spec b/examples/livecd-stage1_template.spec
45 index c7086c91..c37616c0 100644
46 --- a/examples/livecd-stage1_template.spec
47 +++ b/examples/livecd-stage1_template.spec
48 @@ -59,8 +59,9 @@ distcc_hosts:
49 # portage_confdir: /etc/portage
50 portage_confdir:
51
52 -# This option specifies the location to a portage overlay that you would like to
53 -# have used when building this target.
54 +# This option specifies the location of the portage overlays that you would
55 +# like to have used when building this target. It takes a space-separated list
56 +# of directory names.
57 # example:
58 # portage_overlay: /usr/local/portage
59 portage_overlay:
60 diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
61 index 56bda84a..dde1b27e 100644
62 --- a/examples/livecd-stage2_template.spec
63 +++ b/examples/livecd-stage2_template.spec
64 @@ -59,8 +59,9 @@ distcc_hosts:
65 # portage_confdir: /etc/portage
66 portage_confdir:
67
68 -# This option specifies the location to a portage overlay that you would like to
69 -# have used when building this target.
70 +# This option specifies the location of the portage overlays that you would
71 +# like to have used when building this target. It takes a space-separated list
72 +# of directory names.
73 # example:
74 # portage_overlay: /usr/local/portage
75 portage_overlay:
76 diff --git a/examples/netboot_template.spec b/examples/netboot_template.spec
77 index 4f76b8ff..196cbafb 100644
78 --- a/examples/netboot_template.spec
79 +++ b/examples/netboot_template.spec
80 @@ -6,8 +6,9 @@ profile: uclibc/mips
81 snapshot: 20060107
82 source_subpath: default/stage3-mips-uclibc-mips3-2006.126
83
84 -# This option specifies the location to a portage overlay that you would like to
85 -# have used when building this target.
86 +# This option specifies the location of the portage overlays that you would
87 +# like to have used when building this target. It takes a space-separated list
88 +# of directory names.
89 # example:
90 # portage_overlay: /usr/local/portage
91 portage_overlay:
92 diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec
93 index 562bfaac..87240c0a 100644
94 --- a/examples/stage4_template.spec
95 +++ b/examples/stage4_template.spec
96 @@ -59,8 +59,9 @@ distcc_hosts:
97 # portage_confdir: /etc/portage
98 portage_confdir:
99
100 -# This option specifies the location to a portage overlay that you would like to
101 -# have used when building this target.
102 +# This option specifies the location of the portage overlays that you would
103 +# like to have used when building this target. It takes a space-separated list
104 +# of directory names.
105 # example:
106 # portage_overlay: /usr/local/portage
107 portage_overlay:
108 --
109 2.28.0

Replies