summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro/include
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-08-28 12:23:12 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-04 11:03:56 +0100
commitdf15a4c914177024f1825aacb4701fd232e1dd58 (patch)
tree82e7f832e4fa30f388883afd553453217397e7f3 /meta/conf/distro/include
parent352d1a4bfdb687bc0d14c74d76e538eeac88ab5d (diff)
downloadpoky-df15a4c914177024f1825aacb4701fd232e1dd58.tar.gz
openssl: rename openssl 1.0.x to openssl10 and make openssl 1.1.x the default version
I believe the time has come to do this: openssl 1.0 upstream support stops at the end of 2019, and we do not want a situation where a supported YP release contains an unsupported version of a critical security component. Openssl 1.0 can still be utilized by depending on 'openssl10' recipe. (From OE-Core rev: 876466145f2da93757ba3f92177d0f959f5fe975) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro/include')
-rw-r--r--meta/conf/distro/include/default-versions.inc3
-rw-r--r--meta/conf/distro/include/maintainers.inc1
2 files changed, 1 insertions, 3 deletions
diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index 3d88e8f656..a6f331350e 100644
--- a/meta/conf/distro/include/default-versions.inc
+++ b/meta/conf/distro/include/default-versions.inc
@@ -2,6 +2,3 @@
2# Default preferred versions 2# Default preferred versions
3# 3#
4 4
5PREFERRED_VERSION_openssl ?= "1.0.%"
6PREFERRED_VERSION_openssl-native ?= "1.0.%"
7PREFERRED_VERSION_nativesdk-openssl ?= "1.0.%"
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 98b661d911..c76f81fb63 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -503,6 +503,7 @@ RECIPE_MAINTAINER_pn-nss-myhostname = "Maxin B. John <maxin.john@intel.com>"
503RECIPE_MAINTAINER_pn-ofono = "Maxin B. John <maxin.john@intel.com>" 503RECIPE_MAINTAINER_pn-ofono = "Maxin B. John <maxin.john@intel.com>"
504RECIPE_MAINTAINER_pn-openssh = "Armin Kuster <akuster808@gmail.com>" 504RECIPE_MAINTAINER_pn-openssh = "Armin Kuster <akuster808@gmail.com>"
505RECIPE_MAINTAINER_pn-openssl = "Alexander Kanavin <alex.kanavin@gmail.com>" 505RECIPE_MAINTAINER_pn-openssl = "Alexander Kanavin <alex.kanavin@gmail.com>"
506RECIPE_MAINTAINER_pn-openssl10 = "Alexander Kanavin <alex.kanavin@gmail.com>"
506RECIPE_MAINTAINER_pn-opkg = "Alejandro del Castillo <alejandro.delcastillo@ni.com>" 507RECIPE_MAINTAINER_pn-opkg = "Alejandro del Castillo <alejandro.delcastillo@ni.com>"
507RECIPE_MAINTAINER_pn-opkg-arch-config = "Alejandro del Castillo <alejandro.delcastillo@ni.com>" 508RECIPE_MAINTAINER_pn-opkg-arch-config = "Alejandro del Castillo <alejandro.delcastillo@ni.com>"
508RECIPE_MAINTAINER_pn-opkg-keyrings = "Alejandro del Castillo <alejandro.delcastillo@ni.com>" 509RECIPE_MAINTAINER_pn-opkg-keyrings = "Alejandro del Castillo <alejandro.delcastillo@ni.com>"