From 95ed7d99093945dac7ffc32869e18c2d5c5904ff Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 9 Jun 2025 12:19:42 +0100 Subject: [PATCH] squashfs-tools: clean up PACKAGECONFIG LZMA isn't supported by the mainline kernel driver, so there's no real point in enabling it. Disable LZO by default, as LZO is very obsolete (last released in 2017) and there are better algorithms available. Move xattr to the end so it's separate from the compression algorithms. (From OE-Core rev: 6f65d9372ec639491920fd48df76dfea8afdbfd9) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb index 3eb7ad46e9..930439e2d2 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb @@ -1,5 +1,3 @@ -# Note, we can probably remove the lzma option as it has be replaced with xz, -# and I don't think the kernel supports it any more. SUMMARY = "Tools for manipulating SquashFS filesystems" HOMEPAGE = "https://github.com/plougher/squashfs-tools" DESCRIPTION = "Tools to create and extract Squashfs filesystems." @@ -18,14 +16,14 @@ S = "${WORKDIR}/git" EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}" -PACKAGECONFIG ??= "gzip xz lzo lz4 lzma xattr zstd" +PACKAGECONFIG ??= "gzip lz4 xz zstd xattr" PACKAGECONFIG[gzip] = "GZIP_SUPPORT=1,GZIP_SUPPORT=0,zlib" PACKAGECONFIG[xz] = "XZ_SUPPORT=1,XZ_SUPPORT=0,xz" PACKAGECONFIG[lzo] = "LZO_SUPPORT=1,LZO_SUPPORT=0,lzo" PACKAGECONFIG[lz4] = "LZ4_SUPPORT=1,LZ4_SUPPORT=0,lz4" PACKAGECONFIG[lzma] = "LZMA_XZ_SUPPORT=1,LZMA_XZ_SUPPORT=0,xz" -PACKAGECONFIG[xattr] = "XATTR_SUPPORT=1,XATTR_SUPPORT=0,attr" PACKAGECONFIG[zstd] = "ZSTD_SUPPORT=1,ZSTD_SUPPORT=0,zstd" +PACKAGECONFIG[xattr] = "XATTR_SUPPORT=1,XATTR_SUPPORT=0,attr" do_compile() { oe_runmake -C ${S}/squashfs-tools all