openssl_1.0: merge openssl10.inc into the openssl_1.0.2o.bb recipe

The openssl10.inc include file only has one user, so we can improve
maintainability by merging the include file into the recipe which
uses it.

(From OE-Core rev: f5568740d5ff72090c3ca894ddfdc3078169da25)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 0 insertions, 296 deletions

diff --git a/meta/recipes-connectivity/openssl/openssl10.inc b/meta/recipes-connectivity/openssl/openssl10.inc
deleted file mode 100644
index 1f8834f2e8..0000000000
--- a/meta/recipes-connectivity/openssl/openssl10.inc
+++ /dev/null
@@ -1,296 +0,0 @@
-SUMMARY = "Secure Socket Layer"
-DESCRIPTION = "Secure Socket Layer (SSL) binary and related cryptographic tools."
-HOMEPAGE = "http://www.openssl.org/"
-BUGTRACKER = "http://www.openssl.org/news/vulnerabilities.html"
-SECTION = "libs/network"
-
-# "openssl | SSLeay" dual license
-LICENSE = "openssl"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
-
-DEPENDS = "makedepend-native hostperl-runtime-native"
-DEPENDS_append_class-target = " openssl-native"
-
-PROVIDES += "openssl10"
-
-SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
-          "
-S = "${WORKDIR}/openssl-${PV}"
-UPSTREAM_CHECK_REGEX = "openssl-(?P<pver>1\.0.+)\.tar"
-
-PACKAGECONFIG ?= "cryptodev-linux"
-PACKAGECONFIG[perl] = ",,,"
-PACKAGECONFIG[cryptodev-linux] = "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS,,cryptodev-linux"
-
-TERMIO_libc-musl = "-DTERMIOS"
-TERMIO ?= "-DTERMIO"
-# Avoid binaries being marked as requiring an executable stack since it 
-# doesn't(which causes and this causes issues with SELinux
-CFLAG = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
-         ${TERMIO} ${CFLAGS} -Wall -Wa,--noexecstack"
-
-export DIRS = "crypto ssl apps"
-export EX_LIBS = "-lgcc -ldl"
-export AS = "${CC} -c"
-
-# openssl fails with ccache: https://bugzilla.yoctoproject.org/show_bug.cgi?id=12810
-CCACHE = ""
-
-inherit pkgconfig siteinfo multilib_header ptest relative_symlinks
-
-PACKAGES =+ "libcrypto libssl ${PN}-misc openssl-conf"
-FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
-FILES_libssl = "${libdir}/libssl${SOLIBS}"
-FILES_${PN} =+ " ${libdir}/ssl/*"
-FILES_${PN}-misc = "${libdir}/ssl/misc"
-RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}"
-
-# Add the openssl.cnf file to the openssl-conf package.  Make the libcrypto
-# package RRECOMMENDS on this package.  This will enable the configuration
-# file to be installed for both the base openssl package and the libcrypto
-# package since the base openssl package depends on the libcrypto package.
-FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
-CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf"
-RRECOMMENDS_libcrypto += "openssl-conf"
-RDEPENDS_${PN}-ptest += "${PN}-misc make perl perl-module-filehandle bc"
-
-# Remove this to enable SSLv3. SSLv3 is defaulted to disabled due to the POODLE
-# vulnerability
-EXTRA_OECONF = " -no-ssl3"
-
-do_configure_prepend_darwin () {
-        sed -i -e '/version-script=openssl\.ld/d' Configure
-}
-
-do_configure () {
-        cd util
-        perl perlpath.pl ${STAGING_BINDIR_NATIVE}
-        cd ..
-        ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
-
-        os=${HOST_OS}
-        case $os in
-        linux-gnueabi |\
-        linux-gnuspe |\
-        linux-musleabi |\
-        linux-muslspe |\
-        linux-musl )
-                os=linux
-                ;;
-                *)
-                ;;
-        esac
-        target="$os-${HOST_ARCH}"
-        case $target in
-        linux-arm)
-                target=linux-armv4
-                ;;
-        linux-armeb)
-                target=linux-elf-armeb
-                ;;
-        linux-aarch64*)
-                target=linux-aarch64
-                ;;
-        linux-sh3)
-                target=debian-sh3
-                ;;
-        linux-sh4)
-                target=debian-sh4
-                ;;
-        linux-i486)
-                target=debian-i386-i486
-                ;;
-        linux-i586 | linux-viac3)
-                target=debian-i386-i586
-                ;;
-        linux-i686)
-                target=debian-i386-i686/cmov
-                ;;
-        linux-gnux32-x86_64 | linux-muslx32-x86_64 )
-                target=linux-x32
-                ;;
-        linux-gnu64-x86_64)
-                target=linux-x86_64
-                ;;
-        linux-gnun32-mips*el)
-                target=debian-mipsn32el
-                ;;
-        linux-gnun32-mips*)
-                target=debian-mipsn32
-                ;;
-        linux-mips*64*el)
-                target=debian-mips64el
-                ;;
-        linux-mips*64*)
-                target=debian-mips64
-                ;;
-        linux-mips*el)
-                target=debian-mipsel
-                ;;
-        linux-mips*)
-                target=debian-mips
-                ;;
-        linux-microblaze*|linux-nios2*|linux-gnu*ilp32**)
-                target=linux-generic32
-                ;;
-        linux-powerpc)
-                target=linux-ppc
-                ;;
-        linux-powerpc64)
-                target=linux-ppc64
-                ;;
-        linux-riscv64)
-                target=linux-generic64
-                ;;
-        linux-riscv32)
-                target=linux-generic32
-                ;;
-        linux-supersparc)
-                target=linux-sparcv8
-                ;;
-        linux-sparc)
-                target=linux-sparcv8
-                ;;
-        darwin-i386)
-                target=darwin-i386-cc
-                ;;
-        esac
-        # inject machine-specific flags
-        sed -i -e "s|^\(\"$target\",\s*\"[^:]\+\):\([^:]\+\)|\1:${CFLAG}|g" Configure
-        useprefix=${prefix}
-        if [ "x$useprefix" = "x" ]; then
-                useprefix=/
-        fi        
-        libdirleaf="$(echo ${libdir} | sed s:$useprefix::)"
-        perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=${libdirleaf} $target
-}
-
-do_compile_prepend_class-target () {
-    sed -i 's/\((OPENSSL=\)".*"/\1"openssl"/' Makefile
-    oe_runmake depend
-        cc_sanitized=`echo "${CC} ${CFLAG}" | sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' -e 's|${DEBUG_PREFIX_MAP}||g'`
-        oe_runmake CC_INFO="${cc_sanitized}"
-}
-
-do_compile () {
-        oe_runmake depend
-        oe_runmake
-}
-
-do_compile_ptest () {
-        # build dependencies for test directory too
-        export DIRS="$DIRS test"
-        oe_runmake depend
-        oe_runmake buildtest
-}
-
-do_install () {
-        # Create ${D}/${prefix} to fix parallel issues
-        mkdir -p ${D}/${prefix}/
-
-        oe_runmake INSTALL_PREFIX="${D}" MANDIR="${mandir}" install
-
-        oe_libinstall -so libcrypto ${D}${libdir}
-        oe_libinstall -so libssl ${D}${libdir}
-
-        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.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
-        else
-                rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget
-        fi
-
-        # Create SSL structure
-        install -d ${D}${sysconfdir}/ssl/
-        mv ${D}${libdir}/ssl/openssl.cnf \
-           ${D}${libdir}/ssl/certs \
-           ${D}${libdir}/ssl/private \
-           \
-           ${D}${sysconfdir}/ssl/
-        ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/certs
-        ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl/private
-        ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl/openssl.cnf
-
-        # Rename man pages to prefix openssl10-*
-        for f in `find ${D}${mandir} -type f`; do
-            mv $f $(dirname $f)/openssl10-$(basename $f)
-        done
-        for f in `find ${D}${mandir} -type l`; do
-            ln_f=`readlink $f`
-            rm -f $f
-            ln -s openssl10-$ln_f $(dirname $f)/openssl10-$(basename $f)
-        done
-}
-
-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 ${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
-        cp -r certs ${D}${PTEST_PATH}
-        mkdir -p ${D}${PTEST_PATH}/apps
-        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}
-
-        # exclude binary files or the package won't install
-        for d in ssltest_old v3ext x509aux; do
-                rm -rf ${D}${libdir}/${BPN}/ptest/test/$d
-        done
-
-        # Remove build host references
-        sed -i \
-       -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
-       -e 's|${DEBUG_PREFIX_MAP}||g' \
-       ${D}${PTEST_PATH}/Makefile ${D}${PTEST_PATH}/Configure
-}
-
-do_install_append_class-native() {
-        create_wrapper ${D}${bindir}/openssl \
-            OPENSSL_CONF=${libdir}/ssl/openssl.cnf \
-            SSL_CERT_DIR=${libdir}/ssl/certs \
-            SSL_CERT_FILE=${libdir}/ssl/cert.pem \
-            OPENSSL_ENGINES=${libdir}/ssl/engines
-}
-
-do_install_append_class-nativesdk() {
-    mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
-    install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
-}
-
-FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh"
-
-BBCLASSEXTEND = "native nativesdk"
-