summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/ebuild.sh2
-rw-r--r--pym/portage.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8461af608..70fffc1ba 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -719,7 +719,7 @@ dyn_clean() {
chflags -R nosunlnk,nouunlnk "${PORTAGE_BUILDDIR}" 2>/dev/null
fi
- rm -rf "${PORTAGE_BUILDDIR}/image"
+ rm -rf "${PORTAGE_BUILDDIR}/image" "${PORTAGE_BUILDDIR}/homedir"
if ! hasq keeptemp $FEATURES; then
rm -rf "${T}"
diff --git a/pym/portage.py b/pym/portage.py
index 0d9a0e5af..177c78eda 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2462,7 +2462,6 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
mysettings["BUILD_PREFIX"] = mysettings["PORTAGE_TMPDIR"]+"/portage"
- mysettings["HOME"] = mysettings["BUILD_PREFIX"]+"/homedir"
mysettings["PKG_TMPDIR"] = mysettings["PORTAGE_TMPDIR"]+"/binpkgs"
# Package {pre,post}inst and {pre,post}rm may overlap, so they must have separate
@@ -2472,6 +2471,7 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
else:
mysettings["PORTAGE_BUILDDIR"] = os.path.join(mysettings["BUILD_PREFIX"], mysettings["PF"])
+ mysettings["HOME"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "homedir")
mysettings["WORKDIR"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "work")
mysettings["D"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "image") + os.sep
mysettings["T"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "temp")