Skip to content

erofs-utils: update to 1.9.1 #13958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coolsnowwolf merged 3 commits into from
Apr 9, 2026
Merged

erofs-utils: update to 1.9.1 #13958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae7a4d7
erofs-utils: update to 1.9.1
Internet1235 Mar 28, 2026
cf025bf
tools/util-linux: update to 2.41.3
Internet1235 Apr 2, 2026
d5e0c59
tools/xz: update to 5.8.3
Internet1235 Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions tools/erofs-utils/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,21 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=erofs-utils
PKG_VERSION:=1.8.10
PKG_VERSION:=1.9.1
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL=https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/
PKG_HASH:=05eb4edebe11decce6ecb34e98d2f80c8cd283c2f2967d8ba7efd58418570514
PKG_HASH:=a9ef5ab67c4b8d2d3e9ed71f39cd008bda653142a720d8a395a36f1110d0c432
PKG_CPE_ID:=cpe:/a:erofs-utils_project:erofs-utils

PKG_FIXUP:=autoreconf

include $(INCLUDE_DIR)/host-build.mk

HOST_CONFIGURE_VARS =\
LIBS="-llzma -luuid"

HOST_CONFIGURE_ARGS=\
--enable-multithreading \
--enable-lzma \
Expand Down
51 changes: 12 additions & 39 deletions tools/util-linux/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,28 @@
#
# Copyright (C) 2006-2015 OpenWrt.org
# Copyright (C) 2006-2025 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk

PKG_NAME:=util-linux
PKG_VERSION:=2.41.1
PKG_VERSION:=2.41.3

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.41
PKG_HASH:=be9ad9a276f4305ab7dd2f5225c8be1ff54352f565ff4dede9628c1aaa7dec57
PKG_HASH:=3330d873f0fceb5560b89a7dc14e4f3288bbd880e96903ed9b50ec2b5799e58b
PKG_CPE_ID:=cpe:/a:kernel:util-linux

PKG_FIXUP:=autoreconf

HOST_BUILD_PARALLEL:=1

include $(INCLUDE_DIR)/host-build.mk

HOST_CONFIGURE_ARGS += \
--with-pic \
--disable-shared \
--disable-nls \
--disable-all-programs \
--enable-hexdump \
--enable-libuuid \
--without-util \
--without-selinux \
--without-audit \
--without-udev \
--without-ncursesw \
--without-ncurses \
--without-slang \
--without-tinfo \
--without-readline \
--without-utempter \
--without-cap-ng \
--without-libz \
--without-libmagic \
--without-user \
--without-btrfs \
--without-systemd \
--without-smack \
--without-econf \
--without-python \
--without-cryptsetup

define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
include $(INCLUDE_DIR)/meson.mk

MESON_HOST_ARGS += \
$(if $(findstring y,$(YEAR_2038)),,-Dallow-32bit-time=true) \
-Dauto_features=disabled \
-Dbuild-hexdump=enabled \
-Dbuild-libuuid=enabled \
-Dncurses=enabled \
-Dprogram-tests=false

$(eval $(call HostBuild))
24 changes: 24 additions & 0 deletions tools/util-linux/patches/010-meson-curses.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From c1ca5ec4a5c6a0e4acbdcc6ff4e4fa2109c1ec24 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Wed, 30 Jul 2025 14:13:07 -0700
Subject: [PATCH] meson: use curses for the non wide version

The curses dependency in meson in special in that it uses a combination
of pkg-config, config-tool, and various system lookups to find it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/meson.build
+++ b/meson.build
@@ -289,7 +289,7 @@ if lib_ncursesw.found()
lib_ncurses = disabler()
else
lib_ncurses = dependency(
- 'ncurses',
+ 'curses',
disabler : true,
required : get_option('ncurses'))
headers += ['ncurses.h',
13 changes: 13 additions & 0 deletions tools/util-linux/patches/102-macos-uuid-next.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- a/libuuid/src/uuid.h
+++ b/libuuid/src/uuid.h
@@ -35,6 +35,10 @@
#ifndef _UL_LIBUUID_UUID_H
#define _UL_LIBUUID_UUID_H

+#if defined(__clang__) && defined(__APPLE__)
+#include_next <uuid/uuid.h>
+#endif
+
#include <sys/types.h>
#ifndef _WIN32
#include <sys/time.h>
9 changes: 5 additions & 4 deletions tools/xz/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=xz
PKG_VERSION:=5.4.6
PKG_VERSION:=5.8.3

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/lzmautils \
http://tukaani.org/xz
PKG_HASH:=913851b274e8e1d31781ec949f1c23e8dbcf0ecf6e73a2436dc21769dd3e6f49
PKG_SOURCE_URL:=https://github.com/tukaani-project/xz/releases/download/v$(PKG_VERSION) \
@SF/lzmautils \
http://tukaani.org/xz
PKG_HASH:=33bf69c0d6c698e83a68f77e6c1f465778e418ca0b3d59860d3ab446f4ac99a6
PKG_CPE_ID:=cpe:/a:tukaani:xz

HOST_BUILD_PARALLEL:=1
Expand Down