1 files changed, 45 insertions, 27 deletions

diff --git a/recipes-connectivity/openssl/openssl-qoriq.inc b/recipes-connectivity/openssl/openssl-qoriq.inc
index 965291c5..612ec096 100644
--- a/recipes-connectivity/openssl/openssl-qoriq.inc
+++ b/recipes-connectivity/openssl/openssl-qoriq.inc
@@ -28,7 +28,6 @@ S = "${WORKDIR}/openssl-${PV}"
 
 PACKAGECONFIG[perl] = ",,,"
 
-AR_append = " r"
 TERMIO_libc-musl = "-DTERMIOS"
 TERMIO ?= "-DTERMIO"
 # Avoid binaries being marked as requiring an executable stack since it 
@@ -39,17 +38,17 @@ CFLAG = "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_END
 export DIRS = "crypto ssl apps"
 export EX_LIBS = "-lgcc -ldl"
 export AS = "${CC} -c"
-EXTRA_OEMAKE = "-e MAKEFLAGS="
 
-inherit pkgconfig siteinfo multilib_header ptest
+inherit pkgconfig siteinfo multilib_header ptest relative_symlinks
 
 PACKAGES =+ "libcrypto libssl ${PN}-misc ${PN}-conf"
 FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
 FILES_libssl = "${libdir}/libssl${SOLIBS}"
 FILES_${PN} =+ " ${libdir}/ssl/*"
-FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash"
-RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}"
-FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}"
+FILES_${PN}-misc = "${libdir}/ssl/misc"
+RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}"
+
+PROVIDES += "openssl10"
 
 # Add the openssl.cnf file to the openssl-conf package.  Make the libcrypto
 # package RRECOMMENDS on this package.  This will enable the configuration
@@ -119,15 +118,24 @@ do_configure () {
         linux-gnu64-x86_64)
                 target=linux-x86_64
                 ;;
-        linux-mips)
-                target=debian-mips
+        linux-gnun32-mips*el)
+                target=debian-mipsn32el
+                ;;
+        linux-gnun32-mips*)
+                target=debian-mipsn32
                 ;;
-        linux-mipsel)
+        linux-mips*64*el)
+                target=debian-mips64el
+                ;;
+        linux-mips*64*)
+                target=debian-mips64
+                ;;
+        linux-mips*el)
                 target=debian-mipsel
                 ;;
-        linux-*-mips64 | linux-mips64)
-               target=linux-mips
-                ;;
+        linux-mips*)
+                target=debian-mips
+                ;;
         linux-microblaze*|linux-nios2*)
                 target=linux-generic32
                 ;;
@@ -181,26 +189,18 @@ do_install () {
         oe_libinstall -so libcrypto ${D}${libdir}
         oe_libinstall -so libssl ${D}${libdir}
 
-        # Moving libcrypto to /lib
-        if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
-                mkdir -p ${D}/${base_libdir}/
-                mv ${D}${libdir}/libcrypto* ${D}${base_libdir}/
-                sed -i s#libdir=\$\{exec_prefix\}\/lib#libdir=${base_libdir}# ${D}/${libdir}/pkgconfig/libcrypto.pc
-        fi
-
         install -d ${D}${includedir}
         cp --dereference -R include/openssl ${D}${includedir}
 
+        install -Dm 0755 ${WORKDIR}/openssl-c_rehash.sh ${D}${bindir}/c_rehash
+        sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash
+
         oe_multilib_header openssl/opensslconf.h
-        if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then
-                install -m 0755 ${S}/tools/c_rehash ${D}${bindir}
-                sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash
+        if [ "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" ]; then
                 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
                 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget
-        # The c_rehash utility isn't installed by the normal installation process.
-        else
-                rm -f ${D}${bindir}/c_rehash
-                rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget
+        else
+                rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget
         fi
 
         # Create SSL structure
@@ -217,9 +217,13 @@ do_install () {
 
 do_install_ptest () {
         cp -r -L Makefile.org Makefile test ${D}${PTEST_PATH}
+
+        # Replace the path to native perl with the path to target perl
+        sed -i 's,^PERL=.*,PERL=${bindir}/perl,' ${D}${PTEST_PATH}/Makefile
+
         cp Configure config e_os.h ${D}${PTEST_PATH}
         cp -r -L include ${D}${PTEST_PATH}
-        ln -sf ${base_libdir}/libcrypto.a ${D}${PTEST_PATH}
+        ln -sf ${libdir}/libcrypto.a ${D}${PTEST_PATH}
         ln -sf ${libdir}/libssl.a ${D}${PTEST_PATH}
         mkdir -p ${D}${PTEST_PATH}/crypto
         cp crypto/constant_time_locl.h ${D}${PTEST_PATH}/crypto
@@ -228,10 +232,24 @@ do_install_ptest () {
         ln -sf ${libdir}/ssl/misc/CA.sh  ${D}${PTEST_PATH}/apps
         ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${PTEST_PATH}/apps
         ln -sf ${bindir}/openssl         ${D}${PTEST_PATH}/apps
+        cp apps/server.pem              ${D}${PTEST_PATH}/apps
         cp apps/server2.pem             ${D}${PTEST_PATH}/apps
         mkdir -p ${D}${PTEST_PATH}/util
         install util/opensslwrap.sh    ${D}${PTEST_PATH}/util
         install util/shlib_wrap.sh     ${D}${PTEST_PATH}/util
+        # Time stamps are relevant for "make alltests", otherwise
+        # make may try to recompile binaries. Not only must the
+        # binary files be newer than the sources, they also must
+        # be more recent than the header files in /usr/include.
+        #
+        # Using "cp -a" is not sufficient, because do_install
+        # does not preserve the original time stamps.
+        #
+        # So instead of using the original file stamps, we set
+        # the current time for all files. Binaries will get
+        # modified again later when stripping them, but that's okay.
+        touch ${D}${PTEST_PATH}
+        find ${D}${PTEST_PATH} -type f -print0 | xargs --verbose -0 touch -r ${D}${PTEST_PATH}
 }
 
 do_install_append_class-native() {