diff options
| author |   Felix Bier <Felix.Bier@rohde-schwarz.com> | 2021-02-04 00:45:27 +0000 |
|---|---|---|
| committer |   Matt Turner <mattst88@gentoo.org> | 2021-02-20 16:27:29 -0500 |
| commit | 5f34226550e221921189ca2184a0afe2de1e8821 (patch) | |
| tree | 08af23ca201dbdb1e3936b085fae47f66dab5703 | |
| parent | Unify handling of main repo and other repos (diff) | |
| download | catalyst-5f34226550e221921189ca2184a0afe2de1e8821.tar.gz catalyst-5f34226550e221921189ca2184a0afe2de1e8821.tar.bz2 catalyst-5f34226550e221921189ca2184a0afe2de1e8821.zip | |
Drop PORTDIR from make.conf
This commit drops PORTDIR from being included in the generated
make.conf. The variable is no longer needed, since the existing code
will now generate a repos.conf entry for the main repo when needed
(i.e. when the location is non-default, which is the same condition
that was applied for PORTDIR in the code removed by this commit).
The PORTDIR variable is considered deprecated in favor of
repos.conf entries (reference: https://wiki.gentoo.org/wiki/PORTDIR).
Signed-off-by: Felix Bier <felix.bier@rohde-schwarz.com>
Signed-off-by: Matt Turner <mattst88@gentoo.org>
| -rw-r--r-- | catalyst/base/stagebase.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 97e2318c..bc0eccd0 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1092,12 +1092,6 @@ class StageBase(TargetBase, ClearBase, GenBase): myf.write(hostuseexpand + '="' + ' '.join(myuseexpandvars[hostuseexpand]) + '"\n') - # Write non-default PORTDIR/DISTDIR/PKGDIR settings to make.conf - if (self.settings['repo_basedir'], self.settings['repo_name']) != \ - (confdefaults['repo_basedir'], confdefaults['repo_name']): - myf.write('PORTDIR="%s/%s"\n' % (self.settings['repo_basedir'], - self.settings['repo_name'])) - for x in ['target_distdir', 'target_pkgdir']: if self.settings[x] != confdefaults[x]: varname = x.split('_')[1].upper() |