commit:     e799003581e49a3ba2aac0d49821f52ed6eda931
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 04:57:57 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 05:03:15 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e7990035

man/make.conf.5: describe binpkg suffix

- BINPKG_FORMAT="xpak" has suffix .tbz2 for any compression type(!)
- BINPKG_FORMAT="xpak" and FEATURES="binpkg-multi-instance" (default
  as of bug #715112) has suffix .xpak.
- BINPKG_FORMAT="gpkg" has suffix .gpkg.

Bug: https://bugs.gentoo.org/696080
Bug: https://bugs.gentoo.org/715112
Bug: https://bugs.gentoo.org/721070
Bug: https://bugs.gentoo.org/885799
Signed-off-by: Sam James <sam <AT> gentoo.org>

 NEWS            |  3 +++
 man/make.conf.5 | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 2fd09bbaa..4684487b3 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,9 @@ Bug fixes:
 * etc-update: Apply defences for patsub_replacement being default on in Bash 
5.2
   (bug #881383).
 
+* make.conf(5): Note the various file suffixes / file extensions used
+  for binary packages.
+
 portage-3.0.41 (2022-11-04)
 --------------
 

diff --git a/man/make.conf.5 b/man/make.conf.5
index 7f398c28e..ad8ece43f 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -114,12 +114,16 @@ ACCEPT_RESTRICT="* -bindist"
 .TP
 .B BINPKG_FORMAT
 This variable sets the format used for tar binary packages. Possible
-values are \fIxpak\fI or \fIgpkg\fI.
+values are \fIxpak\fI or \fIgpkg\fI.  If \fBBINPKG_FORMAT\fR is set to 
\fIxpak\fR,
+packages will have the file extension .tbz2 for any compression type for 
historical
+reasons.  If \fBBINPKG_FORMAT\fR is set to \fIxpak\fR, and 
FEATURES="binpkg-multi-instance"
+is set, packages will have the file extension .xpak.  If \fBBINPKG_FORMAT\fR 
is set
+to \fIgpkg\fR, packages will have the file extension .gpkg.
 .TP
 \fBBINPKG_COMPRESS\fR = \fI"compression"\fR
 This variable is used to determine the compression used for \fIbinary
-packages\fR. Supported settings and compression algorithms are: bzip2, gzip,
-lz4, lzip, lzop, xz, zstd.
+packages\fR.  Supported settings and compression algorithms are: bzip2, gzip,
+lz4, lzip, lzop, xz, zstd.  See note for \fBBINPKG_FORMAT\fR on file suffix.
 .br
 Defaults to "zstd".
 .br

Reply via email to