mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-19 16:40:46 -09:00
package/util-linux: fix LSMT_ROOT fallback definition
The fallback definition for LSMT_ROOT was incorrectly guarded
with #ifdef instead of #ifndef, making it ineffective. This caused
build issues on configurations with musl 1.2.6, which defines
SYS_statmount making util-linux consider statmount() as available, but
having older kernel headers, not providing LSMT_ROOT.
Fixes:
http://autobuild.buildroot.net/results/ac2bc633db0c605564c79bfdfa0e257a9b4f1b28/
Signed-off-by: Shubham Chakraborty <chakrabortyshubham66@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit f0540ff531)
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
This commit is contained in:
committed by
Thomas Perale
parent
dee8d1caff
commit
40a3986edb
@@ -0,0 +1,44 @@
|
|||||||
|
From 72ff3b8998a675900fcb7c18c0e03f1552b13a8b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shubham Chakraborty <chakrabortyshubham66@gmail.com>
|
||||||
|
Date: Tue, 14 Apr 2026 11:04:08 +0530
|
||||||
|
Subject: [PATCH] include/mount-api-utils.h: fix LSMT_ROOT definition
|
||||||
|
|
||||||
|
Commit
|
||||||
|
ded434a63f3eee7fd7805b18d6c9bb912016c3c8 ("include/mount-api-utils:
|
||||||
|
add statmount and listmount") introduce a fallback definition for the
|
||||||
|
LSMT_ROOT defined, but a small typo makes this fallback definition
|
||||||
|
ineffective:
|
||||||
|
|
||||||
|
#ifdef LSMT_ROOT
|
||||||
|
# define LSMT_ROOT ...
|
||||||
|
#endif
|
||||||
|
|
||||||
|
Should obviously have been:
|
||||||
|
|
||||||
|
#ifndef LSMT_ROOT
|
||||||
|
# define LSMT_ROOT ...
|
||||||
|
#endif
|
||||||
|
|
||||||
|
Signed-off-by: Shubham Chakraborty <chakrabortyshubham66@gmail.com>
|
||||||
|
Upstream: https://lore.kernel.org/util-linux/20260530094932.2351791-1-thomas.petazzoni@bootlin.com/T/#u
|
||||||
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||||
|
---
|
||||||
|
include/mount-api-utils.h | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/include/mount-api-utils.h b/include/mount-api-utils.h
|
||||||
|
index a916f99..87e173e 100644
|
||||||
|
--- a/include/mount-api-utils.h
|
||||||
|
+++ b/include/mount-api-utils.h
|
||||||
|
@@ -339,7 +339,7 @@ struct ul_statmount {
|
||||||
|
/*
|
||||||
|
* Special @mnt_id values that can be passed to listmount
|
||||||
|
*/
|
||||||
|
-#ifdef LSMT_ROOT
|
||||||
|
+#ifndef LSMT_ROOT
|
||||||
|
# define LSMT_ROOT 0xffffffffffffffff /* root mount */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
--
|
||||||
|
2.53.0
|
||||||
|
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
From 72ff3b8998a675900fcb7c18c0e03f1552b13a8b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shubham Chakraborty <chakrabortyshubham66@gmail.com>
|
||||||
|
Date: Tue, 14 Apr 2026 11:04:08 +0530
|
||||||
|
Subject: [PATCH] include/mount-api-utils.h: fix LSMT_ROOT definition
|
||||||
|
|
||||||
|
Commit
|
||||||
|
ded434a63f3eee7fd7805b18d6c9bb912016c3c8 ("include/mount-api-utils:
|
||||||
|
add statmount and listmount") introduce a fallback definition for the
|
||||||
|
LSMT_ROOT defined, but a small typo makes this fallback definition
|
||||||
|
ineffective:
|
||||||
|
|
||||||
|
#ifdef LSMT_ROOT
|
||||||
|
# define LSMT_ROOT ...
|
||||||
|
#endif
|
||||||
|
|
||||||
|
Should obviously have been:
|
||||||
|
|
||||||
|
#ifndef LSMT_ROOT
|
||||||
|
# define LSMT_ROOT ...
|
||||||
|
#endif
|
||||||
|
|
||||||
|
Signed-off-by: Shubham Chakraborty <chakrabortyshubham66@gmail.com>
|
||||||
|
Upstream: https://lore.kernel.org/util-linux/20260530094932.2351791-1-thomas.petazzoni@bootlin.com/T/#u
|
||||||
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||||
|
---
|
||||||
|
include/mount-api-utils.h | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/include/mount-api-utils.h b/include/mount-api-utils.h
|
||||||
|
index a916f99..87e173e 100644
|
||||||
|
--- a/include/mount-api-utils.h
|
||||||
|
+++ b/include/mount-api-utils.h
|
||||||
|
@@ -339,7 +339,7 @@ struct ul_statmount {
|
||||||
|
/*
|
||||||
|
* Special @mnt_id values that can be passed to listmount
|
||||||
|
*/
|
||||||
|
-#ifdef LSMT_ROOT
|
||||||
|
+#ifndef LSMT_ROOT
|
||||||
|
# define LSMT_ROOT 0xffffffffffffffff /* root mount */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
--
|
||||||
|
2.53.0
|
||||||
|
|
||||||
Reference in New Issue
Block a user