diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2021-01-18 13:23:34 -0500 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2021-01-23 11:19:07 -0500 |
| commit | 9d6a5c43a4a051be88a0af76fdd648f6d0f232b1 (patch) | |
| tree | b7523fc1fcdc06f0ed4b88f4a0c233f468701ed3 | |
| parent | targets: Remove some obvious comments (diff) | |
| download | catalyst-9d6a5c43a4a051be88a0af76fdd648f6d0f232b1.tar.gz catalyst-9d6a5c43a4a051be88a0af76fdd648f6d0f232b1.tar.bz2 catalyst-9d6a5c43a4a051be88a0af76fdd648f6d0f232b1.zip | |
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.
Bug: https://bugs.gentoo.org/715108
Signed-off-by: Matt Turner <mattst88@gentoo.org>
| -rwxr-xr-x | targets/stage1/chroot.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh index 50afef4a..9b34ced8 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} |