synocli-misc: update moreutils and util-linux (SynoCommunity#6057)

* synocli-misc: update moreutils and util-linux - update moreutils to v0.69 - update util-linux to v2.39.3 - fix libusb dependency * cross/libuuid: revert update of util-linux - libuuid fails to build for ARMv5 and ARMv7L archs with util-linux >= 2.39.1 - util-linux update to v2.39.3 successfully builds cross/libmount, cross/libblkid and cross/misc-util-linux for all archs * fix cross/misc-util-linux for OLD_PPC_ARCHS - disable pipesz to enable build for OLD_PPC_ARCHS * misc-util-linux: comment why update to util-linux v2.40 is not possible
mreid-tt · Apr 4, 2024 · 07a737d · 07a737d
1 parent 0f975a2
commit 07a737d
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 26 deletions.
diff --git a/cross/libblkid/Makefile b/cross/libblkid/Makefile
@@ -1,6 +1,6 @@
 PKG_NAME = libblkid
 PKG_REAL_NAME = util-linux
-PKG_VERS = 2.38.1
+PKG_VERS = 2.39.3
 PKG_VERS_MAJOR = $(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_REAL_NAME)-$(PKG_VERS).$(PKG_EXT)

diff --git a/cross/libblkid/digests b/cross/libblkid/digests
@@ -1,3 +1,3 @@
-util-linux-2.38.1.tar.xz SHA1 f62a7b6fe64ce7f4569b57d7d2d0875b39f79836
-util-linux-2.38.1.tar.xz SHA256 60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f
-util-linux-2.38.1.tar.xz MD5 cd11456f4ddd31f7fbfdd9488c0c0d02
+util-linux-2.39.3.tar.xz SHA1 9704d9927be7888b97a09735a1b5915a390d43c3
+util-linux-2.39.3.tar.xz SHA256 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f
+util-linux-2.39.3.tar.xz MD5 f3591e6970c017bb4bcd24ae762a98f5
diff --git a/cross/libmount/Makefile b/cross/libmount/Makefile
@@ -1,6 +1,6 @@
 PKG_NAME = libmount
 PKG_REAL_NAME = util-linux
-PKG_VERS = 2.38.1
+PKG_VERS = 2.39.3
 PKG_VERS_MAJOR = $(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_REAL_NAME)-$(PKG_VERS).$(PKG_EXT)
@@ -11,6 +11,9 @@ EXTRACT_PATH = $(WORK_DIR)/$(PKG_NAME)
 
 DEPENDS =
 
+# libmount/src/context_umount.c:290: error: 'O_PATH' undeclared
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+
 HOMEPAGE = https://github.com/karelzak/util-linux
 COMMENT  = Random collection of Linux utilities. We use this only to build libblkid out of util-linux.
 LICENSE  = GPLv2

diff --git a/cross/libmount/digests b/cross/libmount/digests
@@ -1,3 +1,3 @@
-util-linux-2.38.1.tar.xz SHA1 f62a7b6fe64ce7f4569b57d7d2d0875b39f79836
-util-linux-2.38.1.tar.xz SHA256 60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f
-util-linux-2.38.1.tar.xz MD5 cd11456f4ddd31f7fbfdd9488c0c0d02
+util-linux-2.39.3.tar.xz SHA1 9704d9927be7888b97a09735a1b5915a390d43c3
+util-linux-2.39.3.tar.xz SHA256 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f
+util-linux-2.39.3.tar.xz MD5 f3591e6970c017bb4bcd24ae762a98f5
diff --git a/cross/misc-util-linux/Makefile b/cross/misc-util-linux/Makefile
@@ -1,14 +1,18 @@
 PKG_NAME = misc-util-linux
 PKG_REAL_NAME = util-linux
-PKG_VERS = 2.38.1
+PKG_VERS = 2.39.3
 PKG_VERS_MAJOR = $(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_REAL_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.kernel.org/pub/linux/utils/$(PKG_REAL_NAME)/v$(PKG_VERS_MAJOR)
-# use dedicated folder to build independent of other libraries built from util-linux (i.e. libuuid, libblkid)
+# use dedicated folder to build independent of other libraries built from util-linux (i.e. libuuid, libmount, libblkid)
 PKG_DIR = $(PKG_NAME)/$(PKG_REAL_NAME)-$(PKG_VERS)
 EXTRACT_PATH = $(WORK_DIR)/$(PKG_NAME)
 
+# REMARKS:
+# update to v2.40 is not possible without disabling the build of zramctl (for 32 bit archs)
+# but zramctl was explicitly requested in https://github.com/SynoCommunity/spksrc/issues/5749
+
 DEPENDS = cross/ncursesw
 
 HOMEPAGE = https://github.com/karelzak/util-linux
@@ -47,6 +51,10 @@ CONFIGURE_ARGS += --disable-irqtop
 CONFIGURE_ARGS += --disable-ul
 CONFIGURE_ARGS += --disable-more
 
+# OLD_PPC_ARCHS
+# misc-utils/pipesz.c:128: error: 'F_SETPIPE_SZ' undeclared
+CONFIGURE_ARGS += --disable-pipesz
+
 # fails to build for: hi3535-6.1
 CONFIGURE_ARGS += --disable-schedutils
 
@@ -68,7 +76,9 @@ endif
 # for lsblk and others: ncurses must be built with tinfo
 # this seems to be a bug in util-linux, as most of other libraries fail to find ncurses/termlib
 # dependencies when ncurses is build with lib tinfo
-export NCURSES_WITH_TINFO=yes
+# https://github.com/util-linux/util-linux/issues/2416
+# This is a workaround to use ncursesw without tinfo:
+COMPILE_MAKE_OPTIONS = NCURSES_LIBS="-lncursesw"
 
 include ../../mk/spksrc.cross-cc.mk
 

diff --git a/cross/misc-util-linux/digests b/cross/misc-util-linux/digests
@@ -1,3 +1,3 @@
-util-linux-2.38.1.tar.xz SHA1 f62a7b6fe64ce7f4569b57d7d2d0875b39f79836
-util-linux-2.38.1.tar.xz SHA256 60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f
-util-linux-2.38.1.tar.xz MD5 cd11456f4ddd31f7fbfdd9488c0c0d02
+util-linux-2.39.3.tar.xz SHA1 9704d9927be7888b97a09735a1b5915a390d43c3
+util-linux-2.39.3.tar.xz SHA256 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f
+util-linux-2.39.3.tar.xz MD5 f3591e6970c017bb4bcd24ae762a98f5
diff --git a/cross/moreutils/Makefile b/cross/moreutils/Makefile
@@ -1,6 +1,6 @@
 PKG_NAME = moreutils
-PKG_VERS = 0.67
-PKG_EXT = tar.gz
+PKG_VERS = 0.69
+PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)_$(PKG_VERS).orig.$(PKG_EXT)
 PKG_DIST_SITE = https://deb.debian.org/debian/pool/main/m/moreutils/
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

diff --git a/cross/moreutils/digests b/cross/moreutils/digests
@@ -1,3 +1,3 @@
-moreutils_0.67.orig.tar.gz SHA1 a21214d388ea7077d9f67bb74d10fbb80c732aac
-moreutils_0.67.orig.tar.gz SHA256 03872f42c22943b21c62f711b693c422a4b8df9d1b8b2872ef9a34bd5d13ad10
-moreutils_0.67.orig.tar.gz MD5 7c08d066e954b05cc4a661d3e9966183
+moreutils_0.69.orig.tar.xz SHA1 497ea4313acf2dd79a58ecbee4bae59f1f4cf0a7
+moreutils_0.69.orig.tar.xz SHA256 2170c46219ce8d6f17702321534769dfbfece52148a78cd12ea73b5d3a72ff7c
+moreutils_0.69.orig.tar.xz MD5 2a2b101efa55149c44fd761a3070395b
diff --git a/cross/uhubctl/Makefile b/cross/uhubctl/Makefile
@@ -6,12 +6,21 @@ PKG_DIST_SITE = https://github.com/mvp/uhubctl/archive
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/libusb
+OPTIONAL_DEPENDS = cross/libusb cross/libusb_1.0.23
 
 HOMEPAGE = https://github.com/mvp/uhubctl
 COMMENT  = USB hub per-port power control.
 LICENSE  = GPLv2
 
+include ../../mk/spksrc.common.mk
+ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(ARMv7L_ARCHS) $(PPC_ARCHS)),$(ARCH))
+DEPENDS += cross/libusb_1.0.23
+else ifeq ($(call version_lt, ${TCVERSION}, 6.0)$(call version_ge, ${TCVERSION}, 3.0),11)
+DEPENDS += cross/libusb_1.0.23
+else
+DEPENDS += cross/libusb
+endif
+
 CONFIGURE_TARGET = nop
 POST_INSTALL_TARGET = uhubctl_post_install
 

