aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-11-06 17:28:04 +0100
committerRosen Penev <rosenp@gmail.com>2022-11-11 15:11:03 -0800
commit1214587d5d591a4900f92216e725488b42349a49 (patch)
tree591c3bfb736d49f02885a9ae9f217562bafe94d0
parent13b7a262974a295c04b643a71b7ee5243d2e386b (diff)
hwinfo: Backport build fix for glibc 2.36
This backports a build fix for hwinfo when compiling against glibc 2.36. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat
1 files changed, 22 insertions, 0 deletions
diff --git a/utils/hwinfo/patches/060-glibc-2-36-includes-fsconfig-itself-make-linux-fs-h.patch b/utils/hwinfo/patches/060-glibc-2-36-includes-fsconfig-itself-make-linux-fs-h.patch
new file mode 100644
index 000000000..98f43aadb
--- /dev/null
+++ b/utils/hwinfo/patches/060-glibc-2-36-includes-fsconfig-itself-make-linux-fs-h.patch
@@ -0,0 +1,22 @@
+From f73524aa60c50695a38c0dad222ffe60d094a857 Mon Sep 17 00:00:00 2001
+From: Steffen Winterfeldt <wfeldt@opensuse.org>
+Date: Tue, 9 Aug 2022 12:54:58 +0200
+Subject: [PATCH] glibc 2.36+ includes fsconfig itself, make linux/fs.h
+ inclusion conditional (bsc#1202213)
+
+---
+ src/hd/hd.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/src/hd/hd.c
++++ b/src/hd/hd.c
+@@ -23,7 +23,9 @@
+ #include <linux/hdreg.h>
+ #define _LINUX_AUDIT_H_
+ #define _LINUX_PRIO_TREE_H
++#ifndef FSCONFIG_SET_FLAG
+ #include <linux/fs.h>
++#endif
+
+ /**
+ * @defgroup libhdBUSint Bus scanning code
Powered by cgit, Themed by Ted Yin.