diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-06-09 16:37:19 +0100 |
|---|---|---|
| committer |   Andreas Oberritter <obi@opendreambox.org> | 2015-02-23 17:15:39 +0100 |
| commit | 383735fbdb5baf0d9978a869616e22c3bb6609b2 (patch) | |
| tree | be5ff7d94a5696053df8c5882b05f4341b7f382e /meta | |
| parent | 15154e2d23efe12a9543c0ac742402bc2adbb13c (diff) | |
| download | openembedded-core-contrib-383735fbdb5baf0d9978a869616e22c3bb6609b2.tar.gz | |
openssl: fix ptests
Add some missing dependencies and fix the Makefile in order to get most
of the ptest tests working (specifically test_bn, test_verify, test_cms,
test_srp and test_heartbeat). test_verify still fails for unknown
reasons (perhaps some of the now expired certificates weren't meant to
have expired as far as the test is concerned?) but at least it has the
certificates to run now.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
(cherry picked from commit c679ec81c19dd2b5e366b713801785ce0ba5b49a)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl/ptest-deps.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.1h.bb | 1 |
3 files changed, 33 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index 6ef7e3e368..a7dbcefa91 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -47,7 +47,7 @@ FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}" FILES_openssl-conf = "${libdir}/ssl/openssl.cnf" CONFFILES_openssl-conf = "${libdir}/ssl/openssl.cnf" RRECOMMENDS_libcrypto += "openssl-conf" -RDEPENDS_${PN}-ptest += "${PN}-misc make" +RDEPENDS_${PN}-ptest += "${PN}-misc make perl perl-module-filehandle bc" do_configure_prepend_darwin () { sed -i -e '/version-script=openssl\.ld/d' Configure @@ -176,6 +176,7 @@ do_install () { do_install_ptest () { cp -r Makefile test ${D}${PTEST_PATH} + cp -r certs ${D}${PTEST_PATH} mkdir -p ${D}${PTEST_PATH}/apps ln -sf /usr/lib/ssl/misc/CA.sh ${D}${PTEST_PATH}/apps ln -sf /usr/lib/ssl/openssl.cnf ${D}${PTEST_PATH}/apps diff --git a/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch b/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch new file mode 100644 index 0000000000..527e10c53b --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/ptest-deps.patch @@ -0,0 +1,30 @@ +Remove Makefile dependencies for test targets + +These are probably here because the executables aren't always built for +other platforms (e.g. Windows); however we can safely assume they'll +always be there. None of the other test targets have such dependencies +and if we don't remove them, make tries to rebuild the executables and +fails during run-ptest. + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +diff --git a/test/Makefile b/test/Makefile +index e6fcfb4..5ae043b 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -322,11 +322,11 @@ test_cms: + @echo "CMS consistency test" + $(PERL) cms-test.pl + +-test_srp: $(SRPTEST)$(EXE_EXT) ++test_srp: + @echo "Test SRP" + ../util/shlib_wrap.sh ./srptest + +-test_heartbeat: $(HEARTBEATTEST)$(EXE_EXT) ++test_heartbeat: + ../util/shlib_wrap.sh ./$(HEARTBEATTEST) + + lint: diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1h.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1h.bb index ebb1029ef4..ddaaba8836 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.1h.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.1h.bb @@ -35,6 +35,7 @@ SRC_URI += "file://configure-targets.patch \ file://openssl-fix-des.pod-error.patch \ file://Makefiles-ptest.patch \ file://heartbeat-test-private-api.patch \ + file://ptest-deps.patch \ file://run-ptest \ " |