From ec7ab6b435340bfc238add4bbe6fb3112494754e Mon Sep 17 00:00:00 2001 From: alperak Date: Mon, 27 Nov 2023 19:47:59 +0300 Subject: squashfs-tools-ng: upgrade 1.1.4 -> 1.2.0 License-Update: Remove builtin copy of zlib On GNU/Linux, *BSD or MacOS we can simply use the system default library. The copy was primarily only there for the Windows build. The build script for Windows has now been adapted to download and compile a shared library from a tarball. This removes a huge chunk of code from the git tree as well as the release tarballs. Additionally it gets rid of iffy things like removing the Zlib copyright/version strings, so the libsquashfs DLL doesn't export it. Changelog: Added * Make it possible for gensquashfs to add xattrs from a description file * Make it possible for gensquashfs to specify file sorting order * Support . and .. directory browsing support in sqfs_dir_reader_t * Add sqfs_tree_node_get_path to libsquashfs Fixed * Only use actually available CPUs in gensquashfs and tar2sqfs * Overzealous bounds check in the libsquashfs block processor (#110) * In sqfs_compressor_create, clear the output pointer on error (#110) * Typo in gensquashfs and tar2sqfs block count statistics (#108) * Hard link resolution: report error if path cannonicalization fails * Documentation: signedness of the directory header inode number * Seek position in libsquashfs meta data reader erroneously out-of-bounds * Memory leak in libfstree error path * Double-free in libfstree error path Changed * Allow NULL pointer for sqfs_destroy, sqfs_dir_tree_destroy * Use 32 bit hard link counter in libfstree instead of just 16 bit * Internal cleanup and restructuring * Upgrade autotools version * Check in autogen.sh if the required tools are available * Trigger a build failure if no compressor library is available Signed-off-by: alperak Signed-off-by: Khem Raj --- .../squashfs-tools-ng/squashfs-tools-ng_1.1.4.bb | 33 ---------------------- .../squashfs-tools-ng/squashfs-tools-ng_1.2.0.bb | 32 +++++++++++++++++++++ 2 files changed, 32 insertions(+), 33 deletions(-) delete mode 100644 meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.1.4.bb create mode 100644 meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.2.0.bb diff --git a/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.1.4.bb b/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.1.4.bb deleted file mode 100644 index c57324d89c..0000000000 --- a/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.1.4.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "New set of tools for working with SquashFS images" -SECTION = "base" -LICENSE = "GPL-3.0-or-later & LGPL-3.0-or-later & MIT & BSD-2-Clause & Zlib" -LIC_FILES_CHKSUM = "file://COPYING.md;md5=5789fb0572753ed69014cd90a445cd74 \ - file://licenses/GPLv3.txt;md5=1ebbd3e34237af26da5dc08a4e440464 \ - file://licenses/hash_table.txt;md5=874823605326caeaabaa95bfbd0f9fb0 \ - file://licenses/LGPLv3.txt;md5=3000208d539ec061b899bce1d9ce9404 \ - file://licenses/LZ4.txt;md5=ebc2ea4814a64de7708f1571904b32cc \ - file://licenses/xxhash.txt;md5=f042a9be092bd6d7fe6f217d8d00f4ca \ - file://licenses/xz.txt;md5=1c389b9610ccfdb25f7abaea6a0bb5a4 \ - file://licenses/zlib.txt;md5=ae27c72096606131f760e5f59cf98b06 \ - file://licenses/zstd.txt;md5=8df8137b630239cbdd4c0674124cb0c8 \ - " - -SRCREV = "7667b84cc34707c28ca0db8d24f046ec34e8c25d" -SRC_URI = "git://github.com/AgentD/squashfs-tools-ng.git;protocol=https;branch=master" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -PACKAGECONFIG ??= "gzip xz lzo lz4 zstd ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" -PACKAGECONFIG[gzip] = "--with-gzip,--without-gzip,zlib" -PACKAGECONFIG[xz] = "--with-xz,--without-xz,xz" -PACKAGECONFIG[lzo] = "--with-lzo,--without-lzo,lzo" -PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4" -PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" -PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" - -PACKAGES =+ "libsquashfs" -FILES:libsquashfs = "${libdir}/libsquashfs*${SOLIBS}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.2.0.bb b/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.2.0.bb new file mode 100644 index 0000000000..880af82bba --- /dev/null +++ b/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.2.0.bb @@ -0,0 +1,32 @@ +SUMMARY = "New set of tools for working with SquashFS images" +SECTION = "base" +LICENSE = "GPL-3.0-or-later & LGPL-3.0-or-later & MIT & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING.md;md5=a709b68f1ce8a9f10aeea6401446c1f4 \ + file://licenses/GPLv3.txt;md5=1ebbd3e34237af26da5dc08a4e440464 \ + file://licenses/hash_table.txt;md5=874823605326caeaabaa95bfbd0f9fb0 \ + file://licenses/LGPLv3.txt;md5=3000208d539ec061b899bce1d9ce9404 \ + file://licenses/LZ4.txt;md5=ebc2ea4814a64de7708f1571904b32cc \ + file://licenses/xxhash.txt;md5=f042a9be092bd6d7fe6f217d8d00f4ca \ + file://licenses/xz.txt;md5=1c389b9610ccfdb25f7abaea6a0bb5a4 \ + file://licenses/zstd.txt;md5=8df8137b630239cbdd4c0674124cb0c8 \ + " + +SRCREV = "f2a3ad56e40c9711b23371238f9fa07dd24245f1" +SRC_URI = "git://github.com/AgentD/squashfs-tools-ng.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +PACKAGECONFIG ??= "gzip xz lzo lz4 zstd ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" +PACKAGECONFIG[gzip] = "--with-gzip,--without-gzip,zlib" +PACKAGECONFIG[xz] = "--with-xz,--without-xz,xz" +PACKAGECONFIG[lzo] = "--with-lzo,--without-lzo,lzo" +PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4" +PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" + +PACKAGES =+ "libsquashfs" +FILES:libsquashfs = "${libdir}/libsquashfs*${SOLIBS}" + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg