Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH 04/11] targets: Update BINPKG_COMPRESS to new zstd default
Date: Mon, 18 Jan 2021 20:22:04
Message-Id: 20210118202152.374078-4-mattst88@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 01/11] targets: Remove unused 'enter' command by Matt Turner
1 In portage commit 230595cf600c (Default BINPKG_COMPRESSION to zstd (bug
2 715108)) the default BINPKG_COMPRESSION setting was changed to zstd. But
3 to retain compatibility with binpkg consumers, the default is unchanged
4 for existing installations, so we need to update our BINPKG_COMPRESSION.
5
6 Bug: https://bugs.gentoo.org/715108
7 Signed-off-by: Matt Turner <mattst88@g.o>
8 ---
9 targets/stage1/chroot.sh | 3 +++
10 1 file changed, 3 insertions(+)
11
12 diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
13 index 1085641e..e5a3e0b0 100755
14 --- a/targets/stage1/chroot.sh
15 +++ b/targets/stage1/chroot.sh
16 @@ -24,6 +24,9 @@ BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
17
18 FEATURES="${FEATURES} nodoc noman noinfo"
19
20 +sed -i -e 's:BINPKG_COMPRESS="bzip2":BINPKG_COMPRESS="zstd":' \
21 + /usr/share/portage/config/make.globals
22 +
23 # We need to ensure the base stage3 has USE="bindist"
24 # if BINDIST is set to avoid issues with openssl / openssh
25 [ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >> ${clst_make_conf}
26 --
27 2.26.2