1 files changed, 55 insertions, 42 deletions
diff --git a/recipes-connectivity/openssl/openssl-qoriq/ptest_makefile_deps.patch b/recipes-connectivity/openssl/openssl-qoriq/ptest_makefile_deps.patch
index 4202e61d..fc93572e 100644
--- a/recipes-connectivity/openssl/openssl-qoriq/ptest_makefile_deps.patch
+++ b/recipes-connectivity/openssl/openssl-qoriq/ptest_makefile_deps.patch
@@ -1,4 +1,7 @@
-Additional Makefile dependencies removal for test targets
+From e754d694815fcd68231ea701826ca7f5a8030b8b Mon Sep 17 00:00:00 2001
+From: Chunrong Guo <chunrong.guo@nxp.com>
+Date: Tue, 20 Mar 2018 15:23:19 +0800
+Subject: [PATCH] Additional Makefile dependencies removal for test targets
 Removing the dependency check for test targets as these tests are
 causing a number of failures and "noise" during ptest execution.
@@ -7,10 +10,17 @@ Upstream-Status: Inappropriate [config]
 Signed-off-by: Maxin B. John <maxin.john@intel.com>
-diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
+Refreshed for 1.0.2l
--- openssl-1.0.2d-orig/test/Makefile   2015-09-28 12:50:41.530022979 +0300
+Signed-off-by:  Chunrong Guo <chunrong.guo@nxp.com>
-+++ openssl-1.0.2d/test/Makefile        2015-09-28 12:57:45.930717240 +0300
+---
-@@ -155,67 +155,67 @@
+ test/Makefile | 88 +++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 43 insertions(+), 45 deletions(-)
+diff --git a/test/Makefile b/test/Makefile
+index 341d652..e3d79bd 100644
+--- a/test/Makefile
+++ b/test/Makefile
+@@ -165,67 +165,67 @@ alltests:
        ( $(MAKE) $$i && echo "PASS: $$i" ) || echo "FAIL: $$i"; \
        done)
 
@@ -31,18 +41,18 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
        ../util/shlib_wrap.sh ./$(IDEATEST)
 
 -test_sha: $(SHATEST)$(EXE_EXT) $(SHA1TEST)$(EXE_EXT) $(SHA256TEST)$(EXE_EXT) $(SHA512TEST)$(EXE_EXT)
-+test_sha:
+test_sha: 
        ../util/shlib_wrap.sh ./$(SHATEST)
        ../util/shlib_wrap.sh ./$(SHA1TEST)
        ../util/shlib_wrap.sh ./$(SHA256TEST)
        ../util/shlib_wrap.sh ./$(SHA512TEST)
 
 -test_mdc2: $(MDC2TEST)$(EXE_EXT)
-+test_mdc2:
+test_mdc2: 
        ../util/shlib_wrap.sh ./$(MDC2TEST)
 
 -test_md5: $(MD5TEST)$(EXE_EXT)
-+test_md5:
+test_md5: 
        ../util/shlib_wrap.sh ./$(MD5TEST)
 
 -test_md4: $(MD4TEST)$(EXE_EXT)
@@ -50,43 +60,43 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
        ../util/shlib_wrap.sh ./$(MD4TEST)
 
 -test_hmac: $(HMACTEST)$(EXE_EXT)
-+test_hmac:
+test_hmac: 
        ../util/shlib_wrap.sh ./$(HMACTEST)
 
 -test_wp: $(WPTEST)$(EXE_EXT)
-+test_wp:
+test_wp: 
        ../util/shlib_wrap.sh ./$(WPTEST)
 
 -test_md2: $(MD2TEST)$(EXE_EXT)
-+test_md2:
+test_md2: 
        ../util/shlib_wrap.sh ./$(MD2TEST)
 
 -test_rmd: $(RMDTEST)$(EXE_EXT)
-+test_rmd:
+test_rmd: 
        ../util/shlib_wrap.sh ./$(RMDTEST)
 
 -test_bf: $(BFTEST)$(EXE_EXT)
