commit: 30fe3636df4e4bb767f1edc017c5f6e47e107b2c
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 18:23:34 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 19:45:33 2021 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=30fe3636
targets: Update BINPKG_COMPRESS to new zstd default
In portage commit 230595cf600c (Default BINPKG_COMPRESSION to zstd (bug
715108)) the default BINPKG_COMPRESSION setting was changed to zstd. But
to retain compatibility with binpkg consumers, the default is unchanged
for existing installations, so we need to update our BINPKG_COMPRESSION.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
targets/stage1/chroot.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index 1085641e..e5a3e0b0 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -24,6 +24,9 @@ BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
FEATURES="${FEATURES} nodoc noman noinfo"
+sed -i -e 's:BINPKG_COMPRESS="bzip2":BINPKG_COMPRESS="zstd":' \
+ /usr/share/portage/config/make.globals
+
# We need to ensure the base stage3 has USE="bindist"
# if BINDIST is set to avoid issues with openssl / openssh
[ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >>
${clst_make_conf}
