diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/mtd/mtd-utils/0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch | 31 | ||||
-rw-r--r-- | meta/recipes-devtools/mtd/mtd-utils_git.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-devtools/mtd/mtd-utils/0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch b/meta/recipes-devtools/mtd/mtd-utils/0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch new file mode 100644 index 0000000000..73d4a8475f --- /dev/null +++ b/meta/recipes-devtools/mtd/mtd-utils/0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 6fb10bd18488ed84776675bc1b2982800a51d839 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 6 Aug 2022 20:14:38 -0700 | ||
4 | Subject: [mtd-utils][PATCH] tests: Remove unused linux/fs.h header from includes | ||
5 | |||
6 | This header is not needed, moreover it includes linux/mount.h which is | ||
7 | now in conflict[1] with glibc provided sys/mount.h from glibc 2.36 onwards | ||
8 | |||
9 | [1] https://sourceware.org/glibc/wiki/Release/2.36 | ||
10 | |||
11 | Upstream-Status: Submitted [https://lists.infradead.org/pipermail/linux-mtd/2022-August/094667.html] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | tests/fs-tests/lib/tests.c | 1 - | ||
15 | 1 file changed, 1 deletion(-) | ||
16 | |||
17 | diff --git a/tests/fs-tests/lib/tests.c b/tests/fs-tests/lib/tests.c | ||
18 | index d1a2e0c..3db0426 100644 | ||
19 | --- a/tests/fs-tests/lib/tests.c | ||
20 | +++ b/tests/fs-tests/lib/tests.c | ||
21 | @@ -35,7 +35,6 @@ | ||
22 | #include <sys/vfs.h> | ||
23 | #include <sys/mount.h> | ||
24 | #include <sys/statvfs.h> | ||
25 | -#include <linux/fs.h> | ||
26 | #include <linux/jffs2.h> | ||
27 | |||
28 | #include "tests.h" | ||
29 | -- | ||
30 | 2.37.1 | ||
31 | |||
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb index 3318277477..d5dfbcdf7a 100644 --- a/meta/recipes-devtools/mtd/mtd-utils_git.bb +++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb | |||
@@ -16,6 +16,7 @@ PV = "2.1.4" | |||
16 | SRCREV = "c7f1bfa44a84d02061787e2f6093df5cc40b9f5c" | 16 | SRCREV = "c7f1bfa44a84d02061787e2f6093df5cc40b9f5c" |
17 | SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \ | 17 | SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \ |
18 | file://add-exclusion-to-mkfs-jffs2-git-2.patch \ | 18 | file://add-exclusion-to-mkfs-jffs2-git-2.patch \ |
19 | file://0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch \ | ||
19 | " | 20 | " |
20 | 21 | ||
21 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |