[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7302/8267] openssl10: rename back to openssl and make it the default via PREFERRED_VERSION

From: Emmanuele Bassi <ebassi src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 7302/8267] openssl10: rename back to openssl and make it the default via PREFERRED_VERSION
Date: Sun, 17 Dec 2017 06:03:28 +0000 (UTC)
commit 7a4361c506ac24bafcf294f498d00278f11c3bd4
Author: Alexander Kanavin <alexander kanavin linux intel com>
Date:   Fri Aug 18 22:31:29 2017 +0300

    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>

 meta/conf/distro/include/default-versions.inc      |    3 +++
 ...build-with-clang-using-external-assembler.patch |    0
 .../Makefiles-ptest.patch                          |    0
 .../Use-SHA256-not-MD5-as-default-digest.patch     |    0
 .../configure-musl-target.patch                    |    0
 .../configure-targets.patch                        |    0
 .../debian/c_rehash-compat.patch                   |    0
 .../{openssl10 => openssl-1.0.2l}/debian/ca.patch  |    0
 .../debian/debian-targets.patch                    |    0
 .../debian/man-dir.patch                           |    0
 .../debian/man-section.patch                       |    0
 .../debian/no-rpath.patch                          |    0
 .../debian/no-symbolic.patch                       |    0
 .../{openssl10 => openssl-1.0.2l}/debian/pic.patch |    0
 .../debian/version-script.patch                    |    0
 .../debian1.0.2/block_digicert_malaysia.patch      |    0
 .../debian1.0.2/block_diginotar.patch              |    0
 .../debian1.0.2/soname.patch                       |    0
 .../debian1.0.2/version-script.patch               |    0
 .../engines-install-in-libdir-ssl.patch            |    0
 .../openssl/{openssl10 => openssl-1.0.2l}/find.pl  |    0
 .../{openssl10 => openssl-1.0.2l}/oe-ldflags.patch |    0
 .../openssl-1.0.2a-x32-asm.patch                   |    0
 .../openssl-c_rehash.sh                            |    0
 .../openssl-fix-des.pod-error.patch                |    0
 .../openssl-util-perlpath.pl-cwd.patch             |    0
 .../openssl_fix_for_x32.patch                      |    0
 .../{openssl10 => openssl-1.0.2l}/parallel.patch   |    0
 .../{openssl10 => openssl-1.0.2l}/ptest-deps.patch |    0
 .../ptest_makefile_deps.patch                      |    0
 .../{openssl10 => openssl-1.0.2l}/run-ptest        |    0
 .../shared-libs.patch                              |    0
 meta/recipes-connectivity/openssl/openssl10.inc    |   13 ++-----------
 .../{openssl10_1.0.2l.bb => openssl_1.0.2l.bb}     |    0
 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 a6f3313..8680738 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
similarity index 100%
rename from 
meta/recipes-connectivity/openssl/openssl10/0001-Fix-build-with-clang-using-external-assembler.patch
rename to 
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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/Makefiles-ptest.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/Use-SHA256-not-MD5-as-default-digest.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/configure-musl-target.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/configure-targets.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/debian/c_rehash-compat.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/debian/ca.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/debian/debian-targets.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/debian/man-dir.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/debian/man-section.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/debian/no-rpath.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/debian/no-symbolic.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/debian/pic.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/debian/version-script.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/debian1.0.2/block_digicert_malaysia.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/debian1.0.2/block_diginotar.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/debian1.0.2/soname.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/debian1.0.2/version-script.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/engines-install-in-libdir-ssl.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/find.pl
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/oe-ldflags.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/openssl-1.0.2a-x32-asm.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/openssl-c_rehash.sh
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/openssl-fix-des.pod-error.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/openssl-util-perlpath.pl-cwd.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/openssl_fix_for_x32.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/parallel.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/ptest-deps.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/ptest_makefile_deps.patch
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/run-ptest
rename to 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10/shared-libs.patch
rename to 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 19ccd18..5782990 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
similarity index 100%
rename from meta/recipes-connectivity/openssl/openssl10_1.0.2l.bb
rename to meta/recipes-connectivity/openssl/openssl_1.0.2l.bb
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]