root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

use zst compression for pkgs

Browse source
This commit is contained in:
Bernhard Landauer 2019-12-28 19:24:48 +01:00
parent e3712e4a60
commit ff5acbe2bb
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/signpkgs.in
View file

@ -11,4 +11,4 @@
version=@version@ version=@version@
find $PWD -maxdepth 1 -name '*.pkg.tar.xz' -exec signfile {} \; find $PWD -maxdepth 1 -name '*.pkg.tar.xz' -o -name '*.pkg.tar.zst' -exec signfile {} \;

5
data/makepkg.conf
View file

@ -131,9 +131,12 @@ DBGSRCDIR="/usr/src/debug"
COMPRESSGZ=(gzip -c -f -n) COMPRESSGZ=(gzip -c -f -n)
COMPRESSBZ2=(bzip2 -c -f) COMPRESSBZ2=(bzip2 -c -f)
COMPRESSXZ=(xz -c -z -) COMPRESSXZ=(xz -c -z -)
COMPRESSZST=(zstd -c -T0 --ultra -20 -)
COMPRESSLRZ=(lrzip -q) COMPRESSLRZ=(lrzip -q)
COMPRESSLZO=(lzop -q) COMPRESSLZO=(lzop -q)
COMPRESSZ=(compress -c -f) COMPRESSZ=(compress -c -f)
COMPRESSLZ4=(lz4 -q)
COMPRESSLZ=(lzip -c -f)
######################################################################### #########################################################################
# EXTENSION DEFAULTS # EXTENSION DEFAULTS
@ -142,5 +145,5 @@ COMPRESSZ=(compress -c -f)
# WARNING: Do NOT modify these variables unless you know what you are # WARNING: Do NOT modify these variables unless you know what you are
# doing. # doing.
# #
PKGEXT='.pkg.tar.xz' PKGEXT='.pkg.tar.zst'
SRCEXT='.src.tar.gz' SRCEXT='.src.tar.gz'

2
lib/util-iso-image.sh
View file

@ -352,7 +352,7 @@ copy_from_cache(){
-B "${build_mirror}/${target_branch}" \ -B "${build_mirror}/${target_branch}" \
"$1" \ "$1" \
pacman -v -Sp $2 --noconfirm > "$list" pacman -v -Sp $2 --noconfirm > "$list"
sed -ni '/.pkg.tar.xz/p' "$list" sed -ni '/.pkg.tar.xz/p'; '/.pkg.tar.zst/p' "$list"
sed -i "s/.*\///" "$list" sed -i "s/.*\///" "$list"
msg2 "Copying mhwd package cache ..." msg2 "Copying mhwd package cache ..."

2
lib/util-pkg-chroot.sh
View file

@ -156,7 +156,7 @@ archive_logs(){
post_build(){ post_build(){
source PKGBUILD source PKGBUILD
local ext='pkg.tar.xz' tarch ver src local ext='pkg.tar.zst' tarch ver src
for pkg in ${pkgname[@]}; do for pkg in ${pkgname[@]}; do
case $arch in case $arch in
any) tarch='any' ;; any) tarch='any' ;;