Signed-off-by: Khem Raj <[email protected]> --- .../0001-Do-not-include-linux-fs.h.patch | 31 +++++++++++++++++++ .../bootchart2/bootchart2_0.14.9.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-devtools/bootchart2/bootchart2/0001-Do-not-include-linux-fs.h.patch
diff --git a/meta/recipes-devtools/bootchart2/bootchart2/0001-Do-not-include-linux-fs.h.patch b/meta/recipes-devtools/bootchart2/bootchart2/0001-Do-not-include-linux-fs.h.patch new file mode 100644 index 00000000000..4e71e5c7887 --- /dev/null +++ b/meta/recipes-devtools/bootchart2/bootchart2/0001-Do-not-include-linux-fs.h.patch @@ -0,0 +1,31 @@ +From 8591c1e3edaea8f17396e3d2819d9064b2818cfb Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 6 Aug 2022 20:39:01 -0700 +Subject: [PATCH] Do not include linux/fs.h + +This header is not needed to be included anymore, moreover it conflicts +with sys/mount.h from glibc 2.36+ see [1] + +[1] https://sourceware.org/glibc/wiki/Release/2.36 + +Upstream-Status: Submitted [https://github.com/xrmx/bootchart/pull/99] +Signed-off-by: Khem Raj <[email protected]> +--- + collector/collector.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/collector/collector.c b/collector/collector.c +index 5055181..12738ff 100644 +--- a/collector/collector.c ++++ b/collector/collector.c +@@ -34,7 +34,6 @@ + + #include <sys/mount.h> + #include <sys/sysmacros.h> +-#include <linux/fs.h> + #include <linux/genetlink.h> + #include <linux/taskstats.h> + #include <linux/cgroupstats.h> +-- +2.37.1 + diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb index b1628075a7d..b4d5b7cd9bc 100644 --- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb +++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb @@ -95,6 +95,7 @@ SRC_URI = "git://github.com/xrmx/bootchart.git;branch=master;protocol=https \ file://0001-collector-Allocate-space-on-heap-for-chunks.patch \ file://0001-bootchart2-support-usrmerge.patch \ file://0001-bootchartd.in-make-sure-only-one-bootchartd-process.patch \ + file://0001-Do-not-include-linux-fs.h.patch \ " S = "${WORKDIR}/git" -- 2.37.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#168986): https://lists.openembedded.org/g/openembedded-core/message/168986 Mute This Topic: https://lists.openembedded.org/mt/92866882/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
