[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gentoo-commits
Subject:    [gentoo-commits] proj/catalyst:master commit in: etc/, doc/, catalyst/base/, catalyst/
From:       "Matt Turner" <mattst88 () gentoo ! org>
Date:       2020-04-30 22:56:22
Message-ID: 1588287372.a3dcb792bb78ec003c1082773ce0b5108de1b512.mattst88 () gentoo
[Download RAW message or body]

commit:     a3dcb792bb78ec003c1082773ce0b5108de1b512
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 22 02:02:59 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 22:56:12 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a3dcb792

catalyst: Rename 'portdir' -> 'target_portdir'

With sqfs snapshots, there's now no dependence on the build system's
portdir.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/base/stagebase.py |  2 +-
 catalyst/defaults.py       |  2 +-
 doc/catalyst-config.5.txt  | 12 +++++-------
 etc/catalyst.conf          |  3 ---
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 41da97b3..e1477bb4 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -803,7 +803,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
         make_profile = Path(self.settings['chroot_path'] + self.settings['port_conf'],
                             'make.profile')
         make_profile.unlink()
-        make_profile.symlink_to(Path('../..' + self.settings['portdir'],
+        make_profile.symlink_to(Path('../..' + self.settings['target_portdir'],
                                      'profiles',
                                      self.settings['target_profile']),
                                 target_is_directory=True)

diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 33f06d34..9878b426 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -63,7 +63,6 @@ confdefaults = {
     "make_conf": "%(port_conf)s/make.conf",
     "options": set(),
     "pkgdir": "/var/cache/binpkgs",
-    "portdir": "/var/db/repos/gentoo",
     "port_tmpdir": "/var/tmp/portage",
     "PythonDir": "./catalyst",
     "repo_basedir": "/var/db/repos",
@@ -75,6 +74,7 @@ confdefaults = {
     "storedir": "/var/tmp/catalyst",
     "target_distdir": "/var/cache/distfiles",
     "target_pkgdir": "/var/cache/binpkgs",
+    "target_portdir": "/var/db/repos/gentoo",
 }
 
 DEFAULT_CONFIG_FILE = '/etc/catalyst/catalyst.conf'

diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index 925934ad..c1ebe9dd 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -28,9 +28,6 @@ and empty lines are interpreted as comments.  For example:
 digests="auto"
 envscript="/etc/catalyst/catalystrc"
 options="autoresume bindist kerncache pkgcache seedcache"
-
-# source repo settings
-portdir="/var/db/repos/gentoo"
 ---------------------------------
 
 The possible keywords and their meanings are as follows:
@@ -107,10 +104,6 @@ Repository settings
 Defines the location of your local source file repository.
 Defaults to the host's DISTDIR.
 
-*portdir*::
-Source Gentoo tree location (primary repo). `/var/db/repos/gentoo/` should work for most
-default installations.
-
 *repos*::
 The directory in which git repositories exist for use by the snapshot target.
 Defaults to `${storedir}/repos`.
@@ -135,6 +128,11 @@ This is the target packages directory for storing binpkgs in the stage being
 built.  This location is stored in the make.conf of the stage being built.
 The default location is `/var/cache/binpkgs`
 
+*target_portdir*::
+Defines the location of main repository in the target stages.  This
+location is stored in make.conf of the stage being built.
+The default location is `/var/db/repos/gentoo`
+
 Other settings
 ~~~~~~~~~~~~~~
 

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 6a499038..5aa2b3fb 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -52,9 +52,6 @@ envscript="/etc/catalyst/catalystrc"
 # (These options can be used together)
 options="autoresume bindist kerncache pkgcache seedcache"
 
-# Source portdir specifies the source portage tree used by the snapshot target.
-portdir="/var/db/repos/gentoo"
-
 # source_matching specifies how catalyst will match non-specific file names
 # if the filename is not found as an exact match.
 # ie: a filename without the extension specified.  "/path/to/foo"

[prev in list] [next in list] [prev in thread] [next in thread]