util-linux: include/mount-api-utils: avoid using sys/mount.h
PATCH 1/2 util-linux: include/mount-api-utils: avoid using sys/mount.h
From: Randy MacLeod <[email protected]>
Avoid compile error:
| In file included from /usr/include/linux/fs.h:19,
| from /usr/include/linux/btrfs.h:29,
| from ../sources/util-linux-2.41.1/libmount/src/btrfs.c:18:
| /usr/include/x86_64-linux-gnu/sys/mount.h:35:3: \
error: expected identifier before numeric constant
| 35 | MS_RDONLY = 1, /* Mount read-only. */
| | ^~~~~~~~~This is seen on PopOS 22.04, an Ubuntu/Debian-based distro.
Signed-off-by Randy MacLeod <[email protected]>
--- meta/recipes-core/util-linux/util-linux.inc | 1 + ...nt-api-utils-avoid-using-sys-mount.h.patch | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-core/util-linux/util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patch
meta/recipes-core/util-linux/util-linux.inc +1 -0
@@ -21,6 +21,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch \ file://0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch \ file://0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch \ + file://0001-include-mount-api-utils-avoid-using-sys-mount.h.patch \ " SRC_URI[sha256sum] = "be9ad9a276f4305ab7dd2f5225c8be1ff54352f565ff4dede9628c1aaa7dec57"
meta/recipes-core/util-linux/util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 2a9b48d20d74f65ac708b3bcee6a7e2a61aadf88 Mon Sep 17 00:00:00 2001 +From: Karel Zak <[email protected]> +Date: Thu, 21 Aug 2025 09:59:10 +0200 +Subject: [PATCH] include/mount-api-utils: avoid using sys/mount.h + +The file is unnecessary and introduces duplicate #define of MS_* macros. + +Fixes: https://github.com/util-linux/util-linux/issues/3674 +Signed-off-by: Karel Zak <[email protected]> +Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/2a9b48d20d74f65ac708b3bcee6a7e2a61aadf88] +--- + include/mount-api-utils.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/include/mount-api-utils.h b/include/mount-api-utils.h +index 920d6766a..e35524168 100644 +--- a/include/mount-api-utils.h ++++ b/include/mount-api-utils.h +@@ -6,7 +6,6 @@ + #define UTIL_LINUX_MOUNT_API_UTILS + + #ifdef HAVE_LINUX_MOUNT_H +-#include <sys/mount.h> + #include <linux/mount.h> + #include <linux/unistd.h> + #include <sys/syscall.h> +-- +2.34.1 +
Signature · 1 line
2.34.1
PATCH 2/2 stress-ng: upgrade 0.19.02 -> 0.19.03
From: Randy MacLeod <[email protected]>
Improvements
More progress feedback when sending ^C (SIGINT) Clean up manual
Improved portability
Changelog:
https://github.com/ColinIanKing/stress-ng/releases/tag/V0.19.03
Re-enable DEBUG_BUILDs since the upstream defect:
https://github.com/ColinIanKing/stress-ng/issues/315
is resolved by:
6e62dc1fb 2023-08-31 Makefile: force vnni to be built with at least -O2
Signed-off-by Randy MacLeod <[email protected]>
---
.../stress-ng/{stress-ng_0.19.02.bb => stress-ng_0.19.03.bb} | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
rename meta/recipes-extended/stress-ng/{stress-ng_0.19.02.bb => stress-ng_0.19.03.bb} (85%)meta/recipes-extended/stress-ng/stress-ng_0.19.03.bb renamed from meta/recipes-extended/stress-ng/stress-ng_0.19.02.bb +1 -4
@@ -6,7 +6,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master;tag=V${PV}" -SRCREV = "8d5399b282225f758606cd2b522382f65d947a8d" +SRCREV = "20e0f48cf0ca9cc96ed150c3dfa96f8e8a2f964b" DEPENDS = "coreutils-native libbsd"
@@ -29,6 +29,3 @@ do_install() { oe_runmake DESTDIR=${D} BINDIR=${bindir} install ln -s stress-ng ${D}${bindir}/stress } - -# upstream issue: https://github.com/ColinIanKing/stress-ng/issues/315 -DEBUG_BUILD = "0"
Signature · 1 line
2.34.1