1 |
The locations approved by the council: |
2 |
|
3 |
DISTDIR="/var/cache/distfiles" |
4 |
PKGDIR="/var/cache/binpkgs" |
5 |
PORTDIR="/var/db/repos/gentoo" |
6 |
|
7 |
Bug: https://bugs.gentoo.org/684908 |
8 |
Signed-off-by: Zac Medico <zmedico@g.o> |
9 |
--- |
10 |
README | 2 +- |
11 |
catalyst/base/stagebase.py | 2 +- |
12 |
doc/catalyst-config.5.txt | 25 ++++++++++++------------- |
13 |
etc/catalyst.conf | 14 +++++++------- |
14 |
examples/generic_stage_template.spec | 2 +- |
15 |
examples/grp_template.spec | 2 +- |
16 |
examples/livecd-stage1_template.spec | 2 +- |
17 |
examples/livecd-stage2_template.spec | 4 ++-- |
18 |
examples/netboot_template.spec | 2 +- |
19 |
examples/stage4_template.spec | 4 ++-- |
20 |
examples/tinderbox_template.spec | 2 +- |
21 |
livecd/files/livecd-local.start | 4 ++-- |
22 |
12 files changed, 32 insertions(+), 33 deletions(-) |
23 |
|
24 |
diff --git a/README b/README |
25 |
index 7be176c3..63156373 100644 |
26 |
--- a/README |
27 |
+++ b/README |
28 |
@@ -52,7 +52,7 @@ distribution tarball's files directory. |
29 |
|
30 |
Example catalyst.conf: |
31 |
|
32 |
-distdir="/usr/portage/distfiles" |
33 |
+distdir="/var/cache/distfiles" |
34 |
options="pkgcache kerncache" |
35 |
sharedir="/usr/share/catalyst" |
36 |
|
37 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
38 |
index 54a1f389..4e81a9b1 100644 |
39 |
--- a/catalyst/base/stagebase.py |
40 |
+++ b/catalyst/base/stagebase.py |
41 |
@@ -1020,7 +1020,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
42 |
ouch = 1 |
43 |
log.warning("Couldn't umount bind mount: %s", target) |
44 |
|
45 |
- if "snapcache" in self.settings["options"] and x == "/usr/portage": |
46 |
+ if "snapcache" in self.settings["options"] and x == "/var/db/repos/gentoo": |
47 |
try: |
48 |
# It's possible the snapshot lock object isn't created yet. |
49 |
# This is because mount safety check calls unbind before the |
50 |
diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt |
51 |
index 957ab0e6..76ac4a29 100644 |
52 |
--- a/doc/catalyst-config.5.txt |
53 |
+++ b/doc/catalyst-config.5.txt |
54 |
@@ -31,14 +31,14 @@ envscript="/etc/catalyst/catalystrc" |
55 |
options="autoresume bindist kerncache pkgcache seedcache snapcache" |
56 |
|
57 |
# source repo settings |
58 |
-distdir="/usr/portage/distfiles" |
59 |
-portdir="/usr/portage" |
60 |
+distdir="/var/cache/distfiles" |
61 |
+portdir="/var/db/repos/gentoo" |
62 |
|
63 |
# target repo info |
64 |
-repo_basedir="/usr" |
65 |
-repo_name="portage" |
66 |
-target_distdir="/usr/portage/distfiles" |
67 |
-target_pkgdir="/usr/portage/packages" |
68 |
+repo_basedir="/var/db/repos" |
69 |
+repo_name="gentoo" |
70 |
+target_distdir="/var/cache/distfiles" |
71 |
+target_pkgdir="/var/cache/binpkgs" |
72 |
|
73 |
# other catalyst settings |
74 |
sharedir="/usr/share/catalyst" |
75 |
@@ -156,17 +156,16 @@ Repository settings |
76 |
|
77 |
*distdir*:: |
78 |
Source distfiles location used in generation of the stages. This is usually the |
79 |
-hosts distfiles location. `/usr/portage/distfiles` should work for most |
80 |
+hosts distfiles location. `/var/cache/distfiles` should work for most |
81 |
default installations, but it should be set to match your hosts configuration. |
82 |
|
83 |
*portdir*:: |
84 |
-Source Gentoo tree location (primary repo). `/usr/portage/` should work for most |
85 |
+Source Gentoo tree location (primary repo). `/var/db/repos/gentoo/` should work for most |
86 |
default installations. |
87 |
|
88 |
*repo_basedir*:: |
89 |
-The target repository directory to contain the rimary repo (gentoo repo) and |
90 |
-any overlays. `/usr` is the historical location. But that is in the process of |
91 |
-changing. `/var/gentoo/repos` is an option. |
92 |
+The target repository directory to contain the primary repo (gentoo repo) and |
93 |
+any overlays. The default location is `/var/db/repos`. |
94 |
|
95 |
*repo_name*:: |
96 |
The name of the main repository (ie: gentoo). This has had a directory name |
97 |
@@ -180,12 +179,12 @@ internal repo_name value should be the same. |
98 |
This is the target distfiles directory location for the stage being created. |
99 |
This is important because this value will be stored in the stage's make.conf |
100 |
and will become the default location used if it is not edited by users. |
101 |
-The default location is `/usr/portage/distfiles`. |
102 |
+The default location is `/var/cache/distfiles`. |
103 |
|
104 |
*target_pkgdir*:: |
105 |
This is the target packages directory for storing binpkgs in the stage being |
106 |
built. This location is stored in the make.conf of the stage being built. |
107 |
-The default location for this has typically been `/usr/portage/packages` |
108 |
+The default location for this has typically been `/var/cache/binpkgs` |
109 |
|
110 |
Other settings |
111 |
~~~~~~~~~~~~~~ |
112 |
diff --git a/etc/catalyst.conf b/etc/catalyst.conf |
113 |
index 7d7f7aba..5a5eedba 100644 |
114 |
--- a/etc/catalyst.conf |
115 |
+++ b/etc/catalyst.conf |
116 |
@@ -28,7 +28,7 @@ contents="auto" |
117 |
|
118 |
# distdir specifies where your distfiles are located. This setting should |
119 |
# work fine for most default installations. |
120 |
-distdir="/usr/portage/distfiles" |
121 |
+distdir="/var/cache/distfiles" |
122 |
|
123 |
# envscript allows users to set options such as http proxies, MAKEOPTS, |
124 |
# GENTOO_MIRRORS, or any other environment variables needed for building. |
125 |
@@ -84,18 +84,18 @@ hash_function="crc32" |
126 |
options="autoresume bindist kerncache pkgcache seedcache snapcache" |
127 |
|
128 |
# Source portdir specifies the source portage tree used by the snapshot target. |
129 |
-portdir="/usr/portage" |
130 |
+portdir="/var/db/repos/gentoo" |
131 |
|
132 |
# Target portdir setting. It needs to be in 2 parts. |
133 |
# They will be used separately, then added together where needed. |
134 |
# eg: |
135 |
-# repo_basedir="/var/lib/repos" |
136 |
+# repo_basedir="/var/db/repos" |
137 |
# repo_name="gentoo" |
138 |
# |
139 |
-repo_basedir="/usr" |
140 |
-repo_name="portage" |
141 |
-target_distdir="/usr/portage/distfiles" |
142 |
-target_pkgdir="/usr/portage/packages" |
143 |
+repo_basedir="/var/db/repos" |
144 |
+repo_name="gentoo" |
145 |
+target_distdir="/var/cache/distfiles" |
146 |
+target_pkgdir="/var/cache/binpkgs" |
147 |
|
148 |
# sharedir specifies where all of the catalyst runtime executables |
149 |
# and other shared lib objects are. |
150 |
diff --git a/examples/generic_stage_template.spec b/examples/generic_stage_template.spec |
151 |
index 40a3d5c0..01c37789 100644 |
152 |
--- a/examples/generic_stage_template.spec |
153 |
+++ b/examples/generic_stage_template.spec |
154 |
@@ -28,7 +28,7 @@ target: |
155 |
rel_type: |
156 |
|
157 |
# This is the system profile to be used by catalyst to build this target. It is |
158 |
-# specified as a relative path from /usr/portage/profiles. |
159 |
+# specified as a relative path from /var/db/repos/gentoo/profiles. |
160 |
# example: |
161 |
# profile: default-linux/x86/2006.1 |
162 |
profile: |
163 |
diff --git a/examples/grp_template.spec b/examples/grp_template.spec |
164 |
index 71160266..3a0e15a8 100644 |
165 |
--- a/examples/grp_template.spec |
166 |
+++ b/examples/grp_template.spec |
167 |
@@ -28,7 +28,7 @@ target: grp |
168 |
rel_type: |
169 |
|
170 |
# This is the system profile to be used by catalyst to build this target. It is |
171 |
-# specified as a relative path from /usr/portage/profiles. |
172 |
+# specified as a relative path from /var/db/repos/gentoo/profiles. |
173 |
# example: |
174 |
# profile: default-linux/x86/2006.1 |
175 |
profile: |
176 |
diff --git a/examples/livecd-stage1_template.spec b/examples/livecd-stage1_template.spec |
177 |
index 90ae1990..c7086c91 100644 |
178 |
--- a/examples/livecd-stage1_template.spec |
179 |
+++ b/examples/livecd-stage1_template.spec |
180 |
@@ -28,7 +28,7 @@ target: |
181 |
rel_type: |
182 |
|
183 |
# This is the system profile to be used by catalyst to build this target. It is |
184 |
-# specified as a relative path from /usr/portage/profiles. |
185 |
+# specified as a relative path from /var/db/repos/gentoo/profiles. |
186 |
# example: |
187 |
# profile: default-linux/x86/2006.1 |
188 |
profile: |
189 |
diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec |
190 |
index 8aa454c9..cc5cf00e 100644 |
191 |
--- a/examples/livecd-stage2_template.spec |
192 |
+++ b/examples/livecd-stage2_template.spec |
193 |
@@ -28,7 +28,7 @@ target: |
194 |
rel_type: |
195 |
|
196 |
# This is the system profile to be used by catalyst to build this target. It is |
197 |
-# specified as a relative path from /usr/portage/profiles. |
198 |
+# specified as a relative path from /var/db/repos/gentoo/profiles. |
199 |
# example: |
200 |
# profile: default-linux/x86/2006.1 |
201 |
profile: |
202 |
@@ -354,7 +354,7 @@ livecd/unmerge: |
203 |
# rid of files that don't belong to a particular package, or removing files from |
204 |
# a package that you wish to keep, but won't need the full functionality. |
205 |
# example: |
206 |
-# livecd/empty: /var/tmp /var/cache /var/db /var/empty /var/lock /var/log /var/run /var/spool /var/state /tmp /usr/portage /usr/share/man /usr/share/info /usr/share/unimaps /usr/include /usr/share/zoneinfo /usr/share/dict /usr/share/doc /usr/share/ss /usr/share/state /usr/share/texinfo /usr/lib/python2.2 /usr/lib/portage /usr/share/gettext /usr/share/i18n /usr/share/rfc /usr/lib/X11/config /usr/lib/X11/etc /usr/lib/X11/doc /usr/src /usr/share/doc /usr/share/man /etc/cron.daily /etc/cron.hourly /etc/cron.monthly /etc/cron.weekly /etc/logrotate.d /etc/rsync /usr/lib/awk /usr/lib/ccache /usr/lib/gcc-config /usr/lib/nfs /usr/local /usr/diet/include /usr/diet/man /usr/share/consolefonts/partialfonts /usr/share/consoletrans /usr/share/emacs /usr/share/gcc-data /usr/share/genkernel /etc/bootsplash/gentoo /etc/bootsplash/gentoo-highquality /etc/splash/gentoo /etc/splash/emergence /usr/share/gnuconfig /usr/share/lcms /usr/share/locale /etc/skel |
207 |
+# livecd/empty: /var/tmp /var/cache /var/db /var/empty /var/lock /var/log /var/run /var/spool /var/state /tmp /var/db/repos/gentoo /usr/share/man /usr/share/info /usr/share/unimaps /usr/include /usr/share/zoneinfo /usr/share/dict /usr/share/doc /usr/share/ss /usr/share/state /usr/share/texinfo /usr/lib/python2.2 /usr/lib/portage /usr/share/gettext /usr/share/i18n /usr/share/rfc /usr/lib/X11/config /usr/lib/X11/etc /usr/lib/X11/doc /usr/src /usr/share/doc /usr/share/man /etc/cron.daily /etc/cron.hourly /etc/cron.monthly /etc/cron.weekly /etc/logrotate.d /etc/rsync /usr/lib/awk /usr/lib/ccache /usr/lib/gcc-config /usr/lib/nfs /usr/local /usr/diet/include /usr/diet/man /usr/share/consolefonts/partialfonts /usr/share/consoletrans /usr/share/emacs /usr/share/gcc-data /usr/share/genkernel /etc/bootsplash/gentoo /etc/bootsplash/gentoo-highquality /etc/splash/gentoo /etc/splash/emergence /usr/share/gnuconfig /usr/share/lcms /usr/share/locale /etc/skel |
208 |
livecd/empty: |
209 |
|
210 |
# This option tells catalyst to clean specific files from the filesystem and is |
211 |
diff --git a/examples/netboot_template.spec b/examples/netboot_template.spec |
212 |
index 0cffc661..c1726103 100644 |
213 |
--- a/examples/netboot_template.spec |
214 |
+++ b/examples/netboot_template.spec |
215 |
@@ -28,7 +28,7 @@ target: |
216 |
rel_type: |
217 |
|
218 |
# This is the system profile to be used by catalyst to build this target. It is |
219 |
-# specified as a relative path from /usr/portage/profiles. |
220 |
+# specified as a relative path from /var/db/repos/gentoo/profiles. |
221 |
# example: |
222 |
# profile: default-linux/x86/2006.1 |
223 |
profile: |
224 |
diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec |
225 |
index 4066bf5b..fe394f3e 100644 |
226 |
--- a/examples/stage4_template.spec |
227 |
+++ b/examples/stage4_template.spec |
228 |
@@ -28,7 +28,7 @@ target: |
229 |
rel_type: |
230 |
|
231 |
# This is the system profile to be used by catalyst to build this target. It is |
232 |
-# specified as a relative path from /usr/portage/profiles. |
233 |
+# specified as a relative path from /var/db/repos/gentoo/profiles. |
234 |
# example: |
235 |
# profile: default-linux/x86/2006.1 |
236 |
profile: |
237 |
@@ -252,7 +252,7 @@ stage4/unmerge: |
238 |
# rid of files that don't belong to a particular package, or removing files from |
239 |
# a package that you wish to keep, but won't need the full functionality. |
240 |
# example: |
241 |
-# stage4/empty: /var/tmp /var/cache /var/db /var/empty /var/lock /var/log /var/run /var/spool /var/state /tmp /usr/portage /usr/share/man /usr/share/info /usr/share/unimaps /usr/include /usr/share/zoneinfo /usr/share/dict /usr/share/doc /usr/share/ss /usr/share/state /usr/share/texinfo /usr/lib/python2.2 /usr/lib/portage /usr/share/gettext /usr/share/i18n /usr/share/rfc /usr/lib/X11/config /usr/lib/X11/etc /usr/lib/X11/doc /usr/src /usr/share/doc /usr/share/man /etc/cron.daily /etc/cron.hourly /etc/cron.monthly /etc/cron.weekly /etc/logrotate.d /etc/rsync /usr/lib/awk /usr/lib/ccache /usr/lib/gcc-config /usr/lib/nfs /usr/local /usr/diet/include /usr/diet/man /usr/share/consolefonts/partialfonts /usr/share/consoletrans /usr/share/emacs /usr/share/gcc-data /usr/share/genkernel /etc/splash/gentoo /etc/splash/emergence /usr/share/gnuconfig /usr/share/lcms /usr/share/locale /etc/skel |
242 |
+# stage4/empty: /var/tmp /var/cache /var/db /var/empty /var/lock /var/log /var/run /var/spool /var/state /tmp /var/db/repos/gentoo /usr/share/man /usr/share/info /usr/share/unimaps /usr/include /usr/share/zoneinfo /usr/share/dict /usr/share/doc /usr/share/ss /usr/share/state /usr/share/texinfo /usr/lib/python2.2 /usr/lib/portage /usr/share/gettext /usr/share/i18n /usr/share/rfc /usr/lib/X11/config /usr/lib/X11/etc /usr/lib/X11/doc /usr/src /usr/share/doc /usr/share/man /etc/cron.daily /etc/cron.hourly /etc/cron.monthly /etc/cron.weekly /etc/logrotate.d /etc/rsync /usr/lib/awk /usr/lib/ccache /usr/lib/gcc-config /usr/lib/nfs /usr/local /usr/diet/include /usr/diet/man /usr/share/consolefonts/partialfonts /usr/share/consoletrans /usr/share/emacs /usr/share/gcc-data /usr/share/genkernel /etc/splash/gentoo /etc/splash/emergence /usr/share/gnuconfig /usr/share/lcms /usr/share/locale /etc/skel |
243 |
stage4/empty: |
244 |
|
245 |
# This option tells catalyst to clean specific files from the filesystem and is |
246 |
diff --git a/examples/tinderbox_template.spec b/examples/tinderbox_template.spec |
247 |
index f1af09c8..d5575b4a 100644 |
248 |
--- a/examples/tinderbox_template.spec |
249 |
+++ b/examples/tinderbox_template.spec |
250 |
@@ -26,7 +26,7 @@ target: tinderbox |
251 |
rel_type: |
252 |
|
253 |
# This is the system profile to be used by catalyst to build this target. It is |
254 |
-# specified as a relative path from /usr/portage/profiles. |
255 |
+# specified as a relative path from /var/db/repos/gentoo/profiles. |
256 |
# example: |
257 |
# profile: default-linux/x86/2006.1 |
258 |
profile: |
259 |
diff --git a/livecd/files/livecd-local.start b/livecd/files/livecd-local.start |
260 |
index 11a7d28a..3615569c 100644 |
261 |
--- a/livecd/files/livecd-local.start |
262 |
+++ b/livecd/files/livecd-local.start |
263 |
@@ -16,10 +16,10 @@ |
264 |
|
265 |
if [ -d /usr/livecd/profiles ] |
266 |
then |
267 |
- ln -sf /usr/livecd/profiles /usr/portage/profiles |
268 |
+ ln -sf /usr/livecd/profiles /var/db/repos/gentoo/profiles |
269 |
fi |
270 |
|
271 |
if [ -d /usr/livecd/eclass ] |
272 |
then |
273 |
- ln -sf /usr/livecd/eclass /usr/portage/eclass |
274 |
+ ln -sf /usr/livecd/eclass /var/db/repos/gentoo/eclass |
275 |
fi |
276 |
-- |
277 |
2.21.0 |