From ff5acbe2bb360f5f34a91d654ea243dbdedc130b Mon Sep 17 00:00:00 2001
From: Bernhard Landauer <oberon@manjaro.org>
Date: Sat, 28 Dec 2019 19:24:48 +0100
Subject: [PATCH] use zst compression for pkgs

---
 bin/signpkgs.in        | 2 +-
 data/makepkg.conf      | 5 ++++-
 lib/util-iso-image.sh  | 2 +-
 lib/util-pkg-chroot.sh | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/bin/signpkgs.in b/bin/signpkgs.in
index 56476e7..0d706b4 100644
--- a/bin/signpkgs.in
+++ b/bin/signpkgs.in
@@ -11,4 +11,4 @@
 
 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 {} \;
diff --git a/data/makepkg.conf b/data/makepkg.conf
index b51f4eb..0de1068 100644
--- a/data/makepkg.conf
+++ b/data/makepkg.conf
@@ -131,9 +131,12 @@ DBGSRCDIR="/usr/src/debug"
 COMPRESSGZ=(gzip -c -f -n)
 COMPRESSBZ2=(bzip2 -c -f)
 COMPRESSXZ=(xz -c -z -)
+COMPRESSZST=(zstd -c -T0 --ultra -20 -)
 COMPRESSLRZ=(lrzip -q)
 COMPRESSLZO=(lzop -q)
 COMPRESSZ=(compress -c -f)
+COMPRESSLZ4=(lz4 -q)
+COMPRESSLZ=(lzip -c -f)
 
 #########################################################################
 # EXTENSION DEFAULTS
@@ -142,5 +145,5 @@ COMPRESSZ=(compress -c -f)
 # WARNING: Do NOT modify these variables unless you know what you are
 #          doing.
 #
-PKGEXT='.pkg.tar.xz'
+PKGEXT='.pkg.tar.zst'
 SRCEXT='.src.tar.gz'
diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh
index 0ad8283..757dfb6 100644
--- a/lib/util-iso-image.sh
+++ b/lib/util-iso-image.sh
@@ -352,7 +352,7 @@ copy_from_cache(){
         -B "${build_mirror}/${target_branch}" \
         "$1" \
         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"
 
     msg2 "Copying mhwd package cache ..."
diff --git a/lib/util-pkg-chroot.sh b/lib/util-pkg-chroot.sh
index 2f843a7..2c3102e 100644
--- a/lib/util-pkg-chroot.sh
+++ b/lib/util-pkg-chroot.sh
@@ -156,7 +156,7 @@ archive_logs(){
 
 post_build(){
     source PKGBUILD
-    local ext='pkg.tar.xz' tarch ver src
+    local ext='pkg.tar.zst' tarch ver src
     for pkg in ${pkgname[@]}; do
         case $arch in
             any) tarch='any' ;;