gh-mirrors/openwrt-packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-10 12:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfsprogs: update to 6.10.1

Browse Source 
- libblkid is now a hard dependency
- Don't set configure options matching the default
- Enable LTO
- Disable debug asserts at configure stage, drop the patch
- Compile with target optimizations instead of -O2
- Update package URL

Signed-off-by: Aleksey Vasilenko <aleksey.vasilenko@gmail.com>
This commit is contained in:
Aleksey Vasilenko
2024-09-09 14:20:55 +03:00
committed by Tianling Shen
parent dc761c05d6
commit a9e254bd31
2 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
utils/xfsprogs/Makefile
View File

@@ -8,19 +8,19 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=xfsprogs PKG_NAME:=xfsprogs
PKG_VERSION:=6.2.0 PKG_VERSION:=6.10.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/fs/xfs/xfsprogs PKG_SOURCE_URL:=@KERNEL/linux/utils/fs/xfs/xfsprogs
PKG_HASH:=d67dcba5a28e0904b60886b6e5f752bc7c9c3a5c7096153855b5adca9db86c51 PKG_HASH:=6cb839be1a9535f8352441b3f6eea521ead5c5c7c913e8106cdfac96aa117041
PKG_MAINTAINER:= PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0-only PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=LICENSES/GPL-2.0 PKG_LICENSE_FILES:=LICENSES/GPL-2.0
PKG_CPE_ID:=cpe:/a:sgi:xfsprogs PKG_CPE_ID:=cpe:/a:sgi:xfsprogs
PKG_BUILD_DEPENDS:=inih PKG_BUILD_DEPENDS:=inih attr
PKG_BUILD_FLAGS:=no-mips16 PKG_BUILD_FLAGS:=no-mips16
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1 PKG_INSTALL:=1
@@ -31,8 +31,8 @@ define Package/xfsprogs/default
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
SUBMENU:=Filesystem SUBMENU:=Filesystem
DEPENDS:=+liburcu +libuuid +libpthread DEPENDS:=+liburcu +libuuid +libpthread +libblkid
URL:=https://xfs.org/ URL:=https://xfs.wiki.kernel.org/
endef endef
define Package/xfs-admin define Package/xfs-admin
@@ -57,19 +57,17 @@ $(call Package/xfsprogs/default)
endef endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--enable-lto \
--disable-gettext \ --disable-gettext \
--disable-blkid \
--disable-readline \
--disable-editline \
--disable-termcap \
--disable-lib64 \ --disable-lib64 \
--disable-librt \ --disable-librt \
--disable-ubisan \
--disable-addrsan \
--disable-threadsan \
--disable-scrub \ --disable-scrub \
--disable-libicu --disable-libicu
CONFIGURE_VARS += \
DEBUG=-DNDEBUG \
OPTIMIZER="$(TARGET_OPTIMIZATION)"
TARGET_CFLAGS += -DHAVE_MAP_SYNC $(if $(CONFIG_USE_MUSL),-D_LARGEFILE64_SOURCE) TARGET_CFLAGS += -DHAVE_MAP_SYNC $(if $(CONFIG_USE_MUSL),-D_LARGEFILE64_SOURCE)
TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt) TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt)
@@ -81,12 +79,12 @@ endef
define Package/xfs-mkfs/install define Package/xfs-mkfs/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mkfs.xfs $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkfs.xfs $(1)/usr/sbin
endef endef
define Package/xfs-fsck/install define Package/xfs-fsck/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/xfs_repair $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xfs_repair $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xfs_db $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xfs_db $(1)/usr/sbin
endef endef

12
utils/xfsprogs/patches/120-disable_assert.patch
View File

@@ -1,12 +0,0 @@
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -89,9 +89,6 @@ struct iomap;
/* for all the support code that uses progname in error messages */
extern char *progname;
-#undef ASSERT
-#define ASSERT(ex) assert(ex)
-
/*
* We have no need for the "linux" dev_t in userspace, so these
* are no-ops, and an xfs_dev_t is stored in VFS_I(ip)->i_rdev