From nobody Mon Nov 22 08:18:32 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9925318957DA; Mon, 22 Nov 2021 08:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HyKsh409gz4c6N; Mon, 22 Nov 2021 08:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6548B1F612; Mon, 22 Nov 2021 08:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AM8IWTa098625; Mon, 22 Nov 2021 08:18:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AM8IWfg098624; Mon, 22 Nov 2021 08:18:32 GMT (envelope-from git) Date: Mon, 22 Nov 2021 08:18:32 GMT Message-Id: <202111220818.1AM8IWfg098624@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 701cc6b7eac0 - main - tindex: add new compression format for INDEX List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 701cc6b7eac0224f7bc26e4c300bbfbb51c19bdc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=701cc6b7eac0224f7bc26e4c300bbfbb51c19bdc commit 701cc6b7eac0224f7bc26e4c300bbfbb51c19bdc Author: Baptiste Daroussin AuthorDate: 2021-11-22 08:09:24 +0000 Commit: Baptiste Daroussin 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