util-linux: include/mount-api-utils: avoid using sys/mount.h

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 <Randy.MacLeod@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index c5698d9cab8327a05349721010b81a6b7a64b376..4c1105b6aecb8ad6afc25ad35afb98b7b59775e3 100644 (file)
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -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"

diff --git a/meta/recipes-core/util-linux/util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patch b/meta/recipes-core/util-linux/util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patch
new file mode 100644 (file)
index 0000000..544f453
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patch
@@ -0,0 +1,29 @@
+From 2a9b48d20d74f65ac708b3bcee6a7e2a61aadf88 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+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 <kzak@redhat.com>
+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
+