1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00

mtd-utils: Fix build with glibc 2.36

(From OE-Core rev: d0275fb6c4b54b17d66d724581b30ba4c18a058a)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2022-08-06 21:15:37 -07:00
committed by Richard Purdie
parent 1f28ef8300
commit ce119b0617
2 changed files with 32 additions and 0 deletions
@@ -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
@@ -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"