-+test_bf:
+test_bf: 
        ../util/shlib_wrap.sh ./$(BFTEST)
 
 -test_cast: $(CASTTEST)$(EXE_EXT)
-+test_cast:
+test_cast: 
        ../util/shlib_wrap.sh ./$(CASTTEST)
 
 -test_rc2: $(RC2TEST)$(EXE_EXT)
-+test_rc2:
+test_rc2: 
        ../util/shlib_wrap.sh ./$(RC2TEST)
 
 -test_rc4: $(RC4TEST)$(EXE_EXT)
-+test_rc4:
+test_rc4: 
        ../util/shlib_wrap.sh ./$(RC4TEST)
 
 -test_rc5: $(RC5TEST)$(EXE_EXT)
-+test_rc5:
+test_rc5: 
        ../util/shlib_wrap.sh ./$(RC5TEST)
 
 -test_rand: $(RANDTEST)$(EXE_EXT)
-+test_rand:
+test_rand: 
        ../util/shlib_wrap.sh ./$(RANDTEST)
 
 -test_enc: ../apps/openssl$(EXE_EXT) testenc
@@ -98,7 +108,7 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
        echo test normal x509v1 certificate
        sh ./tx509 2>/dev/null
        echo test first x509v3 certificate
-@@ -223,25 +223,25 @@
+@@ -233,25 +233,25 @@ test_x509: ../apps/openssl$(EXE_EXT) tx509 testx509.pem v3-cert1.pem v3-cert2.pe
        echo test second x509v3 certificate
        sh ./tx509 v3-cert2.pem 2>/dev/null
 
@@ -112,11 +122,11 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
        @sh ./tcrl 2>/dev/null
 
 -test_sid: ../apps/openssl$(EXE_EXT) tsid testsid.pem
-+test_sid:
+test_sid: 
        @sh ./tsid 2>/dev/null
 
 -test_req: ../apps/openssl$(EXE_EXT) treq testreq.pem testreq2.pem
-+test_req:
+test_req: 
        @sh ./treq 2>/dev/null
        @sh ./treq testreq2.pem 2>/dev/null
 
@@ -126,26 +136,26 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
        @sh ./tpkcs7d 2>/dev/null
 
 -test_bn: $(BNTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) bctest
-+test_bn:
+test_bn: 
        @echo starting big number library test, could take a while...
        @../util/shlib_wrap.sh ./$(BNTEST) >tmp.bntest
        @echo quit >>tmp.bntest
-@@ -250,33 +250,33 @@
+@@ -260,33 +260,33 @@ test_bn: $(BNTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) bctest
        @echo 'test a^b%c implementations'
        ../util/shlib_wrap.sh ./$(EXPTEST)
 
 -test_ec: $(ECTEST)$(EXE_EXT)
-+test_ec:
+test_ec: 
        @echo 'test elliptic curves'
        ../util/shlib_wrap.sh ./$(ECTEST)
 
 -test_ecdsa: $(ECDSATEST)$(EXE_EXT)
-+test_ecdsa:
+test_ecdsa: 
        @echo 'test ecdsa'
        ../util/shlib_wrap.sh ./$(ECDSATEST)
 
 -test_ecdh: $(ECDHTEST)$(EXE_EXT)
-+test_ecdh:
+test_ecdh: 
        @echo 'test ecdh'
        ../util/shlib_wrap.sh ./$(ECDHTEST)
 
