diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-08-06 21:15:39 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-08 15:44:21 +0100 |
commit | ec9ec0b349ec28d400ddb9f72b0066f1eadeac7b (patch) | |
tree | c376507bf707b3a803bb4c08f36937f0237536c2 /meta/recipes-devtools | |
parent | fd3c99be517a98e58b9351777921b341582dfec3 (diff) | |
download | poky-ec9ec0b349ec28d400ddb9f72b0066f1eadeac7b.tar.gz |
bootchart2: Fix build with glibc 2.36+
(From OE-Core rev: 981fd8966fb19d07b7166d136e1d7e2b76268a4a)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/bootchart2/bootchart2/0001-Do-not-include-linux-fs.h.patch | 31 | ||||
-rw-r--r-- | meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb | 1 |
2 files changed, 32 insertions, 0 deletions
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 0000000000..4e71e5c788 --- /dev/null +++ b/meta/recipes-devtools/bootchart2/bootchart2/0001-Do-not-include-linux-fs.h.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 8591c1e3edaea8f17396e3d2819d9064b2818cfb Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 6 Aug 2022 20:39:01 -0700 | ||
4 | Subject: [PATCH] Do not include linux/fs.h | ||
5 | |||
6 | This header is not needed to be included anymore, moreover it conflicts | ||
7 | with sys/mount.h from glibc 2.36+ see [1] | ||
8 | |||
9 | [1] https://sourceware.org/glibc/wiki/Release/2.36 | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/xrmx/bootchart/pull/99] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | collector/collector.c | 1 - | ||
15 | 1 file changed, 1 deletion(-) | ||
16 | |||
17 | diff --git a/collector/collector.c b/collector/collector.c | ||
18 | index 5055181..12738ff 100644 | ||
19 | --- a/collector/collector.c | ||
20 | +++ b/collector/collector.c | ||
21 | @@ -34,7 +34,6 @@ | ||
22 | |||
23 | #include <sys/mount.h> | ||
24 | #include <sys/sysmacros.h> | ||
25 | -#include <linux/fs.h> | ||
26 | #include <linux/genetlink.h> | ||
27 | #include <linux/taskstats.h> | ||
28 | #include <linux/cgroupstats.h> | ||
29 | -- | ||
30 | 2.37.1 | ||
31 | |||
diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb index b1628075a7..b4d5b7cd9b 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 \ | |||
95 | file://0001-collector-Allocate-space-on-heap-for-chunks.patch \ | 95 | file://0001-collector-Allocate-space-on-heap-for-chunks.patch \ |
96 | file://0001-bootchart2-support-usrmerge.patch \ | 96 | file://0001-bootchart2-support-usrmerge.patch \ |
97 | file://0001-bootchartd.in-make-sure-only-one-bootchartd-process.patch \ | 97 | file://0001-bootchartd.in-make-sure-only-one-bootchartd-process.patch \ |
98 | file://0001-Do-not-include-linux-fs.h.patch \ | ||
98 | " | 99 | " |
99 | 100 | ||
100 | S = "${WORKDIR}/git" | 101 | S = "${WORKDIR}/git" |