Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: /, bin/
Date: Thu, 29 Sep 2022 20:45:47
Message-Id: 1664484339.9ae3ec1af0071354db3bf57bc5cdec963b056e77.sam@gentoo
1 commit: 9ae3ec1af0071354db3bf57bc5cdec963b056e77
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 29 06:37:19 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 29 20:45:39 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9ae3ec1a
7
8 bin: ecompress: xz: set -9, pass -j from MAKEOPTS for parallel compression
9
10 - Pass -9 like we do for bzip2 & gzip.
11 - Pass -j from MAKEOPTS for parallel compression.
12
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 NEWS | 5 +++++
16 bin/ecompress | 3 ++-
17 2 files changed, 7 insertions(+), 1 deletion(-)
18
19 diff --git a/NEWS b/NEWS
20 index 8586e35cd..8ed871e5d 100644
21 --- a/NEWS
22 +++ b/NEWS
23 @@ -11,6 +11,11 @@ Features:
24 checking for dependencies. Update @goland-rebuild accordingly which now
25 includes all packages depending on dev-lang/go (bug #827974, bug #865115)
26
27 +* bin: ecompress: xz: Pass -9 to xz for compression level like we do for bzip2 & gzip.
28 +
29 +* bin: ecompress: xz: Pass -T N where N is the number of jobs from ${MAKEOPTS}
30 + to xz for parallel compression.
31 +
32 Bug fixes:
33 * emerge: Scheduler: Fix filenames for binpkgs in some cases - reuse existing
34 filename and don't allocate a new one (bug #872392).
35
36 diff --git a/bin/ecompress b/bin/ecompress
37 index c69e8d6dd..57c518705 100755
38 --- a/bin/ecompress
39 +++ b/bin/ecompress
40 @@ -1,5 +1,5 @@
41 #!/usr/bin/env bash
42 -# Copyright 1999-2020 Gentoo Authors
43 +# Copyright 1999-2022 Gentoo Authors
44 # Distributed under the terms of the GNU General Public License v2
45
46 source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
47 @@ -128,6 +128,7 @@ if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
48 # See: https://bugs.gentoo.org/672916
49 # Setting '--rm' will remove the source files after a successful compression.
50 lz4) PORTAGE_COMPRESS_FLAGS="-m --rm";;
51 + xz) PORTAGE_COMPRESS_FLAGS="-9 -T$(__makeopts_jobs)";;
52 esac
53 fi