1 |
Author: zmedico |
2 |
Date: 2008-03-28 13:11:58 +0000 (Fri, 28 Mar 2008) |
3 |
New Revision: 9580 |
4 |
|
5 |
Modified: |
6 |
main/branches/2.1.2/bin/isolated-functions.sh |
7 |
main/branches/2.1.2/bin/misc-functions.sh |
8 |
main/branches/2.1.2/man/make.conf.5 |
9 |
main/branches/2.1.2/pym/portage.py |
10 |
Log: |
11 |
Bug #214619 - Add support for a PORTAGE_BINPKG_TAR_OPTS variable that |
12 |
allows the user to specify tar command options for binary package |
13 |
creation. (trunk r9528) |
14 |
|
15 |
|
16 |
Modified: main/branches/2.1.2/bin/isolated-functions.sh |
17 |
=================================================================== |
18 |
--- main/branches/2.1.2/bin/isolated-functions.sh 2008-03-28 13:08:45 UTC (rev 9579) |
19 |
+++ main/branches/2.1.2/bin/isolated-functions.sh 2008-03-28 13:11:58 UTC (rev 9580) |
20 |
@@ -466,7 +466,7 @@ |
21 |
LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \ |
22 |
NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \ |
23 |
PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST PORTAGE_BASHRC \ |
24 |
- PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \ |
25 |
+ PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \ |
26 |
PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \ |
27 |
PORTAGE_DEPCACHEDIR PORTAGE_GID PORTAGE_INST_GID \ |
28 |
PORTAGE_INST_UID PORTAGE_LOG_FILE PORTAGE_MASTER_PID \ |
29 |
|
30 |
Modified: main/branches/2.1.2/bin/misc-functions.sh |
31 |
=================================================================== |
32 |
--- main/branches/2.1.2/bin/misc-functions.sh 2008-03-28 13:08:45 UTC (rev 9579) |
33 |
+++ main/branches/2.1.2/bin/misc-functions.sh 2008-03-28 13:11:58 UTC (rev 9580) |
34 |
@@ -534,7 +534,8 @@ |
35 |
# Sandbox is disabled in case the user wants to use a symlink |
36 |
# for $PKGDIR and/or $PKGDIR/All. |
37 |
export SANDBOX_ON="0" |
38 |
- tar ${tar_options} -cf - . | bzip2 -f > "${pkg_tmp}" || \ |
39 |
+ tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS . | \ |
40 |
+ bzip2 -f > "${pkg_tmp}" || \ |
41 |
die "Failed to create tarball" |
42 |
cd .. |
43 |
export PYTHONPATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym} |
44 |
|
45 |
Modified: main/branches/2.1.2/man/make.conf.5 |
46 |
=================================================================== |
47 |
--- main/branches/2.1.2/man/make.conf.5 2008-03-28 13:08:45 UTC (rev 9579) |
48 |
+++ main/branches/2.1.2/man/make.conf.5 2008-03-28 13:11:58 UTC (rev 9580) |
49 |
@@ -366,6 +366,10 @@ |
50 |
for more information. Note that it should point to the 'All' directory on |
51 |
the host that creates the binary packages and not to the root of the \fBPKGDIR\fR. |
52 |
.TP |
53 |
+.B PORTAGE_BINPKG_TAR_OPTS |
54 |
+This variable contains options to be passed to the tar command for creation |
55 |
+of binary packages. |
56 |
+.TP |
57 |
\fBPORTAGE_COMPRESS\fR = \fI"bzip2"\fR |
58 |
This variable contains the command used to compress documentation during the |
59 |
install phase. |
60 |
|
61 |
Modified: main/branches/2.1.2/pym/portage.py |
62 |
=================================================================== |
63 |
--- main/branches/2.1.2/pym/portage.py 2008-03-28 13:08:45 UTC (rev 9579) |
64 |
+++ main/branches/2.1.2/pym/portage.py 2008-03-28 13:11:58 UTC (rev 9580) |
65 |
@@ -1013,7 +1013,8 @@ |
66 |
"PKGUSE", "PKG_LOGDIR", "PKG_TMPDIR", |
67 |
"PORTAGE_ACTUAL_DISTDIR", "PORTAGE_ARCHLIST", |
68 |
"PORTAGE_BASHRC", |
69 |
- "PORTAGE_BINPKG_FILE", "PORTAGE_BINPKG_TMPFILE", |
70 |
+ "PORTAGE_BINPKG_FILE", "PORTAGE_BINPKG_TAR_OPTS", |
71 |
+ "PORTAGE_BINPKG_TMPFILE", |
72 |
"PORTAGE_BIN_PATH", |
73 |
"PORTAGE_BUILDDIR", "PORTAGE_COLORMAP", |
74 |
"PORTAGE_CONFIGROOT", "PORTAGE_DEBUG", "PORTAGE_DEPCACHEDIR", |
75 |
|
76 |
-- |
77 |
gentoo-commits@l.g.o mailing list |