| 1 |
commit: 5f34226550e221921189ca2184a0afe2de1e8821 |
| 2 |
Author: Felix Bier <Felix.Bier <AT> rohde-schwarz <DOT> com> |
| 3 |
AuthorDate: Thu Feb 4 00:45:27 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 20 21:27:29 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5f342265 |
| 7 |
|
| 8 |
Drop PORTDIR from make.conf |
| 9 |
|
| 10 |
This commit drops PORTDIR from being included in the generated |
| 11 |
make.conf. The variable is no longer needed, since the existing code |
| 12 |
will now generate a repos.conf entry for the main repo when needed |
| 13 |
(i.e. when the location is non-default, which is the same condition |
| 14 |
that was applied for PORTDIR in the code removed by this commit). |
| 15 |
|
| 16 |
The PORTDIR variable is considered deprecated in favor of |
| 17 |
repos.conf entries (reference: https://wiki.gentoo.org/wiki/PORTDIR). |
| 18 |
|
| 19 |
Signed-off-by: Felix Bier <felix.bier <AT> rohde-schwarz.com> |
| 20 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 21 |
|
| 22 |
catalyst/base/stagebase.py | 6 ------ |
| 23 |
1 file changed, 6 deletions(-) |
| 24 |
|
| 25 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 26 |
index 97e2318c..bc0eccd0 100644 |
| 27 |
--- a/catalyst/base/stagebase.py |
| 28 |
+++ b/catalyst/base/stagebase.py |
| 29 |
@@ -1092,12 +1092,6 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 30 |
myf.write(hostuseexpand + '="' + |
| 31 |
' '.join(myuseexpandvars[hostuseexpand]) + '"\n') |
| 32 |
|
| 33 |
- # Write non-default PORTDIR/DISTDIR/PKGDIR settings to make.conf |
| 34 |
- if (self.settings['repo_basedir'], self.settings['repo_name']) != \ |
| 35 |
- (confdefaults['repo_basedir'], confdefaults['repo_name']): |
| 36 |
- myf.write('PORTDIR="%s/%s"\n' % (self.settings['repo_basedir'], |
| 37 |
- self.settings['repo_name'])) |
| 38 |
- |
| 39 |
for x in ['target_distdir', 'target_pkgdir']: |
| 40 |
if self.settings[x] != confdefaults[x]: |
| 41 |
varname = x.split('_')[1].upper() |
Archives