openssl10: rename back to openssl and make it the default via PREFERRED_VERSION

openssl 1.1 broke 3rd party layers a lot more than was expected; let's flip
the switch at the start of next development cycle.

Add a PROVIDES = "openssl10" to openssl 1.0 recipe; any dependency that is
not compatible with 1.1 should use that in its DEPENDS, as the 1.0
recipe will later be renamed back to openssl10. This does not always work:
http://lists.openembedded.org/pipermail/openembedded-core/2017-August/140957.html
but for many recipes it does.

(From OE-Core rev: 5585103c195104e85ed7ac1455bef91b2e88a04d)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

34 files changed, 5 insertions, 11 deletions

diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index a6f331350e..868073843a 100644
--- a/meta/conf/distro/include/default-versions.inc
+++ b/meta/conf/distro/include/default-versions.inc
@@ -2,3 +2,6 @@
 # Default preferred versions
 #
 
+PREFERRED_VERSION_openssl = "1.0.%"
+PREFERRED_VERSION_openssl-native = "1.0.%"
+PREFERRED_VERSION_nativesdk-openssl = "1.0.%"
diff --git a/meta/recipes-connectivity/openssl/openssl10/0001-Fix-build-with-clang-using-external-assembler.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/0001-Fix-build-with-clang-using-external-assembler.patch
index 2270962a6f..2270962a6f 100644
--- a/meta/recipes-connectivity/openssl/openssl10/0001-Fix-build-with-clang-using-external-assembler.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/0001-Fix-build-with-clang-using-external-assembler.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/Makefiles-ptest.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/Makefiles-ptest.patch
index 249446a5bd..249446a5bd 100644
--- a/meta/recipes-connectivity/openssl/openssl10/Makefiles-ptest.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/Makefiles-ptest.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/Use-SHA256-not-MD5-as-default-digest.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/Use-SHA256-not-MD5-as-default-digest.patch
index 58c9ee7844..58c9ee7844 100644
--- a/meta/recipes-connectivity/openssl/openssl10/Use-SHA256-not-MD5-as-default-digest.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/Use-SHA256-not-MD5-as-default-digest.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/configure-musl-target.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/configure-musl-target.patch
index f357b3f59f..f357b3f59f 100644
--- a/meta/recipes-connectivity/openssl/openssl10/configure-musl-target.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/configure-musl-target.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/configure-targets.patch
index 1e01589722..1e01589722 100644
--- a/meta/recipes-connectivity/openssl/openssl10/configure-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/configure-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/debian/c_rehash-compat.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/c_rehash-compat.patch
index 68e54d561e..68e54d561e 100644
--- a/meta/recipes-connectivity/openssl/openssl10/debian/c_rehash-compat.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/c_rehash-compat.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/debian/ca.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/ca.patch
index fb745e4394..fb745e4394 100644
--- a/meta/recipes-connectivity/openssl/openssl10/debian/ca.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/ca.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/debian/debian-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/debian-targets.patch
index 39d4328184..39d4328184 100644
--- a/meta/recipes-connectivity/openssl/openssl10/debian/debian-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/debian-targets.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/debian/man-dir.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/man-dir.patch
index 4085e3b1d7..4085e3b1d7 100644
--- a/meta/recipes-connectivity/openssl/openssl10/debian/man-dir.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/man-dir.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/debian/man-section.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/man-section.patch
index 21c1d1a4eb..21c1d1a4eb 100644
--- a/meta/recipes-connectivity/openssl/openssl10/debian/man-section.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/man-section.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/debian/no-rpath.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/no-rpath.patch
index 1ccb3b86ee..1ccb3b86ee 100644
--- a/meta/recipes-connectivity/openssl/openssl10/debian/no-rpath.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/no-rpath.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/debian/no-symbolic.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/no-symbolic.patch
index cc4408ab7d..cc4408ab7d 100644
--- a/meta/recipes-connectivity/openssl/openssl10/debian/no-symbolic.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/no-symbolic.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/debian/pic.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/pic.patch
index bfda3888bf..bfda3888bf 100644
--- a/meta/recipes-connectivity/openssl/openssl10/debian/pic.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/pic.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/debian/version-script.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/version-script.patch
index 557434fcb5..557434fcb5 100644
--- a/meta/recipes-connectivity/openssl/openssl10/debian/version-script.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/version-script.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/debian1.0.2/block_digicert_malaysia.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/block_digicert_malaysia.patch
index c43bcd1c77..c43bcd1c77 100644
--- a/meta/recipes-connectivity/openssl/openssl10/debian1.0.2/block_digicert_malaysia.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/block_digicert_malaysia.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/debian1.0.2/block_diginotar.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/block_diginotar.patch
index d81e22cd8d..d81e22cd8d 100644
--- a/meta/recipes-connectivity/openssl/openssl10/debian1.0.2/block_diginotar.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/block_diginotar.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/debian1.0.2/soname.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/soname.patch
index 09dd9eaf86..09dd9eaf86 100644
--- a/meta/recipes-connectivity/openssl/openssl10/debian1.0.2/soname.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/soname.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/debian1.0.2/version-script.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/version-script.patch
index e404ee3312..e404ee3312 100644
--- a/meta/recipes-connectivity/openssl/openssl10/debian1.0.2/version-script.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/version-script.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/engines-install-in-libdir-ssl.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/engines-install-in-libdir-ssl.patch
index a5746483e6..a5746483e6 100644
--- a/meta/recipes-connectivity/openssl/openssl10/engines-install-in-libdir-ssl.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/engines-install-in-libdir-ssl.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/find.pl b/meta/recipes-connectivity/openssl/openssl-1.0.2l/find.pl
index 8e1b42c88a..8e1b42c88a 100644
--- a/meta/recipes-connectivity/openssl/openssl10/find.pl
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/find.pl
diff --git a/meta/recipes-connectivity/openssl/openssl10/oe-ldflags.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/oe-ldflags.patch
index 292e13dc5f..292e13dc5f 100644
--- a/meta/recipes-connectivity/openssl/openssl10/oe-ldflags.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/oe-ldflags.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/openssl-1.0.2a-x32-asm.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-1.0.2a-x32-asm.patch
index 1e5bfa17d6..1e5bfa17d6 100644
--- a/meta/recipes-connectivity/openssl/openssl10/openssl-1.0.2a-x32-asm.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-1.0.2a-x32-asm.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/openssl-c_rehash.sh b/meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-c_rehash.sh
index 6620fdcb53..6620fdcb53 100644
--- a/meta/recipes-connectivity/openssl/openssl10/openssl-c_rehash.sh
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-c_rehash.sh
diff --git a/meta/recipes-connectivity/openssl/openssl10/openssl-fix-des.pod-error.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-fix-des.pod-error.patch
index de49729e5e..de49729e5e 100644
--- a/meta/recipes-connectivity/openssl/openssl10/openssl-fix-des.pod-error.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-fix-des.pod-error.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/openssl-util-perlpath.pl-cwd.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-util-perlpath.pl-cwd.patch
index 065b9b122a..065b9b122a 100644
--- a/meta/recipes-connectivity/openssl/openssl10/openssl-util-perlpath.pl-cwd.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-util-perlpath.pl-cwd.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/openssl_fix_for_x32.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl_fix_for_x32.patch
index 0f08a642f6..0f08a642f6 100644
--- a/meta/recipes-connectivity/openssl/openssl10/openssl_fix_for_x32.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl_fix_for_x32.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/parallel.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/parallel.patch
index f3f4c99888..f3f4c99888 100644
--- a/meta/recipes-connectivity/openssl/openssl10/parallel.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/parallel.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/ptest-deps.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/ptest-deps.patch
index ef6d17934d..ef6d17934d 100644
--- a/meta/recipes-connectivity/openssl/openssl10/ptest-deps.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/ptest-deps.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/ptest_makefile_deps.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/ptest_makefile_deps.patch
index 4202e61d1e..4202e61d1e 100644
--- a/meta/recipes-connectivity/openssl/openssl10/ptest_makefile_deps.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/ptest_makefile_deps.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10/run-ptest b/meta/recipes-connectivity/openssl/openssl-1.0.2l/run-ptest
index 3b20fce1ee..3b20fce1ee 100755
--- a/meta/recipes-connectivity/openssl/openssl10/run-ptest
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/run-ptest
diff --git a/meta/recipes-connectivity/openssl/openssl10/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2l/shared-libs.patch
index a7ca0a3078..a7ca0a3078 100644
--- a/meta/recipes-connectivity/openssl/openssl10/shared-libs.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.2l/shared-libs.patch
diff --git a/meta/recipes-connectivity/openssl/openssl10.inc b/meta/recipes-connectivity/openssl/openssl10.inc
index 19ccd18494..5782990850 100644
--- a/meta/recipes-connectivity/openssl/openssl10.inc
+++ b/meta/recipes-connectivity/openssl/openssl10.inc
@@ -11,6 +11,8 @@ 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}"
@@ -265,14 +267,3 @@ do_install_append_class-native() {
 
 BBCLASSEXTEND = "native nativesdk"
 
-PACKAGE_PREPROCESS_FUNCS += "openssl_package_preprocess"
-
-openssl_package_preprocess () {
-        for file in `find ${PKGD} -name *.h -o -name *.pc -o -name *.so`; do
-                rm $file
-        done
-        rm ${PKGD}/usr/bin/openssl
-        rm ${PKGD}/usr/bin/c_rehash
-        rmdir ${PKGD}/usr/bin
-
-}
diff --git a/meta/recipes-connectivity/openssl/openssl10_1.0.2l.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb
index 8c34ea60e5..8c34ea60e5 100644
--- a/meta/recipes-connectivity/openssl/openssl10_1.0.2l.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb