summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-09 20:55:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-11 06:27:01 -0700
commit24229c47693868a0a3cba33191f67569f827adec (patch)
treeefd0cb73406c87bdabaeea59eebc408b97af8094
parent8467b0602b897b49c868e586d520bb9355d8c542 (diff)
downloadpoky-24229c47693868a0a3cba33191f67569f827adec.tar.gz
ltp: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 040b4bb125e28750e089f631c1debb088bb3bc9f) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch78
-rw-r--r--meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch29
2 files changed, 51 insertions, 56 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch b/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch
index cf744639c2..84ab37ea39 100644
--- a/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch
+++ b/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch
@@ -22,10 +22,10 @@ Upstream-Status: Pending
22 testcases/realtime/stress/pi-tests/Makefile | 5 +++++ 22 testcases/realtime/stress/pi-tests/Makefile | 5 +++++
23 8 files changed, 35 insertions(+), 2 deletions(-) 23 8 files changed, 35 insertions(+), 2 deletions(-)
24 24
25diff --git a/Makefile b/Makefile 25Index: git/Makefile
26index 297f8e7..906b280 100644 26===================================================================
27--- a/Makefile 27--- git.orig/Makefile
28+++ b/Makefile 28+++ git/Makefile
29@@ -49,6 +49,11 @@ SKIP_IDCHECK ?= 0 29@@ -49,6 +49,11 @@ SKIP_IDCHECK ?= 0
30 UCLINUX ?= 0 30 UCLINUX ?= 0
31 export UCLINUX 31 export UCLINUX
@@ -38,11 +38,11 @@ index 297f8e7..906b280 100644
38 # CLEAN_TARGETS: Targets which exist solely in clean. 38 # CLEAN_TARGETS: Targets which exist solely in clean.
39 # COMMON_TARGETS: Targets which exist in all, clean, and install. 39 # COMMON_TARGETS: Targets which exist in all, clean, and install.
40 # INSTALL_TARGETS: Targets which exist in clean and install (contains 40 # INSTALL_TARGETS: Targets which exist in clean and install (contains
41diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile 41Index: git/testcases/kernel/Makefile
42index 50a12fa..4f1987f 100644 42===================================================================
43--- a/testcases/kernel/Makefile 43--- git.orig/testcases/kernel/Makefile
44+++ b/testcases/kernel/Makefile 44+++ git/testcases/kernel/Makefile
45@@ -47,13 +47,16 @@ SUBDIRS += connectors \ 45@@ -48,13 +48,16 @@ SUBDIRS += connectors \
46 logging \ 46 logging \
47 mem \ 47 mem \
48 numa \ 48 numa \
@@ -60,10 +60,10 @@ index 50a12fa..4f1987f 100644
60 ifeq ($(WITH_POWER_MANAGEMENT_TESTSUITE),yes) 60 ifeq ($(WITH_POWER_MANAGEMENT_TESTSUITE),yes)
61 SUBDIRS += power_management 61 SUBDIRS += power_management
62 endif 62 endif
63diff --git a/testcases/kernel/sched/Makefile b/testcases/kernel/sched/Makefile 63Index: git/testcases/kernel/sched/Makefile
64index 6245ed0..aa4eb7f 100644 64===================================================================
65--- a/testcases/kernel/sched/Makefile 65--- git.orig/testcases/kernel/sched/Makefile
66+++ b/testcases/kernel/sched/Makefile 66+++ git/testcases/kernel/sched/Makefile
67@@ -23,5 +23,7 @@ 67@@ -23,5 +23,7 @@
68 top_srcdir ?= ../../.. 68 top_srcdir ?= ../../..
69 69
@@ -73,11 +73,11 @@ index 6245ed0..aa4eb7f 100644
73+ FILTER_OUT_DIRS += process_stress 73+ FILTER_OUT_DIRS += process_stress
74+endif 74+endif
75 include $(top_srcdir)/include/mk/generic_trunk_target.mk 75 include $(top_srcdir)/include/mk/generic_trunk_target.mk
76diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile 76Index: git/testcases/kernel/syscalls/Makefile
77index 8acb395..b749126 100644 77===================================================================
78--- a/testcases/kernel/syscalls/Makefile 78--- git.orig/testcases/kernel/syscalls/Makefile
79+++ b/testcases/kernel/syscalls/Makefile 79+++ git/testcases/kernel/syscalls/Makefile
80@@ -28,5 +28,10 @@ ifeq ($(UCLINUX),1) 80@@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1)
81 FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ 81 FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \
82 mincore mprotect nftw profil remap_file_pages sbrk 82 mincore mprotect nftw profil remap_file_pages sbrk
83 endif 83 endif
@@ -87,12 +87,13 @@ index 8acb395..b749126 100644
87+ ustat 87+ ustat
88+endif 88+endif
89 89
90 include $(top_srcdir)/include/mk/generic_trunk_target.mk 90 ifeq ($(UCLIBC),1)
91diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile 91 FILTER_OUT_DIRS += profil
92index 8bc78c2..c36cf50 100644 92Index: git/testcases/network/nfsv4/acl/Makefile
93--- a/testcases/network/nfsv4/acl/Makefile 93===================================================================
94+++ b/testcases/network/nfsv4/acl/Makefile 94--- git.orig/testcases/network/nfsv4/acl/Makefile
95@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk 95+++ git/testcases/network/nfsv4/acl/Makefile
96@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre
96 97
97 LDLIBS += $(ACL_LIBS) 98 LDLIBS += $(ACL_LIBS)
98 99
@@ -101,10 +102,10 @@ index 8bc78c2..c36cf50 100644
101+endif 102+endif
102+ 103+
103 include $(top_srcdir)/include/mk/generic_leaf_target.mk 104 include $(top_srcdir)/include/mk/generic_leaf_target.mk
104diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile 105Index: git/testcases/network/rpc/basic_tests/Makefile
105index 3160813..9bdf5d0 100644 106===================================================================
106--- a/testcases/network/rpc/basic_tests/Makefile 107--- git.orig/testcases/network/rpc/basic_tests/Makefile
107+++ b/testcases/network/rpc/basic_tests/Makefile 108+++ git/testcases/network/rpc/basic_tests/Makefile
108@@ -23,4 +23,9 @@ 109@@ -23,4 +23,9 @@
109 top_srcdir ?= ../../../.. 110 top_srcdir ?= ../../../..
110 111
@@ -115,11 +116,11 @@ index 3160813..9bdf5d0 100644
115+endif 116+endif
116+ 117+
117 include $(top_srcdir)/include/mk/generic_trunk_target.mk 118 include $(top_srcdir)/include/mk/generic_trunk_target.mk
118diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile 119Index: git/testcases/realtime/func/pi-tests/Makefile
119index 7a7a57a..5808866 100644 120===================================================================
120--- a/testcases/realtime/func/pi-tests/Makefile 121--- git.orig/testcases/realtime/func/pi-tests/Makefile
121+++ b/testcases/realtime/func/pi-tests/Makefile 122+++ git/testcases/realtime/func/pi-tests/Makefile
122@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk 123@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre
123 include $(abs_srcdir)/../../config.mk 124 include $(abs_srcdir)/../../config.mk
124 125
125 MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex 126 MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex
@@ -129,10 +130,10 @@ index 7a7a57a..5808866 100644
129+ 130+
130 131
131 include $(top_srcdir)/include/mk/generic_leaf_target.mk 132 include $(top_srcdir)/include/mk/generic_leaf_target.mk
132diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile 133Index: git/testcases/realtime/stress/pi-tests/Makefile
133index 5edc3b4..aa5987a 100644 134===================================================================
134--- a/testcases/realtime/stress/pi-tests/Makefile 135--- git.orig/testcases/realtime/stress/pi-tests/Makefile
135+++ b/testcases/realtime/stress/pi-tests/Makefile 136+++ git/testcases/realtime/stress/pi-tests/Makefile
136@@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. 137@@ -24,4 +24,9 @@ top_srcdir ?= ../../../..
137 138
138 include $(top_srcdir)/include/mk/env_pre.mk 139 include $(top_srcdir)/include/mk/env_pre.mk
@@ -143,6 +144,3 @@ index 5edc3b4..aa5987a 100644
143+endif 144+endif
144+ 145+
145 include $(top_srcdir)/include/mk/generic_leaf_target.mk 146 include $(top_srcdir)/include/mk/generic_leaf_target.mk
146--
1472.7.0
148
diff --git a/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch b/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch
index 3e79c9f295..462976da42 100644
--- a/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch
+++ b/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch
@@ -18,10 +18,10 @@ Upstream-Status: Pending
18 testcases/kernel/syscalls/mremap/mremap03.c | 2 ++ 18 testcases/kernel/syscalls/mremap/mremap03.c | 2 ++
19 3 files changed, 7 insertions(+), 1 deletion(-) 19 3 files changed, 7 insertions(+), 1 deletion(-)
20 20
21diff --git a/testcases/kernel/syscalls/mremap/mremap01.c b/testcases/kernel/syscalls/mremap/mremap01.c 21Index: git/testcases/kernel/syscalls/mremap/mremap01.c
22index d63d1e4..24ca174 100644 22===================================================================
23--- a/testcases/kernel/syscalls/mremap/mremap01.c 23--- git.orig/testcases/kernel/syscalls/mremap/mremap01.c
24+++ b/testcases/kernel/syscalls/mremap/mremap01.c 24+++ git/testcases/kernel/syscalls/mremap/mremap01.c
25@@ -76,10 +76,12 @@ 25@@ -76,10 +76,12 @@
26 */ 26 */
27 #include <unistd.h> 27 #include <unistd.h>
@@ -35,11 +35,11 @@ index d63d1e4..24ca174 100644
35+#undef _GNU_SOURCE 35+#undef _GNU_SOURCE
36 36
37 #include "test.h" 37 #include "test.h"
38 38 #include "safe_macros.h"
39diff --git a/testcases/kernel/syscalls/mremap/mremap02.c b/testcases/kernel/syscalls/mremap/mremap02.c 39Index: git/testcases/kernel/syscalls/mremap/mremap02.c
40index 5a51b9a..a530a6b 100644 40===================================================================
41--- a/testcases/kernel/syscalls/mremap/mremap02.c 41--- git.orig/testcases/kernel/syscalls/mremap/mremap02.c
42+++ b/testcases/kernel/syscalls/mremap/mremap02.c 42+++ git/testcases/kernel/syscalls/mremap/mremap02.c
43@@ -75,9 +75,11 @@ 43@@ -75,9 +75,11 @@
44 #include <errno.h> 44 #include <errno.h>
45 #include <unistd.h> 45 #include <unistd.h>
@@ -52,10 +52,10 @@ index 5a51b9a..a530a6b 100644
52 52
53 #include "test.h" 53 #include "test.h"
54 54
55diff --git a/testcases/kernel/syscalls/mremap/mremap03.c b/testcases/kernel/syscalls/mremap/mremap03.c 55Index: git/testcases/kernel/syscalls/mremap/mremap03.c
56index 12e3829..9b39f8b 100644 56===================================================================
57--- a/testcases/kernel/syscalls/mremap/mremap03.c 57--- git.orig/testcases/kernel/syscalls/mremap/mremap03.c
58+++ b/testcases/kernel/syscalls/mremap/mremap03.c 58+++ git/testcases/kernel/syscalls/mremap/mremap03.c
59@@ -76,9 +76,11 @@ 59@@ -76,9 +76,11 @@
60 #include <errno.h> 60 #include <errno.h>
61 #include <unistd.h> 61 #include <unistd.h>
@@ -68,6 +68,3 @@ index 12e3829..9b39f8b 100644
68 68
69 #include "test.h" 69 #include "test.h"
70 70
71--
722.7.0
73