commit: 5f34226550e221921189ca2184a0afe2de1e8821 Author: Felix Bier <Felix.Bier <AT> rohde-schwarz <DOT> com> AuthorDate: Thu Feb 4 00:45:27 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sat Feb 20 21:27:29 2021 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5f342265
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 <AT> rohde-schwarz.com> Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> catalyst/base/stagebase.py | 6 ------ 1 file changed, 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()
