Bug #214619 - Add support for a PORTAGE_BINPKG_TAR_OPTS variable that

allows the user to specify tar command options for binary package
creation.

svn path=/main/trunk/; revision=9528

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index d44cbbc6dc372cf40f3ed70a72b73d0843e62dc7..08d1fcb0e7871f94fc7c4a6f6843956dbaedb80d 100755 (executable)
--- 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 6dbb75e09907c36d815a3476752d6c2cccf9827f..9138d60a2e9938aff8fda4bbf2cb80b3b67880d4 100755 (executable)
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -561,7 +561,8 @@ dyn_package() {
        [ -z "${PORTAGE_BINPKG_TMPFILE}" ] && \
                PORTAGE_BINPKG_TMPFILE="${PKGDIR}/${CATEGORY}/${PF}.tbz2"
        mkdir -p "${PORTAGE_BINPKG_TMPFILE%/*}" || die "mkdir failed"
-       tar ${tar_options} -cf - . | bzip2 -f > "${PORTAGE_BINPKG_TMPFILE}" || \
+       tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS . | \
+               bzip2 -f > "$PORTAGE_BINPKG_TMPFILE" || \
                die "Failed to create tarball"
        cd ..
        export PYTHONPATH="${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}:${PYTHONPATH}"

diff --git a/man/make.conf.5 b/man/make.conf.5
index ab612b7415a6abdb3dd28b0b00bf01ddff5d15f1..499f3c23e7bfb32fce78b4c0cafa00b71599996d 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -382,6 +382,10 @@ use the URI header field as a base URI for fetching binary packages. If the URI
 header field is not defined then the client will use it's ${PORTAGE_BINHOST}
 setting as the base URI.
 .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/__init__.py b/pym/portage/__init__.py
index 42318409bfe8ed52eed479c373733fc385b67848..aaff7e116ef667b192edddce1e46ede20e2731ac 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -878,7 +878,8 @@ class config(object):
                "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",