diff options
| -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 6c86588c83..b839c00dde 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 \ " |