summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl.inc
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-06-09 16:37:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-10 17:11:55 +0100
commit23d8d2b62892fb523e942c7ca4dbdcae414b6998 (patch)
tree16748013b6a10b3aa2c75c41e8df5020028cff87 /meta/recipes-connectivity/openssl/openssl.inc
parent3255d58577234b130768d6d57619cc76b6afcc6a (diff)
downloadpoky-23d8d2b62892fb523e942c7ca4dbdcae414b6998.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. (From OE-Core rev: c679ec81c19dd2b5e366b713801785ce0ba5b49a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl.inc')
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc3
1 files changed, 2 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}"
47FILES_openssl-conf = "${libdir}/ssl/openssl.cnf" 47FILES_openssl-conf = "${libdir}/ssl/openssl.cnf"
48CONFFILES_openssl-conf = "${libdir}/ssl/openssl.cnf" 48CONFFILES_openssl-conf = "${libdir}/ssl/openssl.cnf"
49RRECOMMENDS_libcrypto += "openssl-conf" 49RRECOMMENDS_libcrypto += "openssl-conf"
50RDEPENDS_${PN}-ptest += "${PN}-misc make" 50RDEPENDS_${PN}-ptest += "${PN}-misc make perl perl-module-filehandle bc"
51 51
52do_configure_prepend_darwin () { 52do_configure_prepend_darwin () {
53 sed -i -e '/version-script=openssl\.ld/d' Configure 53 sed -i -e '/version-script=openssl\.ld/d' Configure
@@ -176,6 +176,7 @@ do_install () {
176 176
177do_install_ptest () { 177do_install_ptest () {
178 cp -r Makefile test ${D}${PTEST_PATH} 178 cp -r Makefile test ${D}${PTEST_PATH}
179 cp -r certs ${D}${PTEST_PATH}
179 mkdir -p ${D}${PTEST_PATH}/apps 180 mkdir -p ${D}${PTEST_PATH}/apps
180 ln -sf /usr/lib/ssl/misc/CA.sh ${D}${PTEST_PATH}/apps 181 ln -sf /usr/lib/ssl/misc/CA.sh ${D}${PTEST_PATH}/apps
181 ln -sf /usr/lib/ssl/openssl.cnf ${D}${PTEST_PATH}/apps 182 ln -sf /usr/lib/ssl/openssl.cnf ${D}${PTEST_PATH}/apps