summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Díaz <daniel.diaz@linaro.org>2018-11-19 16:07:20 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-21 11:54:14 +0000
commit707512e90a719d674c04cff06fd39b2d5e91d397 (patch)
tree9935317e1be2852b93e5ccd2d2146a63b80823fb
parent3732e2deab18aaca81023034dd760ce53e99c86a (diff)
downloadpoky-707512e90a719d674c04cff06fd39b2d5e91d397.tar.gz
ltp: Delete unneeded patch for FNM_EXTMATCH
The patch in question was reworked, merged and released by upstream version 20180926, as commit 822ad2043379. (From OE-Core rev: 6ad99f3eabe359d5be98d63d4781063b63c83eea) Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/ltp/ltp/0040-read_all-Define-FNM_EXTMATCH-if-not-already-like-und.patch44
-rw-r--r--meta/recipes-extended/ltp/ltp_20180926.bb1
2 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0040-read_all-Define-FNM_EXTMATCH-if-not-already-like-und.patch b/meta/recipes-extended/ltp/ltp/0040-read_all-Define-FNM_EXTMATCH-if-not-already-like-und.patch
deleted file mode 100644
index 0245a89f3d..0000000000
--- a/meta/recipes-extended/ltp/ltp/0040-read_all-Define-FNM_EXTMATCH-if-not-already-like-und.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 23518508de307790231d16af307291f1b45e903a Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org>
3Date: Tue, 5 Jun 2018 15:36:30 -0500
4Subject: [PATCH] read_all: Define FNM_EXTMATCH if not already (like under
5 musl).
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10With musl, FNM_EXTMATCH is not defined:
11| read_all.c: In function 'read_test':
12| read_all.c:201:41: error: 'FNM_EXTMATCH' undeclared (first use in this function); did you mean 'FNM_NOMATCH'?
13| if (exclude && !fnmatch(exclude, path, FNM_EXTMATCH)) {
14| ^~~~~~~~~~~~
15| FNM_NOMATCH
16| read_all.c:201:41: note: each undeclared identifier is reported only once for each function it appears in
17| <builtin>: recipe for target 'read_all' failed
18| make[4]: *** [read_all] Error 1
19
20Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
21
22Upstream-Status: Pending
23---
24 testcases/kernel/fs/read_all/read_all.c | 4 ++++
25 1 file changed, 4 insertions(+)
26
27diff --git a/testcases/kernel/fs/read_all/read_all.c b/testcases/kernel/fs/read_all/read_all.c
28index a8e1611..e9ff47a 100644
29--- a/testcases/kernel/fs/read_all/read_all.c
30+++ b/testcases/kernel/fs/read_all/read_all.c
31@@ -59,6 +59,10 @@
32 #define MAX_PATH 4096
33 #define MAX_DISPLAY 40
34
35+#if !defined(FNM_EXTMATCH)
36+#define FNM_EXTMATCH 0
37+#endif
38+
39 struct queue {
40 sem_t sem;
41 int front;
42--
432.7.4
44
diff --git a/meta/recipes-extended/ltp/ltp_20180926.bb b/meta/recipes-extended/ltp/ltp_20180926.bb
index 622c1f42f7..500ca0063d 100644
--- a/meta/recipes-extended/ltp/ltp_20180926.bb
+++ b/meta/recipes-extended/ltp/ltp_20180926.bb
@@ -46,7 +46,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
46 file://0035-fix-test_proc_kill-hang.patch \ 46 file://0035-fix-test_proc_kill-hang.patch \
47 file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ 47 file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
48 file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \ 48 file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \
49 file://0040-read_all-Define-FNM_EXTMATCH-if-not-already-like-und.patch \
50 file://0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch \ 49 file://0001-syscalls-fcntl-make-OFD-command-use-fcntl64-syscall-.patch \
51 file://0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch \ 50 file://0001-sigwaitinfo01-recent-glibc-calls-syscall-directly.patch \
52 file://0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch \ 51 file://0001-netns_helper.sh-use-ping-6-when-ping6-is-not-avaliab.patch \