diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-08-06 21:15:40 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-08 15:41:37 +0100 |
| commit | a9136a30c56ff1d63043558b9cbaaae3e302aef7 (patch) | |
| tree | 3a92f55f1c8d47057e0a2111a5dfa23f24e38fb0 | |
| parent | 981fd8966fb19d07b7166d136e1d7e2b76268a4a (diff) | |
| download | openembedded-core-contrib-a9136a30c56ff1d63043558b9cbaaae3e302aef7.tar.gz | |
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>
| -rw-r--r-- | meta/recipes-extended/ltp/ltp/0001-Remove-duplicate-include-of-sys-mount.h.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-extended/ltp/ltp_20220527.bb | 1 |
2 files changed, 31 insertions, 0 deletions
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 0000000000..fc7fea02f9 --- /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 b0f4ea6021..6d812958cd 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" |