diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-08 11:39:16 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-08 11:39:16 -0800 |
| commit | 9805fc263d785a93ea4a8a6571b73a7b53e85bba (patch) | |
| tree | e8f5a661bacd2cdbfdb15fb59b4cc19ca9628c0e | |
| parent | 2f0a800ef2de88feadec7ab060580fac5fde1ad9 (diff) | |
| download | portage-9805fc263d785a93ea4a8a6571b73a7b53e85bba.tar.gz portage-9805fc263d785a93ea4a8a6571b73a7b53e85bba.tar.bz2 portage-9805fc263d785a93ea4a8a6571b73a7b53e85bba.zip | |
make.globals: use ${EPREFIX} for PORTDIR, etc...
| -rw-r--r-- | cnf/make.globals | 10 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/cnf/make.globals b/cnf/make.globals index f7f178004..e1243fb08 100644 --- a/cnf/make.globals +++ b/cnf/make.globals @@ -30,13 +30,13 @@ ACCEPT_LICENSE="* -@EULA" ACCEPT_PROPERTIES="*" # Repository Paths -PORTDIR=/usr/portage -DISTDIR=/usr/portage/distfiles -PKGDIR=/usr/portage/packages -RPMDIR=/usr/portage/rpm +PORTDIR=${EPREFIX}/usr/portage +DISTDIR=${PORTDIR}/distfiles +PKGDIR=${PORTDIR}/packages +RPMDIR=${PORTDIR}/rpm # Temporary build directory -PORTAGE_TMPDIR=/var/tmp +PORTAGE_TMPDIR=${EPREFIX}/var/tmp # Fetching command (3 tries, passive ftp for firewall compatibility) FETCHCOMMAND="wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index fb79e5ee1..959ecbedb 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -315,6 +315,9 @@ class config(object): expand_map = {} self._expand_map = expand_map + # Allow make.globals to set default paths relative to ${EPREFIX}. + expand_map["EPREFIX"] = eprefix + env_d = getconfig(os.path.join(eroot, "etc", "profile.env"), expand=expand_map) |