diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-08-08 18:30:48 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-13 09:27:38 +0100 |
commit | e326733d69181a03af7a4f837ea78fce348fdf00 (patch) | |
tree | f2b049b04bf94693ad017ac68df139b4ed655c65 /meta/conf | |
parent | 04891b31e62f37e692647399fa3534d3dd4ab7f9 (diff) | |
download | poky-e326733d69181a03af7a4f837ea78fce348fdf00.tar.gz |
openssl: add a 1.1 version
Existing openssl 1.0 recipe is renamed to openssl10; it will
continue to be provided for as long as upstream supports it
(and there are still several recipes which do not work with openssl
1.1 due to API differences).
A few files (such as openssl binary) are no longer installed by openssl 1.0,
because they clash with openssl 1.1.
(From OE-Core rev: da1183f9fa5e06fbe66b5b31eb3313d5d35d11e3)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/distro/include/no-static-libs.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/conf/distro/include/no-static-libs.inc b/meta/conf/distro/include/no-static-libs.inc index f8d8c09cf0..7c165c717f 100644 --- a/meta/conf/distro/include/no-static-libs.inc +++ b/meta/conf/distro/include/no-static-libs.inc | |||
@@ -25,6 +25,9 @@ DISABLE_STATIC_pn-openjade-native = "" | |||
25 | DISABLE_STATIC_pn-openssl = "" | 25 | DISABLE_STATIC_pn-openssl = "" |
26 | DISABLE_STATIC_pn-openssl-native = "" | 26 | DISABLE_STATIC_pn-openssl-native = "" |
27 | DISABLE_STATIC_pn-nativesdk-openssl = "" | 27 | DISABLE_STATIC_pn-nativesdk-openssl = "" |
28 | DISABLE_STATIC_pn-openssl10 = "" | ||
29 | DISABLE_STATIC_pn-openssl10-native = "" | ||
30 | DISABLE_STATIC_pn-nativesdk-openssl10 = "" | ||
28 | # libssp-static-dev included in build-appliance | 31 | # libssp-static-dev included in build-appliance |
29 | DISABLE_STATIC_pn-gcc-runtime = "" | 32 | DISABLE_STATIC_pn-gcc-runtime = "" |
30 | # libusb1-native is used to build static dfu-util-native | 33 | # libusb1-native is used to build static dfu-util-native |