From 56574a950b443638949d35d9f6999503291b206b Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 18 Aug 2024 18:21:23 +0200 Subject: [PATCH] package/erofs-utils: bump to version 1.8.1 For a change log since 1.7.1, see: https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v1.8.1 Version 1.8 introduced a preliminary Zstd support, so this commit adds this new optional dependency for target, and disable this option for the host variant. Version 1.8 also introduced a use of atomic operations, in commit [1]. This commit adds linking with libatomic when appropriate. [1] https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/commit/?id=0d6f9835ce27ead0f23848408366d9ca7f2b0d15 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/erofs-utils/erofs-utils.hash | 2 +- package/erofs-utils/erofs-utils.mk | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/package/erofs-utils/erofs-utils.hash b/package/erofs-utils/erofs-utils.hash index 063d384511..8140dad83b 100644 --- a/package/erofs-utils/erofs-utils.hash +++ b/package/erofs-utils/erofs-utils.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 196083d63e5e231fb5799e7ce86a944bbca564daabce3de9225a8aca9dcaff15 erofs-utils-1.7.1.tar.gz +sha256 5dbf7b492f7682462b97a77121d43ca7609cd90e65f8c96931aefc820a6f0da3 erofs-utils-1.8.1.tar.gz sha256 0df042de29b44887355db86c79708a4489ce6e6666f6e33ad02040293f09e6a2 COPYING sha256 a400f85dd06d230f1b308cde4290a53f345b6e320a376b7904b31c51c2fd4b1a LICENSES/Apache-2.0 sha256 feee3b3157dcdf78d4f50edefbd5dd7adf8b6d52c11bfaaa746a85a373256713 LICENSES/GPL-2.0 diff --git a/package/erofs-utils/erofs-utils.mk b/package/erofs-utils/erofs-utils.mk index f994ea9d07..7033be4a06 100644 --- a/package/erofs-utils/erofs-utils.mk +++ b/package/erofs-utils/erofs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -EROFS_UTILS_VERSION = 1.7.1 +EROFS_UTILS_VERSION = 1.8.1 EROFS_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot EROFS_UTILS_LICENSE = GPL-2.0+, GPL-2.0+ or Apache-2.0 (liberofs) EROFS_UTILS_LICENSE_FILES = COPYING LICENSES/Apache-2.0 LICENSES/GPL-2.0 @@ -14,6 +14,10 @@ EROFS_UTILS_AUTORECONF = YES EROFS_UTILS_DEPENDENCIES = host-pkgconf util-linux +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +EROFS_UTILS_CONF_ENV += LIBS=-latomic +endif + ifeq ($(BR2_PACKAGE_EROFS_UTILS_LZ4),y) EROFS_UTILS_DEPENDENCIES += lz4 EROFS_UTILS_CONF_OPTS += --enable-lz4 @@ -56,12 +60,20 @@ else EROFS_UTILS_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +EROFS_UTILS_DEPENDENCIES += zstd +EROFS_UTILS_CONF_OPTS += --with-libzstd +else +EROFS_UTILS_CONF_OPTS += --without-libzstd +endif + HOST_EROFS_UTILS_DEPENDENCIES = host-pkgconf host-util-linux host-lz4 host-xz HOST_EROFS_UTILS_CONF_OPTS += \ --enable-lz4 \ --enable-lzma \ --disable-fuse \ --without-libdeflate \ + --without-libzstd \ --without-selinux \ --without-zlib