diff options
| author | Mark Ferrell <major@homeonderanged.org> | 2014-04-15 07:53:26 -0700 |
|---|---|---|
| committer | Mark Ferrell <major@homeonderanged.org> | 2014-04-15 07:55:38 -0700 |
| commit | ce8bcac04f86f97676ca80a3ba03e015088d8c47 (patch) | |
| tree | 959f2539efe2f4388c1e56273591c707543d69ee | |
| parent | 6ae2ec95ecaf7dd5f7627cd63612bc3a8fda0089 (diff) | |
Nuke ${W} during cleanup, not just ${S}
* A number of packages perform their build outside of the ${S} path, which
leaves tons of extra trash in ${W}. Go ahead and clean it all up properly
whenever a build is successful.
| -rwxr-xr-x | libexec/build-make-compile | 4 | ||||
| -rwxr-xr-x | libexec/build-makedeps | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libexec/build-make-compile b/libexec/build-make-compile index 8d0e59b..d3eb176 100755 --- a/libexec/build-make-compile +++ b/libexec/build-make-compile @@ -59,12 +59,12 @@ build_make_compile() ## Save Space! # At this point everything important should be installed into ${D}, and - # any form of reruning the build will remove ${S} before prepping it + # any form of reruning the build will remove ${W} before prepping it # for build, so we might as well gut it now. About the best option we # could do would be to avoid gutting this when being run in --debug # mode. if test "${BUILDER_DEBUG:-0}" -eq '0'; then - find "${S}" -delete & + find "${W}" -delete & fi ## diff --git a/libexec/build-makedeps b/libexec/build-makedeps index 7b9d167..1d7a2bd 100755 --- a/libexec/build-makedeps +++ b/libexec/build-makedeps @@ -49,11 +49,11 @@ for package in $(echo "${BUILDER_PKGDIR}"/*/*); do package_make="$(echo "${package}"|tr '/-' '__')" package_source="${BUILDER_PKGDIR}/${CATEGORY}/${NAME}/source" - package_prep="${W}/.prepped" - package_compile="${W}/.compiled" + package_prep="${BUILDER_TMPDIR}/${CATEGORY}/${NAME}/.prepped" + package_compile="${BUILDER_TMPDIR}/${CATEGORY}/${NAME}/.compiled" package_archive="${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}-${RELEASE}.${ARCHIVE_FORMAT}" package_install="${SYSROOT}/var/db/binpkgs/${CATEGORY}/${NAME}" - package_test="${W}/.tested" + package_test="${BUILDER_TMPDIR}/${CATEGORY}/${NAME}/.tested" package_export="${BUILDER_TOPDIR}/exports/${CATEGORY}/${NAME}-${VERSION}-${RELEASE}.${CHOST%%-*}.rpm" package_logdir="${L}" |