]> code.ossystems Code Review - openembedded-core.git/commitdiff
openssl10: rename back to openssl and make it the default via PREFERRED_VERSION
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>
Fri, 18 Aug 2017 19:31:29 +0000 (22:31 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 19 Aug 2017 08:19:12 +0000 (09:19 +0100)
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.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
34 files changed:
meta/conf/distro/include/default-versions.inc
meta/recipes-connectivity/openssl/openssl-1.0.2l/0001-Fix-build-with-clang-using-external-assembler.patch [moved from meta/recipes-connectivity/openssl/openssl10/0001-Fix-build-with-clang-using-external-assembler.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/Makefiles-ptest.patch [moved from meta/recipes-connectivity/openssl/openssl10/Makefiles-ptest.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/Use-SHA256-not-MD5-as-default-digest.patch [moved from meta/recipes-connectivity/openssl/openssl10/Use-SHA256-not-MD5-as-default-digest.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/configure-musl-target.patch [moved from meta/recipes-connectivity/openssl/openssl10/configure-musl-target.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/configure-targets.patch [moved from meta/recipes-connectivity/openssl/openssl10/configure-targets.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/c_rehash-compat.patch [moved from meta/recipes-connectivity/openssl/openssl10/debian/c_rehash-compat.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/ca.patch [moved from meta/recipes-connectivity/openssl/openssl10/debian/ca.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/debian-targets.patch [moved from meta/recipes-connectivity/openssl/openssl10/debian/debian-targets.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/man-dir.patch [moved from meta/recipes-connectivity/openssl/openssl10/debian/man-dir.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/man-section.patch [moved from meta/recipes-connectivity/openssl/openssl10/debian/man-section.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/no-rpath.patch [moved from meta/recipes-connectivity/openssl/openssl10/debian/no-rpath.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/no-symbolic.patch [moved from meta/recipes-connectivity/openssl/openssl10/debian/no-symbolic.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/pic.patch [moved from meta/recipes-connectivity/openssl/openssl10/debian/pic.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/debian/version-script.patch [moved from meta/recipes-connectivity/openssl/openssl10/debian/version-script.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/block_digicert_malaysia.patch [moved from meta/recipes-connectivity/openssl/openssl10/debian1.0.2/block_digicert_malaysia.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/block_diginotar.patch [moved from meta/recipes-connectivity/openssl/openssl10/debian1.0.2/block_diginotar.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/soname.patch [moved from meta/recipes-connectivity/openssl/openssl10/debian1.0.2/soname.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/debian1.0.2/version-script.patch [moved from meta/recipes-connectivity/openssl/openssl10/debian1.0.2/version-script.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/engines-install-in-libdir-ssl.patch [moved from meta/recipes-connectivity/openssl/openssl10/engines-install-in-libdir-ssl.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/find.pl [moved from meta/recipes-connectivity/openssl/openssl10/find.pl with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/oe-ldflags.patch [moved from meta/recipes-connectivity/openssl/openssl10/oe-ldflags.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-1.0.2a-x32-asm.patch [moved from meta/recipes-connectivity/openssl/openssl10/openssl-1.0.2a-x32-asm.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-c_rehash.sh [moved from meta/recipes-connectivity/openssl/openssl10/openssl-c_rehash.sh with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-fix-des.pod-error.patch [moved from meta/recipes-connectivity/openssl/openssl10/openssl-fix-des.pod-error.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl-util-perlpath.pl-cwd.patch [moved from meta/recipes-connectivity/openssl/openssl10/openssl-util-perlpath.pl-cwd.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/openssl_fix_for_x32.patch [moved from meta/recipes-connectivity/openssl/openssl10/openssl_fix_for_x32.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/parallel.patch [moved from meta/recipes-connectivity/openssl/openssl10/parallel.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/ptest-deps.patch [moved from meta/recipes-connectivity/openssl/openssl10/ptest-deps.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/ptest_makefile_deps.patch [moved from meta/recipes-connectivity/openssl/openssl10/ptest_makefile_deps.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/run-ptest [moved from meta/recipes-connectivity/openssl/openssl10/run-ptest with 100% similarity]
meta/recipes-connectivity/openssl/openssl-1.0.2l/shared-libs.patch [moved from meta/recipes-connectivity/openssl/openssl10/shared-libs.patch with 100% similarity]
meta/recipes-connectivity/openssl/openssl10.inc
meta/recipes-connectivity/openssl/openssl_1.0.2l.bb [moved from meta/recipes-connectivity/openssl/openssl10_1.0.2l.bb with 100% similarity]

index a6f331350eb00f3c4414a0d7ba3f373bd5e4e885..868073843af671ab4279cdb7121144fc1fb644f2 100644 (file)
@@ -2,3 +2,6 @@
 # Default preferred versions
 #
 
+PREFERRED_VERSION_openssl = "1.0.%"
+PREFERRED_VERSION_openssl-native = "1.0.%"
+PREFERRED_VERSION_nativesdk-openssl = "1.0.%"
index 19ccd184944ec7d58993b0f99b4b7c115488b7fa..5782990850a6840ccbe48a1115b2f5ca7ccb3067 100644 (file)
@@ -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
-
-}