summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-03-28 05:45:45 +0000
committerZac Medico <zmedico@gentoo.org>2008-03-28 05:45:45 +0000
commit22b98993ac42a3adcd2a37aa13ac7a2502bc0c60 (patch)
tree6aecf5472ccefdbdcb0cbd262bfcbbbbf54d4567
parenteb198446fc0952c802e22f1c1c086fe08fd1e8e0 (diff)
downloadportage-22b98993ac42a3adcd2a37aa13ac7a2502bc0c60.tar.gz
portage-22b98993ac42a3adcd2a37aa13ac7a2502bc0c60.tar.bz2
portage-22b98993ac42a3adcd2a37aa13ac7a2502bc0c60.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. svn path=/main/trunk/; revision=9528
-rwxr-xr-xbin/isolated-functions.sh2
-rwxr-xr-xbin/misc-functions.sh3
-rw-r--r--man/make.conf.54
-rw-r--r--pym/portage/__init__.py3
4 files changed, 9 insertions, 3 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index d44cbbc6d..08d1fcb0e 100755
--- 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 6dbb75e09..9138d60a2 100755
--- 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 ab612b741..499f3c23e 100644
--- 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 42318409b..aaff7e116 100644
--- 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",