diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-08-30 20:55:11 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-08-30 20:55:11 -0700 |
commit | 50daef1ab961c42a3352281e915da5a89297e3a9 (patch) | |
tree | 8396db45ae2ec7ba70067f9b20c2ffedf92a9939 /bin | |
parent | 74c61b80af137fea93e5cbe7b59567812bb92d5c (diff) | |
download | portage-50daef1ab961c42a3352281e915da5a89297e3a9.tar.gz portage-50daef1ab961c42a3352281e915da5a89297e3a9.tar.bz2 portage-50daef1ab961c42a3352281e915da5a89297e3a9.zip |
Bug #335340 - Add support for PORTAGE_BZIP2_COMMAND and
PORTAGE_BUNZIP2_COMMAND settings in make.conf. This only adds support
for binary packages, since that's where pbzip2 can provide the most
benefit in common cases.
Diffstat (limited to 'bin')
-rw-r--r-- | bin/isolated-functions.sh | 1 | ||||
-rwxr-xr-x | bin/misc-functions.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index cd1039b07..46685f891 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -596,6 +596,7 @@ save_ebuild_env() { PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST \ PORTAGE_BASHRC PM_EBUILD_HOOK_DIR PORTAGE_BASHRCS_SOURCED \ PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \ + PORTAGE_BUNZIP2_COMMAND PORTAGE_BZIP2_COMMAND \ PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \ PORTAGE_DEPCACHEDIR PORTAGE_EBUILD_EXIT_FILE PORTAGE_GID \ PORTAGE_GRPNAME PORTAGE_INST_GID \ diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index d7e0f5688..32d3bfc00 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -855,7 +855,7 @@ dyn_package() { PORTAGE_BINPKG_TMPFILE="${PKGDIR}/${CATEGORY}/${PF}.tbz2" mkdir -p "${PORTAGE_BINPKG_TMPFILE%/*}" || die "mkdir failed" tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS -C "${D}" . | \ - bzip2 -cf > "$PORTAGE_BINPKG_TMPFILE" + $PORTAGE_BZIP2_COMMAND -c > "$PORTAGE_BINPKG_TMPFILE" assert "failed to pack binary package: '$PORTAGE_BINPKG_TMPFILE'" PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ "${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH"/xpak-helper.py recompose \ |