diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-03-28 13:11:58 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-03-28 13:11:58 +0000 |
| commit | 7fe203ec1362133badf047f33652e871673f77a9 (patch) | |
| tree | 85416460faa006b54949bd0286e56af0fc530dfa | |
| parent | 659a580a577ade1d8a381d465e51d593d2b0ef1a (diff) | |
| download | portage-7fe203ec1362133badf047f33652e871673f77a9.tar.gz portage-7fe203ec1362133badf047f33652e871673f77a9.tar.bz2 portage-7fe203ec1362133badf047f33652e871673f77a9.zip | |
Bug #214619 - Add support for a PORTAGE_BINPKG_TAR_OPTS variable that
allows the user to specify tar command options for binary package
creation. (trunk r9528)
svn path=/main/branches/2.1.2/; revision=9580
| -rw-r--r-- | bin/isolated-functions.sh | 2 | ||||
| -rwxr-xr-x | bin/misc-functions.sh | 3 | ||||
| -rw-r--r-- | man/make.conf.5 | 4 | ||||
| -rw-r--r-- | pym/portage.py | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index ee73e7bcd..248501211 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -466,7 +466,7 @@ save_ebuild_env() { LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \ NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \ PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST PORTAGE_BASHRC \ - PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \ + PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \ PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \ PORTAGE_DEPCACHEDIR PORTAGE_GID PORTAGE_INST_GID \ PORTAGE_INST_UID PORTAGE_LOG_FILE PORTAGE_MASTER_PID \ diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index d38c9a14f..27c2cc618 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -534,7 +534,8 @@ dyn_package() { # Sandbox is disabled in case the user wants to use a symlink # for $PKGDIR and/or $PKGDIR/All. export SANDBOX_ON="0" - tar ${tar_options} -cf - . | bzip2 -f > "${pkg_tmp}" || \ + tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS . | \ + bzip2 -f > "${pkg_tmp}" || \ die "Failed to create tarball" cd .. export PYTHONPATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym} diff --git a/man/make.conf.5 b/man/make.conf.5 index 03e634ff3..ca03aa035 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -366,6 +366,10 @@ the get binary pkg options are given to \fBemerge\fR. Review \fBemerge\fR(1) for more information. Note that it should point to the 'All' directory on the host that creates the binary packages and not to the root of the \fBPKGDIR\fR. .TP +.B PORTAGE_BINPKG_TAR_OPTS +This variable contains options to be passed to the tar command for creation +of binary packages. +.TP \fBPORTAGE_COMPRESS\fR = \fI"bzip2"\fR This variable contains the command used to compress documentation during the install phase. diff --git a/pym/portage.py b/pym/portage.py index ecb391b64..afbe04cff 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1013,7 +1013,8 @@ class config: "PKGUSE", "PKG_LOGDIR", "PKG_TMPDIR", "PORTAGE_ACTUAL_DISTDIR", "PORTAGE_ARCHLIST", "PORTAGE_BASHRC", - "PORTAGE_BINPKG_FILE", "PORTAGE_BINPKG_TMPFILE", + "PORTAGE_BINPKG_FILE", "PORTAGE_BINPKG_TAR_OPTS", + "PORTAGE_BINPKG_TMPFILE", "PORTAGE_BIN_PATH", "PORTAGE_BUILDDIR", "PORTAGE_COLORMAP", "PORTAGE_CONFIGROOT", "PORTAGE_DEBUG", "PORTAGE_DEPCACHEDIR", |