From f700c1b7745e6b3d142f1922005d2f676326ba84 Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Mon, 4 Nov 2024 12:35:57 -0500 Subject: bitbake: bb/compress: use lz4 instead of lz4c lz4c has been considered deprecated by upstream since at least 2018 [1] and has been disabled by default recently [2]. openSUSE Tumbleweed is no longer packaging the deprecated version and others will likely follow. Luckily, we're not using any legacy-specific options and, going back as far as Ubuntu 16.04/Fedora 25, both lz4 and lz4cli are installed as part of the same package 1. https://github.com/lz4/lz4/pull/553 2. https://github.com/lz4/lz4/pull/1479 (Bitbake rev: 907472034b344e4eb73cfd43059a413469f52e1c) Signed-off-by: Justin Bronder Signed-off-by: Richard Purdie --- bitbake/lib/bb/compress/lz4.py | 4 ++-- bitbake/lib/bb/tests/compression.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/compress/lz4.py b/bitbake/lib/bb/compress/lz4.py index 88b0989322..2a64681c86 100644 --- a/bitbake/lib/bb/compress/lz4.py +++ b/bitbake/lib/bb/compress/lz4.py @@ -13,7 +13,7 @@ def open(*args, **kwargs): class LZ4File(bb.compress._pipecompress.PipeFile): def get_compress(self): - return ["lz4c", "-z", "-c"] + return ["lz4", "-z", "-c"] def get_decompress(self): - return ["lz4c", "-d", "-c"] + return ["lz4", "-d", "-c"] diff --git a/bitbake/lib/bb/tests/compression.py b/bitbake/lib/bb/tests/compression.py index 95af3f96d7..16c297b315 100644 --- a/bitbake/lib/bb/tests/compression.py +++ b/bitbake/lib/bb/tests/compression.py @@ -66,8 +66,8 @@ class CompressionTests(object): class LZ4Tests(CompressionTests, unittest.TestCase): def setUp(self): - if shutil.which("lz4c") is None: - self.skipTest("'lz4c' not found") + if shutil.which("lz4") is None: + self.skipTest("'lz4' not found") super().setUp() @contextlib.contextmanager -- cgit v1.2.3-54-g00ecf