diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-08-06 21:15:37 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-08 15:41:37 +0100 |
| commit | d0275fb6c4b54b17d66d724581b30ba4c18a058a (patch) | |
| tree | e912004146322b3562de1cf7c605660a54530c9f | |
| parent | 5547f0e9e0c71c82d9bf87384bc81901117db030 (diff) | |
| download | openembedded-core-contrib-d0275fb6c4b54b17d66d724581b30ba4c18a058a.tar.gz | |
mtd-utils: Fix build with glibc 2.36
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 @@ +From 6fb10bd18488ed84776675bc1b2982800a51d839 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 6 Aug 2022 20:14:38 -0700 +Subject: [mtd-utils][PATCH] tests: Remove unused linux/fs.h header from includes + +This header is not needed, moreover it includes linux/mount.h which is +now in conflict[1] with glibc provided sys/mount.h from glibc 2.36 onwards + +[1] https://sourceware.org/glibc/wiki/Release/2.36 + +Upstream-Status: Submitted [https://lists.infradead.org/pipermail/linux-mtd/2022-August/094667.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/fs-tests/lib/tests.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/tests/fs-tests/lib/tests.c b/tests/fs-tests/lib/tests.c +index d1a2e0c..3db0426 100644 +--- a/tests/fs-tests/lib/tests.c ++++ b/tests/fs-tests/lib/tests.c +@@ -35,7 +35,6 @@ + #include <sys/vfs.h> + #include <sys/mount.h> + #include <sys/statvfs.h> +-#include <linux/fs.h> + #include <linux/jffs2.h> + + #include "tests.h" +-- +2.37.1 + 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" SRCREV = "c7f1bfa44a84d02061787e2f6093df5cc40b9f5c" SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \ file://add-exclusion-to-mkfs-jffs2-git-2.patch \ + file://0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch \ " S = "${WORKDIR}/git" |