[gentoo-catalyst] [PATCH 5/5] Drop PORTDIR from make.conf

[gentoo-catalyst] [PATCH 5/5] Drop PORTDIR from make.conf

[Felix Bier]

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>
---
These patches are intended for application top of 50ba8aad (current master).
To test for formatting issues, I sent the patches to myself, exported the mails
as mbox files and applied them with git am *mbox.

Best regards,
Felix

---
 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()
-- 
2.30.0

Re: [gentoo-catalyst] [PATCH 5/5] Drop PORTDIR from make.conf

[Matt Turner]

'On Wed, Feb 3, 2021 at 7:45 PM Felix Bier <Felix.Bier@rohde-schwarz.com> wrote:
>
> 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).

Thank you! The patches look great. I've committed them.

> Signed-off-by: Felix Bier <felix.bier@rohde-schwarz.com>
> ---
> These patches are intended for application top of 50ba8aad (current master).
> To test for formatting issues, I sent the patches to myself, exported the mails
> as mbox files and applied them with git am *mbox.

I appreciate that!

For whatever reason I still had some trouble applying them. I ran
dos2unix, deleted the 'Content-Transfer-Encoding: base64' header and
ran base64 -d on the body and they applied cleanly. Strange.