From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 088BD158094 for ; Tue, 27 Sep 2022 20:28:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F6D8E07C9; Tue, 27 Sep 2022 20:28:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9256FE07C9 for ; Tue, 27 Sep 2022 20:28:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A2D9B3411AA for ; Tue, 27 Sep 2022 20:28:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E86C45F7 for ; Tue, 27 Sep 2022 20:28:53 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1664310482.98bce41166f1a62c6a9b843db7e68a7efedd5742.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/, eclass/tests/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/tests/unpacker.sh eclass/unpacker.eclass X-VCS-Directories: eclass/tests/ eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 98bce41166f1a62c6a9b843db7e68a7efedd5742 X-VCS-Branch: master Date: Tue, 27 Sep 2022 20:28:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8c11cd90-dd7d-421e-be99-d15e1f15e877 X-Archives-Hash: fe8792e42a054cfe92b0caef5ca1fe23 commit: 98bce41166f1a62c6a9b843db7e68a7efedd5742 Author: Michał Górny gentoo org> AuthorDate: Sat Sep 24 14:30:13 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Sep 27 20:28:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98bce411 unpacker.eclass: Add support for .lz4 and .lzo compression Add support for .lz4 and .lzo formats that can be used for .tar.gpkg compression. Signed-off-by: Michał Górny gentoo.org> eclass/tests/unpacker.sh | 7 +++++++ eclass/unpacker.eclass | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/eclass/tests/unpacker.sh b/eclass/tests/unpacker.sh index 7a297d61babd..1f2327054521 100755 --- a/eclass/tests/unpacker.sh +++ b/eclass/tests/unpacker.sh @@ -165,6 +165,8 @@ test_compressed_file .lzma lzma test_compressed_file .xz xz test_compressed_file .lz lzip test_compressed_file .zst zstd +test_compressed_file .lz4 lz4 +test_compressed_file .lzo lzop test_compressed_file_multistream .bz2 bzip2 test_compressed_file_multistream .gz gzip @@ -187,6 +189,8 @@ test_compressed_tar .tar.xz xz test_compressed_tar .txz xz test_compressed_tar .tar.lz lzip test_compressed_tar .tar.zst zstd +test_compressed_tar .tar.lz4 lz4 +test_compressed_tar .tar.lzo lzop test_unpack test.cpio test.in cpio 'cpio -o --quiet <<<${TESTFILE} > ${archive}' test_compressed_cpio .cpio.bz2 bzip2 @@ -196,6 +200,8 @@ test_compressed_cpio .cpio.lzma lzma test_compressed_cpio .cpio.xz xz test_compressed_cpio .cpio.lz lzip test_compressed_cpio .cpio.zst zstd +test_compressed_cpio .cpio.lz4 lz4 +test_compressed_cpio .cpio.lzo lzop test_deb test_deb .gz gzip @@ -223,6 +229,7 @@ test_reject_junk .lz test_reject_junk .zst test_reject_junk .tar test_reject_junk .cpio +test_reject_junk .gpkg.tar test_reject_junk .deb test_reject_junk .zip test_reject_junk .7z diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass index 8fb1c2abd1cf..a64c5eae18aa 100644 --- a/eclass/unpacker.eclass +++ b/eclass/unpacker.eclass @@ -401,6 +401,10 @@ _unpacker_get_decompressor() { echo "${UNPACKER_LZIP} -dc" ;; *.zst) echo "zstd -dc" ;; + *.lz4) + echo "lz4 -dc" ;; + *.lzo) + echo "lzop -dc" ;; esac } @@ -535,6 +539,10 @@ unpacker_src_uri_depends() { d="app-arch/zstd" ;; *.lha|*.lzh) d="app-arch/lha" ;; + *.lz4) + d="app-arch/lz4" ;; + *.lzo) + d="app-arch/lzop" ;; esac deps+=" ${d}" done