Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Nov 2021 08:18:32 GMT
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 701cc6b7eac0 - main - tindex: add new compression format for INDEX
Message-ID:  <202111220818.1AM8IWfg098624@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=701cc6b7eac0224f7bc26e4c300bbfbb51c19bdc

commit 701cc6b7eac0224f7bc26e4c300bbfbb51c19bdc
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2021-11-22 08:09:24 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2021-11-22 08:16:17 +0000

    tindex: add new compression format for INDEX
    
    Add zstd (faster to decompress) and xz (smaller) compression for INDEX
    
    Results are the following:
    39552 INDEX-14
    2366  INDEX-14.bz2
    1625  INDEX-14.xz
    1672  INDEX-14.zst
---
 Tools/scripts/tindex | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Tools/scripts/tindex b/Tools/scripts/tindex
index 8d6819fa6302..a14cda9e60e2 100755
--- a/Tools/scripts/tindex
+++ b/Tools/scripts/tindex
@@ -123,7 +123,10 @@ ${GIT} -C ${SRCDIR14} pull --rebase -q
 OSVERSION14=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR14}/sys/sys/param.h)
 
 cd ${PORTSDIR}
-rm -f INDEX-12 INDEX-12.bz2 INDEX-13 INDEX-13.bz2 INDEX-14 INDEX-14.bz2
+for ver in 12 13 14; do
+	rm -f INDEX-${ver} INDEX-${ver}.bz2 INDEX-${ver}.xz INDEX-${ver}.zst
+done
+
 OLD_HEAD=$(${GIT} rev-parse HEAD)
 if ! ${GIT} pull --ff-only > git.log 2>&1 ; then
   (echo "Git update failed with conflicts:";
@@ -148,7 +151,9 @@ for branch in 12.x 13.x 14.x; do
     checkfixed ${branch}
 
     bzip2 -kf ${PORTSDIR}/INDEX-${release}
-    mv ${PORTSDIR}/INDEX-${release} ${PORTSDIR}/INDEX-${release}.bz2 ${OUTDIR}
+    zstd -qf --ultra -22 -k ${PORTSDIR}/INDEX-${release}
+    xz -9e -kf ${PORTSDIR}/INDEX-${release}
+    mv ${PORTSDIR}/INDEX-${release} ${PORTSDIR}/INDEX-${release}.bz2 ${PORTSDIR}/INDEX-${release}.zst ${PORTSDIR}/INDEX-${release}.xz ${OUTDIR}
 done
 
 # All indexes built successfully, clear the hook



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111220818.1AM8IWfg098624>