summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2015-09-29 05:54:15 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-01 07:43:33 +0100
commit7c96fcfb2ee3b8041a3359a6d11fd3eb60a8ce28 (patch)
tree9063032265e2d7a6129a2169fbc8045fab8bd61d /meta/recipes-connectivity
parentd9ce0957afa6ca3fe68f9be2a28821712d44a3ab (diff)
downloadpoky-7c96fcfb2ee3b8041a3359a6d11fd3eb60a8ce28.tar.gz
openssl: fix ptest failures
Remove dependencies for test targets. Otherwise, during ptest execution, "make" tries to rebuild those executables and fails there. [YOCTO #8059] (From OE-Core rev: 0efdd2236ec7f16f99847c6c372f372f81c56869) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/ptest_makefile_deps.patch248
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2d.bb1
2 files changed, 249 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/ptest_makefile_deps.patch b/meta/recipes-connectivity/openssl/openssl/ptest_makefile_deps.patch
new file mode 100644
index 0000000000..4202e61d1e
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/ptest_makefile_deps.patch
@@ -0,0 +1,248 @@
1Additional Makefile dependencies removal for test targets
2
3Removing the dependency check for test targets as these tests are
4causing a number of failures and "noise" during ptest execution.
5
6Upstream-Status: Inappropriate [config]
7
8Signed-off-by: Maxin B. John <maxin.john@intel.com>
9
10diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
11--- openssl-1.0.2d-orig/test/Makefile 2015-09-28 12:50:41.530022979 +0300
12+++ openssl-1.0.2d/test/Makefile 2015-09-28 12:57:45.930717240 +0300
13@@ -155,67 +155,67 @@
14 ( $(MAKE) $$i && echo "PASS: $$i" ) || echo "FAIL: $$i"; \
15 done)
16
17-test_evp: $(EVPTEST)$(EXE_EXT) evptests.txt
18+test_evp:
19 ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt
20
21-test_evp_extra: $(EVPEXTRATEST)$(EXE_EXT)
22+test_evp_extra:
23 ../util/shlib_wrap.sh ./$(EVPEXTRATEST)
24
25-test_des: $(DESTEST)$(EXE_EXT)
26+test_des:
27 ../util/shlib_wrap.sh ./$(DESTEST)
28
29-test_idea: $(IDEATEST)$(EXE_EXT)
30+test_idea:
31 ../util/shlib_wrap.sh ./$(IDEATEST)
32
33-test_sha: $(SHATEST)$(EXE_EXT) $(SHA1TEST)$(EXE_EXT) $(SHA256TEST)$(EXE_EXT) $(SHA512TEST)$(EXE_EXT)
34+test_sha:
35 ../util/shlib_wrap.sh ./$(SHATEST)
36 ../util/shlib_wrap.sh ./$(SHA1TEST)
37 ../util/shlib_wrap.sh ./$(SHA256TEST)
38 ../util/shlib_wrap.sh ./$(SHA512TEST)
39
40-test_mdc2: $(MDC2TEST)$(EXE_EXT)
41+test_mdc2:
42 ../util/shlib_wrap.sh ./$(MDC2TEST)
43
44-test_md5: $(MD5TEST)$(EXE_EXT)
45+test_md5:
46 ../util/shlib_wrap.sh ./$(MD5TEST)
47
48-test_md4: $(MD4TEST)$(EXE_EXT)
49+test_md4:
50 ../util/shlib_wrap.sh ./$(MD4TEST)
51
52-test_hmac: $(HMACTEST)$(EXE_EXT)
53+test_hmac:
54 ../util/shlib_wrap.sh ./$(HMACTEST)
55
56-test_wp: $(WPTEST)$(EXE_EXT)
57+test_wp:
58 ../util/shlib_wrap.sh ./$(WPTEST)
59
60-test_md2: $(MD2TEST)$(EXE_EXT)
61+test_md2:
62 ../util/shlib_wrap.sh ./$(MD2TEST)
63
64-test_rmd: $(RMDTEST)$(EXE_EXT)
65+test_rmd:
66 ../util/shlib_wrap.sh ./$(RMDTEST)
67
68-test_bf: $(BFTEST)$(EXE_EXT)
69+test_bf:
70 ../util/shlib_wrap.sh ./$(BFTEST)
71
72-test_cast: $(CASTTEST)$(EXE_EXT)
73+test_cast:
74 ../util/shlib_wrap.sh ./$(CASTTEST)
75
76-test_rc2: $(RC2TEST)$(EXE_EXT)
77+test_rc2:
78 ../util/shlib_wrap.sh ./$(RC2TEST)
79
80-test_rc4: $(RC4TEST)$(EXE_EXT)
81+test_rc4:
82 ../util/shlib_wrap.sh ./$(RC4TEST)
83
84-test_rc5: $(RC5TEST)$(EXE_EXT)
85+test_rc5:
86 ../util/shlib_wrap.sh ./$(RC5TEST)
87
88-test_rand: $(RANDTEST)$(EXE_EXT)
89+test_rand:
90 ../util/shlib_wrap.sh ./$(RANDTEST)
91
92-test_enc: ../apps/openssl$(EXE_EXT) testenc
93+test_enc:
94 @sh ./testenc
95
96-test_x509: ../apps/openssl$(EXE_EXT) tx509 testx509.pem v3-cert1.pem v3-cert2.pem
97+test_x509:
98 echo test normal x509v1 certificate
99 sh ./tx509 2>/dev/null
100 echo test first x509v3 certificate
101@@ -223,25 +223,25 @@
102 echo test second x509v3 certificate
103 sh ./tx509 v3-cert2.pem 2>/dev/null
104
105-test_rsa: ../apps/openssl$(EXE_EXT) trsa testrsa.pem
106+test_rsa:
107 @sh ./trsa 2>/dev/null
108 ../util/shlib_wrap.sh ./$(RSATEST)
109
110-test_crl: ../apps/openssl$(EXE_EXT) tcrl testcrl.pem
111+test_crl:
112 @sh ./tcrl 2>/dev/null
113
114-test_sid: ../apps/openssl$(EXE_EXT) tsid testsid.pem
115+test_sid:
116 @sh ./tsid 2>/dev/null
117
118-test_req: ../apps/openssl$(EXE_EXT) treq testreq.pem testreq2.pem
119+test_req:
120 @sh ./treq 2>/dev/null
121 @sh ./treq testreq2.pem 2>/dev/null
122
123-test_pkcs7: ../apps/openssl$(EXE_EXT) tpkcs7 tpkcs7d testp7.pem pkcs7-1.pem
124+test_pkcs7:
125 @sh ./tpkcs7 2>/dev/null
126 @sh ./tpkcs7d 2>/dev/null
127
128-test_bn: $(BNTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) bctest
129+test_bn:
130 @echo starting big number library test, could take a while...
131 @../util/shlib_wrap.sh ./$(BNTEST) >tmp.bntest
132 @echo quit >>tmp.bntest
133@@ -250,33 +250,33 @@
134 @echo 'test a^b%c implementations'
135 ../util/shlib_wrap.sh ./$(EXPTEST)
136
137-test_ec: $(ECTEST)$(EXE_EXT)
138+test_ec:
139 @echo 'test elliptic curves'
140 ../util/shlib_wrap.sh ./$(ECTEST)
141
142-test_ecdsa: $(ECDSATEST)$(EXE_EXT)
143+test_ecdsa:
144 @echo 'test ecdsa'
145 ../util/shlib_wrap.sh ./$(ECDSATEST)
146
147-test_ecdh: $(ECDHTEST)$(EXE_EXT)
148+test_ecdh:
149 @echo 'test ecdh'
150 ../util/shlib_wrap.sh ./$(ECDHTEST)
151
152-test_verify: ../apps/openssl$(EXE_EXT)
153+test_verify:
154 @echo "The following command should have some OK's and some failures"
155 @echo "There are definitly a few expired certificates"
156 ../util/shlib_wrap.sh ../apps/openssl verify -CApath ../certs/demo ../certs/demo/*.pem
157
158-test_dh: $(DHTEST)$(EXE_EXT)
159+test_dh:
160 @echo "Generate a set of DH parameters"
161 ../util/shlib_wrap.sh ./$(DHTEST)
162
163-test_dsa: $(DSATEST)$(EXE_EXT)
164+test_dsa:
165 @echo "Generate a set of DSA parameters"
166 ../util/shlib_wrap.sh ./$(DSATEST)
167 ../util/shlib_wrap.sh ./$(DSATEST) -app2_1
168
169-test_gen testreq.pem: ../apps/openssl$(EXE_EXT) testgen test.cnf
170+test_gen testreq.pem:
171 @echo "Generate and verify a certificate request"
172 @sh ./testgen
173
174@@ -288,13 +288,11 @@
175 @cat certCA.ss certU.ss > intP1.ss
176 @cat certCA.ss certU.ss certP1.ss > intP2.ss
177
178-test_engine: $(ENGINETEST)$(EXE_EXT)
179+test_engine:
180 @echo "Manipulate the ENGINE structures"
181 ../util/shlib_wrap.sh ./$(ENGINETEST)
182
183-test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
184- intP1.ss intP2.ss $(SSLTEST)$(EXE_EXT) testssl testsslproxy \
185- ../apps/server2.pem serverinfo.pem
186+test_ssl:
187 @echo "test SSL protocol"
188 @if [ -n "$(FIPSCANLIB)" ]; then \
189 sh ./testfipsssl keyU.ss certU.ss certCA.ss; \
190@@ -304,7 +302,7 @@
191 @sh ./testsslproxy keyP1.ss certP1.ss intP1.ss
192 @sh ./testsslproxy keyP2.ss certP2.ss intP2.ss
193
194-test_ca: ../apps/openssl$(EXE_EXT) testca CAss.cnf Uss.cnf
195+test_ca:
196 @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
197 echo "skipping CA.sh test -- requires RSA"; \
198 else \
199@@ -312,11 +310,11 @@
200 sh ./testca; \
201 fi
202
203-test_aes: #$(AESTEST)
204+test_aes:
205 # @echo "test Rijndael"
206 # ../util/shlib_wrap.sh ./$(AESTEST)
207
208-test_tsa: ../apps/openssl$(EXE_EXT) testtsa CAtsa.cnf ../util/shlib_wrap.sh
209+test_tsa:
210 @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
211 echo "skipping testtsa test -- requires RSA"; \
212 else \
213@@ -331,7 +329,7 @@
214 @echo "Test JPAKE"
215 ../util/shlib_wrap.sh ./$(JPAKETEST)
216
217-test_cms: ../apps/openssl$(EXE_EXT) cms-test.pl smcont.txt
218+test_cms:
219 @echo "CMS consistency test"
220 $(PERL) cms-test.pl
221
222@@ -339,22 +337,22 @@
223 @echo "Test SRP"
224 ../util/shlib_wrap.sh ./srptest
225
226-test_ocsp: ../apps/openssl$(EXE_EXT) tocsp
227+test_ocsp:
228 @echo "Test OCSP"
229 @sh ./tocsp
230
231-test_v3name: $(V3NAMETEST)$(EXE_EXT)
232+test_v3name:
233 @echo "Test X509v3_check_*"
234 ../util/shlib_wrap.sh ./$(V3NAMETEST)
235
236 test_heartbeat:
237 ../util/shlib_wrap.sh ./$(HEARTBEATTEST)
238
239-test_constant_time: $(CONSTTIMETEST)$(EXE_EXT)
240+test_constant_time:
241 @echo "Test constant time utilites"
242 ../util/shlib_wrap.sh ./$(CONSTTIMETEST)
243
244-test_verify_extra: $(VERIFYEXTRATEST)$(EXE_EXT)
245+test_verify_extra:
246 @echo $(START) $@
247 ../util/shlib_wrap.sh ./$(VERIFYEXTRATEST)
248
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2d.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2d.bb
index 32d8dce269..fd568414fa 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2d.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2d.bb
@@ -36,6 +36,7 @@ SRC_URI += "file://configure-targets.patch \
36 file://run-ptest \ 36 file://run-ptest \
37 file://crypto_use_bigint_in_x86-64_perl.patch \ 37 file://crypto_use_bigint_in_x86-64_perl.patch \
38 file://openssl-1.0.2a-x32-asm.patch \ 38 file://openssl-1.0.2a-x32-asm.patch \
39 file://ptest_makefile_deps.patch \
39 " 40 "
40 41
41SRC_URI[md5sum] = "38dd619b2e77cbac69b99f52a053d25a" 42SRC_URI[md5sum] = "38dd619b2e77cbac69b99f52a053d25a"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-10 13:28:51 +0000