1 |
commit: d56584f32de50a1b2840bafb712656011d5ee2b3 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 9 09:24:22 2017 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 9 09:35:53 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d56584f3 |
7 |
|
8 |
defaults.py: Update all repository, DISTDIR, PKGDIR settings to new /var paths |
9 |
|
10 |
All settings are still configurable in catalyst.conf. |
11 |
These are new reasonable settings for a relocated tree system. |
12 |
A user can still set their own locations during install, or at a later time. |
13 |
|
14 |
Default catalyst.conf settings will be changed at a later time after additional testing and |
15 |
the automatic stage building scripts have been updated. |
16 |
|
17 |
catalyst/defaults.py | 22 +++++++++++----------- |
18 |
1 file changed, 11 insertions(+), 11 deletions(-) |
19 |
|
20 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
21 |
index 84ed282..947e236 100644 |
22 |
--- a/catalyst/defaults.py |
23 |
+++ b/catalyst/defaults.py |
24 |
@@ -39,24 +39,24 @@ confdefaults={ |
25 |
"compressor_options": XATTRS_OPTIONS[TAR], |
26 |
"decomp_opt": DECOMPRESSOR_PROGRAM_OPTIONS[TAR], |
27 |
"decompressor_search_order": DECOMPRESSOR_SEARCH_ORDER, |
28 |
- "distdir": "/usr/portage/distfiles", |
29 |
+ "distdir": "/var/portage/distfiles", |
30 |
"hash_function": "crc32", |
31 |
"icecream": "/var/cache/icecream", |
32 |
'list_xattrs_opt': LIST_XATTRS_OPTIONS[TAR], |
33 |
- "local_overlay": "/usr/local/portage", |
34 |
+ "local_overlay": "/var/portage/repos/local", |
35 |
"port_conf": "/etc/portage", |
36 |
"make_conf": "%(port_conf)s/make.conf", |
37 |
"options": set(), |
38 |
- "packagedir": "/usr/portage/packages", |
39 |
- "portdir": "/usr/portage", |
40 |
+ "packagedir": "/var/portage/packages", |
41 |
+ "portdir": "/var/portage/repos", |
42 |
"port_tmpdir": "/var/tmp/portage", |
43 |
"PythonDir": "./catalyst", |
44 |
- "repo_basedir": "/usr", |
45 |
- "repo_name": "portage", |
46 |
+ "repo_basedir": "/var/portage/repos", |
47 |
+ "repo_name": "gentoo", |
48 |
"sharedir": "/usr/share/catalyst", |
49 |
"shdir": "/usr/share/catalyst/targets/", |
50 |
"snapshot_cache": "/var/tmp/catalyst/snapshot_cache", |
51 |
- "snapshot_name": "portage-", |
52 |
+ "snapshot_name": "%(repo_name)s-", |
53 |
"source_matching": "strict", |
54 |
"storedir": "/var/tmp/catalyst", |
55 |
"target_distdir": "/var/portage/distfiles", |
56 |
@@ -75,8 +75,8 @@ TARGET_MOUNT_DEFAULTS = { |
57 |
"distdir": "/usr/portage/distfiles", |
58 |
"icecream": "/usr/lib/icecc/bin", |
59 |
"kerncache": "/tmp/kerncache", |
60 |
- "packagedir": "/usr/portage/packages", |
61 |
- "portdir": "/usr/portage", |
62 |
+ "packagedir": "/var/portage/packages", |
63 |
+ "portdir": "/var/portage/repos", |
64 |
"port_tmpdir": "/var/tmp/portage", |
65 |
"port_logdir": "/var/log/portage", |
66 |
"proc": "/proc", |
67 |
@@ -86,8 +86,8 @@ TARGET_MOUNT_DEFAULTS = { |
68 |
SOURCE_MOUNT_DEFAULTS = { |
69 |
"dev": "/dev", |
70 |
"devpts": "/dev/pts", |
71 |
- "distdir": "/usr/portage/distfiles", |
72 |
- "portdir": "/usr/portage", |
73 |
+ "distdir": "/var/portage/distfiles", |
74 |
+ "portdir": "/var/portage/repos", |
75 |
"port_tmpdir": "tmpfs", |
76 |
"proc": "/proc", |
77 |
"shm": "shmfs", |