diff --git a/cross/usbutils/Makefile b/cross/usbutils/Makefile
@@ -11,11 +11,13 @@ HOMEPAGE = http://www.linux-usb.org/
 COMMENT  = Collection of USB tools for use on Linux and BSD systems to query what type of USB devices are connected to the system.
 LICENSE  = GPLv2
 
-include ../../mk/spksrc.archs.mk
+include ../../mk/spksrc.common.mk
 ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(ARMv7L_ARCHS) $(PPC_ARCHS)),$(ARCH))
-DEPENDS = cross/libusb_1.0.23
+DEPENDS += cross/libusb_1.0.23
+else ifeq ($(call version_lt, ${TCVERSION}, 6.0)$(call version_ge, ${TCVERSION}, 3.0),11)
+DEPENDS += cross/libusb_1.0.23
 else
-DEPENDS = cross/libusb
+DEPENDS += cross/libusb
 endif
 
 GNU_CONFIGURE = 1

diff --git a/spk/synocli-misc/Makefile b/spk/synocli-misc/Makefile
@@ -1,16 +1,19 @@
 SPK_NAME = synocli-misc
 SPK_VERS = 1.1
-SPK_REV = 3
+SPK_REV = 4
 SPK_ICON = src/synocli-misc.png
 
-DEPENDS = cross/bc cross/moreutils cross/misc-util-linux cross/uhubctl
+DEPENDS  = cross/bc
+DEPENDS += cross/moreutils
+DEPENDS += cross/misc-util-linux
+DEPENDS += cross/uhubctl
 
 MAINTAINER = SynoCommunity
 DISPLAY_NAME = SynoCli misc. Tools
 
 DESCRIPTION = "SynoCli misc. Tools provide a set of miscellaneous small command-line utilities: bc, errno, ifdata, ifne, isutf8, lckdo, mispipe, parallel, pee, sponge, cal, col, colcrt, colrm, column, hexdump, lsblk, lscpu, lsipc, lsirq, rev, wall, whereis, zramctl, uhubctl."
 STARTABLE = no
-CHANGELOG = "1. Add zramctl from util-linux.<br/>2. Add uhubctl."
+CHANGELOG = "1. Update moreutils to v0.69.<br/>2. Update util-linux to v2.39.3.<br/>3. Update libusb to v1.0.27 (keep v1.0.23 for older systems)."
 
 HOMEPAGE = https://github.com/SynoCommunity/spksrc/wiki/FAQ-SynoCliMisc
 LICENSE  = Each tool is licensed under it's respective license.