@@ -156,7 +166,7 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
        ../util/shlib_wrap.sh ../apps/openssl verify -CApath ../certs/demo ../certs/demo/*.pem
 
 -test_dh: $(DHTEST)$(EXE_EXT)
-+test_dh:
+test_dh: 
        @echo "Generate a set of DH parameters"
        ../util/shlib_wrap.sh ./$(DHTEST)
 
@@ -167,59 +177,59 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
        ../util/shlib_wrap.sh ./$(DSATEST) -app2_1
 
 -test_gen testreq.pem: ../apps/openssl$(EXE_EXT) testgen test.cnf
-+test_gen testreq.pem:
+test_gen testreq.pem: 
        @echo "Generate and verify a certificate request"
        @sh ./testgen
 
-@@ -288,13 +288,11 @@
+@@ -298,13 +298,11 @@ test_ss keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
        @cat certCA.ss certU.ss > intP1.ss
        @cat certCA.ss certU.ss certP1.ss > intP2.ss
 
 -test_engine:  $(ENGINETEST)$(EXE_EXT)
-+test_engine:
+test_engine:  
        @echo "Manipulate the ENGINE structures"
        ../util/shlib_wrap.sh ./$(ENGINETEST)
 
 -test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
 -               intP1.ss intP2.ss $(SSLTEST)$(EXE_EXT) testssl testsslproxy \
 -               ../apps/server2.pem serverinfo.pem
-+test_ssl:
+test_ssl: 
        @echo "test SSL protocol"
        @if [ -n "$(FIPSCANLIB)" ]; then \
          sh ./testfipsssl keyU.ss certU.ss certCA.ss; \
-@@ -304,7 +302,7 @@
+@@ -315,7 +313,7 @@ test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
        @sh ./testsslproxy keyP1.ss certP1.ss intP1.ss
        @sh ./testsslproxy keyP2.ss certP2.ss intP2.ss
 
 -test_ca: ../apps/openssl$(EXE_EXT) testca CAss.cnf Uss.cnf
-+test_ca:
+test_ca: 
        @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
          echo "skipping CA.sh test -- requires RSA"; \
        else \
-@@ -312,11 +310,11 @@
+@@ -323,11 +321,11 @@ test_ca: ../apps/openssl$(EXE_EXT) testca CAss.cnf Uss.cnf
          sh ./testca; \
        fi
 
 -test_aes: #$(AESTEST)
-+test_aes:
+test_aes: 
 #      @echo "test Rijndael"
 #      ../util/shlib_wrap.sh ./$(AESTEST)
 
 -test_tsa: ../apps/openssl$(EXE_EXT) testtsa CAtsa.cnf ../util/shlib_wrap.sh
-+test_tsa:
+test_tsa: 
        @if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then \
          echo "skipping testtsa test -- requires RSA"; \
        else \
-@@ -331,7 +329,7 @@
+@@ -342,7 +340,7 @@ test_jpake:
        @echo "Test JPAKE"
        ../util/shlib_wrap.sh ./$(JPAKETEST)
 
 -test_cms: ../apps/openssl$(EXE_EXT) cms-test.pl smcont.txt
-+test_cms:
+test_cms: 
        @echo "CMS consistency test"
        $(PERL) cms-test.pl
 
-@@ -339,22 +337,22 @@
+@@ -350,22 +348,22 @@ test_srp:
        @echo "Test SRP"
        ../util/shlib_wrap.sh ./srptest
 
@@ -229,7 +239,7 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
        @sh ./tocsp
 
 -test_v3name: $(V3NAMETEST)$(EXE_EXT)
-+test_v3name:
+test_v3name: 
        @echo "Test X509v3_check_*"
        ../util/shlib_wrap.sh ./$(V3NAMETEST)
 
@@ -237,12 +247,15 @@ diff -Naur openssl-1.0.2d-orig/test/Makefile openssl-1.0.2d/test/Makefile
        ../util/shlib_wrap.sh ./$(HEARTBEATTEST)
 
 -test_constant_time: $(CONSTTIMETEST)$(EXE_EXT)
-+test_constant_time:
+test_constant_time: 
        @echo "Test constant time utilites"
        ../util/shlib_wrap.sh ./$(CONSTTIMETEST)
 
 -test_verify_extra: $(VERIFYEXTRATEST)$(EXE_EXT)
-+test_verify_extra:
+test_verify_extra: 
        @echo $(START) $@
        ../util/shlib_wrap.sh ./$(VERIFYEXTRATEST)
 
+-- 
+2.7.4