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
|
17 |
configuration files
|
18 |
problems.
|
19 |
|
20 |
*portage_overlay*::
|
21 |
-This option specifies the location to a portage overlay that you would
|
22 |
-like to use when building this target (example: `/usr/local/portage`).
|
23 |
+This option specifies the location of the portage overlays that you
|
24 |
would
|
25 |
+like to have used when building this target. It takes a space-
|
26 |
separated list
|
27 |
+of directory names. (example: `/usr/local/portage`).
|
28 |
|
29 |
*pkgcache_path*::
|
30 |
This allows the optional directory containing the output packages for
|
31 |
diff --git a/examples/generic_stage_template.spec
|
32 |
b/examples/generic_stage_template.spec
|
33 |
index 01c37789..f8cda40a 100644
|
34 |
--- a/examples/generic_stage_template.spec
|
35 |
+++ b/examples/generic_stage_template.spec
|
36 |
@@ -96,8 +96,9 @@ distcc_hosts:
|
37 |
# portage_confdir: /etc/portage
|
38 |
portage_confdir:
|
39 |
|
40 |
-# This option specifies the location to a portage overlay that you
|
41 |
would like to
|
42 |
-# have used when building this target.
|
43 |
+# This option specifies the location of the portage overlays that you
|
44 |
would
|
45 |
+# like to have used when building this target. It takes a space-
|
46 |
separated list
|
47 |
+# of directory names.
|
48 |
# example:
|
49 |
# portage_overlay: /usr/local/portage
|
50 |
portage_overlay:
|
51 |
diff --git a/examples/livecd-stage1_template.spec b/examples/livecd-
|
52 |
stage1_template.spec
|
53 |
index c7086c91..c37616c0 100644
|
54 |
--- a/examples/livecd-stage1_template.spec
|
55 |
+++ b/examples/livecd-stage1_template.spec
|
56 |
@@ -59,8 +59,9 @@ distcc_hosts:
|
57 |
# portage_confdir: /etc/portage
|
58 |
portage_confdir:
|
59 |
|
60 |
-# This option specifies the location to a portage overlay that you
|
61 |
would like to
|
62 |
-# have used when building this target.
|
63 |
+# This option specifies the location of the portage overlays that you
|
64 |
would
|
65 |
+# like to have used when building this target. It takes a space-
|
66 |
separated list
|
67 |
+# of directory names.
|
68 |
# example:
|
69 |
# portage_overlay: /usr/local/portage
|
70 |
portage_overlay:
|
71 |
diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-
|
72 |
stage2_template.spec
|
73 |
index 56bda84a..dde1b27e 100644
|
74 |
--- a/examples/livecd-stage2_template.spec
|
75 |
+++ b/examples/livecd-stage2_template.spec
|
76 |
@@ -59,8 +59,9 @@ distcc_hosts:
|
77 |
# portage_confdir: /etc/portage
|
78 |
portage_confdir:
|
79 |
|
80 |
-# This option specifies the location to a portage overlay that you
|
81 |
would like to
|
82 |
-# have used when building this target.
|
83 |
+# This option specifies the location of the portage overlays that you
|
84 |
would
|
85 |
+# like to have used when building this target. It takes a space-
|
86 |
separated list
|
87 |
+# of directory names.
|
88 |
# example:
|
89 |
# portage_overlay: /usr/local/portage
|
90 |
portage_overlay:
|
91 |
diff --git a/examples/netboot_template.spec
|
92 |
b/examples/netboot_template.spec
|
93 |
index 4f76b8ff..196cbafb 100644
|
94 |
--- a/examples/netboot_template.spec
|
95 |
+++ b/examples/netboot_template.spec
|
96 |
@@ -6,8 +6,9 @@ profile: uclibc/mips
|
97 |
snapshot: 20060107
|
98 |
source_subpath: default/stage3-mips-uclibc-mips3-2006.126
|
99 |
|
100 |
-# This option specifies the location to a portage overlay that you
|
101 |
would like to
|
102 |
-# have used when building this target.
|
103 |
+# This option specifies the location of the portage overlays that you
|
104 |
would
|
105 |
+# like to have used when building this target. It takes a space-
|
106 |
separated list
|
107 |
+# of directory names.
|
108 |
# example:
|
109 |
# portage_overlay: /usr/local/portage
|
110 |
portage_overlay:
|
111 |
diff --git a/examples/stage4_template.spec
|
112 |
b/examples/stage4_template.spec
|
113 |
index 562bfaac..87240c0a 100644
|
114 |
--- a/examples/stage4_template.spec
|
115 |
+++ b/examples/stage4_template.spec
|
116 |
@@ -59,8 +59,9 @@ distcc_hosts:
|
117 |
# portage_confdir: /etc/portage
|
118 |
portage_confdir:
|
119 |
|
120 |
-# This option specifies the location to a portage overlay that you
|
121 |
would like to
|
122 |
-# have used when building this target.
|
123 |
+# This option specifies the location of the portage overlays that you
|
124 |
would
|
125 |
+# like to have used when building this target. It takes a space-
|
126 |
separated list
|
127 |
+# of directory names.
|
128 |
# example:
|
129 |
# portage_overlay: /usr/local/portage
|
130 |
portage_overlay:
|
131 |
--
|
132 |
2.28.0 |