| 1 |
commit: 9d6a5c43a4a051be88a0af76fdd648f6d0f232b1 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 18 18:23:34 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 23 16:19:07 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9d6a5c43 |
| 7 |
|
| 8 |
targets: Update BINPKG_COMPRESS to new zstd default |
| 9 |
|
| 10 |
In portage commit 230595cf600c (Default BINPKG_COMPRESSION to zstd (bug |
| 11 |
715108)) the default BINPKG_COMPRESSION setting was changed to zstd. But |
| 12 |
to retain compatibility with binpkg consumers, the default is unchanged |
| 13 |
for existing installations, so we need to update our BINPKG_COMPRESSION. |
| 14 |
|
| 15 |
Bug: https://bugs.gentoo.org/715108 |
| 16 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 17 |
|
| 18 |
targets/stage1/chroot.sh | 3 +++ |
| 19 |
1 file changed, 3 insertions(+) |
| 20 |
|
| 21 |
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh |
| 22 |
index 50afef4a..9b34ced8 100755 |
| 23 |
--- a/targets/stage1/chroot.sh |
| 24 |
+++ b/targets/stage1/chroot.sh |
| 25 |
@@ -24,6 +24,9 @@ BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)" |
| 26 |
|
| 27 |
FEATURES="${FEATURES} nodoc noman noinfo" |
| 28 |
|
| 29 |
+sed -i -e 's:BINPKG_COMPRESS="bzip2":BINPKG_COMPRESS="zstd":' \ |
| 30 |
+ /usr/share/portage/config/make.globals |
| 31 |
+ |
| 32 |
# We need to ensure the base stage3 has USE="bindist" |
| 33 |
# if BINDIST is set to avoid issues with openssl / openssh |
| 34 |
[ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >> ${clst_make_conf} |
Archives