From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 7 Aug 2022 04:15:40 +0000 (-0700)
Subject: ltp: Fix sys/mount.h conflicts needed for glibc 2.36+ compile
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3390
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9136a30c56ff1d63043558b9cbaaae3e302aef7;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

ltp: Fix sys/mount.h conflicts needed for glibc 2.36+ compile

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-extended/ltp/ltp/0001-Remove-duplicate-include-of-sys-mount.h.patch b/meta/recipes-extended/ltp/ltp/0001-Remove-duplicate-include-of-sys-mount.h.patch
new file mode 100644
index 00000000000..fc7fea02f9b
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-Remove-duplicate-include-of-sys-mount.h.patch
@@ -0,0 +1,30 @@
+From 463f3f85e326253feb35015a022ab6d1e03fe1d5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 6 Aug 2022 20:50:27 -0700
+Subject: [PATCH] Remove duplicate include of <sys/mount.h>
+
+<sys/mount.h> is already included by lapi/mount.h.
+
+This fixes build with glibc 2.36+
+
+Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/953]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ testcases/kernel/syscalls/statx/statx09.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/testcases/kernel/syscalls/statx/statx09.c b/testcases/kernel/syscalls/statx/statx09.c
+index aea329e086..34c5f41f87 100644
+--- a/testcases/kernel/syscalls/statx/statx09.c
++++ b/testcases/kernel/syscalls/statx/statx09.c
+@@ -18,7 +18,6 @@
+  */
+ 
+ #define _GNU_SOURCE
+-#include <sys/mount.h>
+ #include <stdlib.h>
+ #include "tst_test.h"
+ #include "lapi/fs.h"
+-- 
+2.37.1
+
diff --git a/meta/recipes-extended/ltp/ltp_20220527.bb b/meta/recipes-extended/ltp/ltp_20220527.bb
index b0f4ea6021e..6d812958cdd 100644
--- a/meta/recipes-extended/ltp/ltp_20220527.bb
+++ b/meta/recipes-extended/ltp/ltp_20220527.bb
@@ -37,6 +37,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=ht
            file://0001-netstress-Restore-runtime-to-5m.patch \
            file://0001-net_stress-Fix-usage-of-variables-from-tst_net.sh.patch \
            file://0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch \
+           file://0001-Remove-duplicate-include-of-sys-mount.h.patch \
            "
 
 S = "${WORKDIR}/git"