| 1 |
commit: a3dcb792bb78ec003c1082773ce0b5108de1b512 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 22 02:02:59 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 30 22:56:12 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a3dcb792 |
| 7 |
|
| 8 |
catalyst: Rename 'portdir' -> 'target_portdir' |
| 9 |
|
| 10 |
With sqfs snapshots, there's now no dependence on the build system's |
| 11 |
portdir. |
| 12 |
|
| 13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 14 |
|
| 15 |
catalyst/base/stagebase.py | 2 +- |
| 16 |
catalyst/defaults.py | 2 +- |
| 17 |
doc/catalyst-config.5.txt | 12 +++++------- |
| 18 |
etc/catalyst.conf | 3 --- |
| 19 |
4 files changed, 7 insertions(+), 12 deletions(-) |
| 20 |
|
| 21 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 22 |
index 41da97b3..e1477bb4 100644 |
| 23 |
--- a/catalyst/base/stagebase.py |
| 24 |
+++ b/catalyst/base/stagebase.py |
| 25 |
@@ -803,7 +803,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 26 |
make_profile = Path(self.settings['chroot_path'] + self.settings['port_conf'], |
| 27 |
'make.profile') |
| 28 |
make_profile.unlink() |
| 29 |
- make_profile.symlink_to(Path('../..' + self.settings['portdir'], |
| 30 |
+ make_profile.symlink_to(Path('../..' + self.settings['target_portdir'], |
| 31 |
'profiles', |
| 32 |
self.settings['target_profile']), |
| 33 |
target_is_directory=True) |
| 34 |
|
| 35 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
| 36 |
index 33f06d34..9878b426 100644 |
| 37 |
--- a/catalyst/defaults.py |
| 38 |
+++ b/catalyst/defaults.py |
| 39 |
@@ -63,7 +63,6 @@ confdefaults = { |
| 40 |
"make_conf": "%(port_conf)s/make.conf", |
| 41 |
"options": set(), |
| 42 |
"pkgdir": "/var/cache/binpkgs", |
| 43 |
- "portdir": "/var/db/repos/gentoo", |
| 44 |
"port_tmpdir": "/var/tmp/portage", |
| 45 |
"PythonDir": "./catalyst", |
| 46 |
"repo_basedir": "/var/db/repos", |
| 47 |
@@ -75,6 +74,7 @@ confdefaults = { |
| 48 |
"storedir": "/var/tmp/catalyst", |
| 49 |
"target_distdir": "/var/cache/distfiles", |
| 50 |
"target_pkgdir": "/var/cache/binpkgs", |
| 51 |
+ "target_portdir": "/var/db/repos/gentoo", |
| 52 |
} |
| 53 |
|
| 54 |
DEFAULT_CONFIG_FILE = '/etc/catalyst/catalyst.conf' |
| 55 |
|
| 56 |
diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt |
| 57 |
index 925934ad..c1ebe9dd 100644 |
| 58 |
--- a/doc/catalyst-config.5.txt |
| 59 |
+++ b/doc/catalyst-config.5.txt |
| 60 |
@@ -28,9 +28,6 @@ and empty lines are interpreted as comments. For example: |
| 61 |
digests="auto" |
| 62 |
envscript="/etc/catalyst/catalystrc" |
| 63 |
options="autoresume bindist kerncache pkgcache seedcache" |
| 64 |
- |
| 65 |
-# source repo settings |
| 66 |
-portdir="/var/db/repos/gentoo" |
| 67 |
--------------------------------- |
| 68 |
|
| 69 |
The possible keywords and their meanings are as follows: |
| 70 |
@@ -107,10 +104,6 @@ Repository settings |
| 71 |
Defines the location of your local source file repository. |
| 72 |
Defaults to the host's DISTDIR. |
| 73 |
|
| 74 |
-*portdir*:: |
| 75 |
-Source Gentoo tree location (primary repo). `/var/db/repos/gentoo/` should work for most |
| 76 |
-default installations. |
| 77 |
- |
| 78 |
*repos*:: |
| 79 |
The directory in which git repositories exist for use by the snapshot target. |
| 80 |
Defaults to `${storedir}/repos`. |
| 81 |
@@ -135,6 +128,11 @@ This is the target packages directory for storing binpkgs in the stage being |
| 82 |
built. This location is stored in the make.conf of the stage being built. |
| 83 |
The default location is `/var/cache/binpkgs` |
| 84 |
|
| 85 |
+*target_portdir*:: |
| 86 |
+Defines the location of main repository in the target stages. This |
| 87 |
+location is stored in make.conf of the stage being built. |
| 88 |
+The default location is `/var/db/repos/gentoo` |
| 89 |
+ |
| 90 |
Other settings |
| 91 |
~~~~~~~~~~~~~~ |
| 92 |
|
| 93 |
|
| 94 |
diff --git a/etc/catalyst.conf b/etc/catalyst.conf |
| 95 |
index 6a499038..5aa2b3fb 100644 |
| 96 |
--- a/etc/catalyst.conf |
| 97 |
+++ b/etc/catalyst.conf |
| 98 |
@@ -52,9 +52,6 @@ envscript="/etc/catalyst/catalystrc" |
| 99 |
# (These options can be used together) |
| 100 |
options="autoresume bindist kerncache pkgcache seedcache" |
| 101 |
|
| 102 |
-# Source portdir specifies the source portage tree used by the snapshot target. |
| 103 |
-portdir="/var/db/repos/gentoo" |
| 104 |
- |
| 105 |
# source_matching specifies how catalyst will match non-specific file names |
| 106 |
# if the filename is not found as an exact match. |
| 107 |
# ie: a filename without the extension specified. "/path/to/foo" |
Archives