Gentoo Archives: gentoo-catalyst

From: Zac Medico <zmedico@g.o>
To: gentoo-catalyst@l.g.o
Subject: [gentoo-catalyst] [PATCH] generic_stage_target: default {PORT,PKG,DIST}DIR
Date: Wed, 31 Jul 2013 04:46:50
Message-Id: 51F896B8.6070106@gentoo.org
1 This provides forward compatiblity so that stage builds do not break
2 in the future when portage changes the default PORTDIR, PKGDIR, and
3 DISTDIR locations (bug #378603).
4
5 Also, it provides backward compatibility for various tools that require
6 PORTDIR to be defined in make.conf, such as the following:
7
8 gentoo-bashcomp - bug #478444
9 euse - bug #474574
10 euses and ufed - bug #478318
11
12 X-Gentoo-Bug: 479062
13 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=479062
14 ---
15 modules/generic_stage_target.py | 4 ++++
16 1 file changed, 4 insertions(+)
17
18 diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
19 index 8f3c05a..848aca2 100644
20 --- a/modules/generic_stage_target.py
21 +++ b/modules/generic_stage_target.py
22 @@ -1064,6 +1064,10 @@ class generic_stage_target(generic_target):
23 "/use will cause portage to ignore"
24 print "\tpackage.use in the profile and portage_confdir. You've been warned!"
25
26 + myf.write('PORTDIR="/usr/portage"\n')
27 + myf.write('DISTDIR="${PORTDIR}/distfiles"\n')
28 + myf.write('PKGDIR="${PORTDIR}/packages"\n')
29 +
30 """ Setup the portage overlay """
31 if "portage_overlay" in self.settings:
32 myf.write('PORTDIR_OVERLAY="/usr/local/portage"\n')
33 --
34 1.8.2.1