diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-connectivity/openssl | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.1k.bb | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1k.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1k.bb index e518cb6a02..09afa27ac1 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1k.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1k.bb | |||
@@ -19,11 +19,11 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | |||
19 | file://reproducible.patch \ | 19 | file://reproducible.patch \ |
20 | " | 20 | " |
21 | 21 | ||
22 | SRC_URI_append_class-nativesdk = " \ | 22 | SRC_URI:append:class-nativesdk = " \ |
23 | file://environment.d-openssl.sh \ | 23 | file://environment.d-openssl.sh \ |
24 | " | 24 | " |
25 | 25 | ||
26 | SRC_URI_append_riscv32 = " \ | 26 | SRC_URI:append:riscv32 = " \ |
27 | file://0003-Add-support-for-io_pgetevents_time64-syscall.patch \ | 27 | file://0003-Add-support-for-io_pgetevents_time64-syscall.patch \ |
28 | file://0004-Fixup-support-for-io_pgetevents_time64-syscall.patch \ | 28 | file://0004-Fixup-support-for-io_pgetevents_time64-syscall.patch \ |
29 | " | 29 | " |
@@ -34,8 +34,8 @@ inherit lib_package multilib_header multilib_script ptest | |||
34 | MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" | 34 | MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" |
35 | 35 | ||
36 | PACKAGECONFIG ?= "" | 36 | PACKAGECONFIG ?= "" |
37 | PACKAGECONFIG_class-native = "" | 37 | PACKAGECONFIG:class-native = "" |
38 | PACKAGECONFIG_class-nativesdk = "" | 38 | PACKAGECONFIG:class-nativesdk = "" |
39 | 39 | ||
40 | PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,cryptodev-module" | 40 | PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,cryptodev-module" |
41 | PACKAGECONFIG[no-tls1] = "no-tls1" | 41 | PACKAGECONFIG[no-tls1] = "no-tls1" |
@@ -47,17 +47,17 @@ do_configure[cleandirs] = "${B}" | |||
47 | #| ./libcrypto.so: undefined reference to `getcontext' | 47 | #| ./libcrypto.so: undefined reference to `getcontext' |
48 | #| ./libcrypto.so: undefined reference to `setcontext' | 48 | #| ./libcrypto.so: undefined reference to `setcontext' |
49 | #| ./libcrypto.so: undefined reference to `makecontext' | 49 | #| ./libcrypto.so: undefined reference to `makecontext' |
50 | EXTRA_OECONF_append_libc-musl = " no-async" | 50 | EXTRA_OECONF:append:libc-musl = " no-async" |
51 | EXTRA_OECONF_append_libc-musl_powerpc64 = " no-asm" | 51 | EXTRA_OECONF:append:libc-musl:powerpc64 = " no-asm" |
52 | 52 | ||
53 | # adding devrandom prevents openssl from using getrandom() which is not available on older glibc versions | 53 | # adding devrandom prevents openssl from using getrandom() which is not available on older glibc versions |
54 | # (native versions can be built with newer glibc, but then relocated onto a system with older glibc) | 54 | # (native versions can be built with newer glibc, but then relocated onto a system with older glibc) |
55 | EXTRA_OECONF_class-native = "--with-rand-seed=os,devrandom" | 55 | EXTRA_OECONF:class-native = "--with-rand-seed=os,devrandom" |
56 | EXTRA_OECONF_class-nativesdk = "--with-rand-seed=os,devrandom" | 56 | EXTRA_OECONF:class-nativesdk = "--with-rand-seed=os,devrandom" |
57 | 57 | ||
58 | # Relying on hardcoded built-in paths causes openssl-native to not be relocateable from sstate. | 58 | # Relying on hardcoded built-in paths causes openssl-native to not be relocateable from sstate. |
59 | CFLAGS_append_class-native = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin" | 59 | CFLAGS:append:class-native = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin" |
60 | CFLAGS_append_class-nativesdk = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin" | 60 | CFLAGS:append:class-nativesdk = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin" |
61 | 61 | ||
62 | # Disable deprecated crypto algorithms | 62 | # Disable deprecated crypto algorithms |
63 | # Retained for compatibilty | 63 | # Retained for compatibilty |
@@ -170,7 +170,7 @@ do_install () { | |||
170 | ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/openssl.cnf')} ${D}${libdir}/ssl-1.1/openssl.cnf | 170 | ln -sf ${@oe.path.relative('${libdir}/ssl-1.1', '${sysconfdir}/ssl/openssl.cnf')} ${D}${libdir}/ssl-1.1/openssl.cnf |
171 | } | 171 | } |
172 | 172 | ||
173 | do_install_append_class-native () { | 173 | do_install:append:class-native () { |
174 | create_wrapper ${D}${bindir}/openssl \ | 174 | create_wrapper ${D}${bindir}/openssl \ |
175 | OPENSSL_CONF=${libdir}/ssl-1.1/openssl.cnf \ | 175 | OPENSSL_CONF=${libdir}/ssl-1.1/openssl.cnf \ |
176 | SSL_CERT_DIR=${libdir}/ssl-1.1/certs \ | 176 | SSL_CERT_DIR=${libdir}/ssl-1.1/certs \ |
@@ -178,7 +178,7 @@ do_install_append_class-native () { | |||
178 | OPENSSL_ENGINES=${libdir}/engines-1.1 | 178 | OPENSSL_ENGINES=${libdir}/engines-1.1 |
179 | } | 179 | } |
180 | 180 | ||
181 | do_install_append_class-nativesdk () { | 181 | do_install:append:class-nativesdk () { |
182 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d | 182 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d |
183 | install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh | 183 | install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh |
184 | sed 's|/usr/lib/ssl/|/usr/lib/ssl-1.1/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh | 184 | sed 's|/usr/lib/ssl/|/usr/lib/ssl-1.1/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh |
@@ -217,25 +217,25 @@ do_install_ptest () { | |||
217 | 217 | ||
218 | PACKAGES =+ "libcrypto libssl openssl-conf ${PN}-engines ${PN}-misc" | 218 | PACKAGES =+ "libcrypto libssl openssl-conf ${PN}-engines ${PN}-misc" |
219 | 219 | ||
220 | FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" | 220 | FILES:libcrypto = "${libdir}/libcrypto${SOLIBS}" |
221 | FILES_libssl = "${libdir}/libssl${SOLIBS}" | 221 | FILES:libssl = "${libdir}/libssl${SOLIBS}" |
222 | FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf \ | 222 | FILES:openssl-conf = "${sysconfdir}/ssl/openssl.cnf \ |
223 | ${libdir}/ssl-1.1/openssl.cnf* \ | 223 | ${libdir}/ssl-1.1/openssl.cnf* \ |
224 | " | 224 | " |
225 | FILES_${PN}-engines = "${libdir}/engines-1.1" | 225 | FILES:${PN}-engines = "${libdir}/engines-1.1" |
226 | # ${prefix} comes from what we pass into --prefix at configure time (which is used for INSTALLTOP) | 226 | # ${prefix} comes from what we pass into --prefix at configure time (which is used for INSTALLTOP) |
227 | FILES_${PN}-engines_append_mingw32_class-nativesdk = " ${prefix}${libdir}/engines-1_1" | 227 | FILES:${PN}-engines:append:mingw32:class-nativesdk = " ${prefix}${libdir}/engines-1_1" |
228 | FILES_${PN}-misc = "${libdir}/ssl-1.1/misc ${bindir}/c_rehash" | 228 | FILES:${PN}-misc = "${libdir}/ssl-1.1/misc ${bindir}/c_rehash" |
229 | FILES_${PN} =+ "${libdir}/ssl-1.1/*" | 229 | FILES:${PN} =+ "${libdir}/ssl-1.1/*" |
230 | FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" | 230 | FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" |
231 | 231 | ||
232 | CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" | 232 | CONFFILES:openssl-conf = "${sysconfdir}/ssl/openssl.cnf" |
233 | 233 | ||
234 | RRECOMMENDS_libcrypto += "openssl-conf" | 234 | RRECOMMENDS:libcrypto += "openssl-conf" |
235 | RDEPENDS_${PN}-misc = "perl" | 235 | RDEPENDS:${PN}-misc = "perl" |
236 | RDEPENDS_${PN}-ptest += "openssl-bin perl perl-modules bash" | 236 | RDEPENDS:${PN}-ptest += "openssl-bin perl perl-modules bash" |
237 | 237 | ||
238 | RDEPENDS_${PN}-bin += "openssl-conf" | 238 | RDEPENDS:${PN}-bin += "openssl-conf" |
239 | 239 | ||
240 | BBCLASSEXTEND = "native nativesdk" | 240 | BBCLASSEXTEND = "native nativesdk" |
241 | 241 | ||