[meta-openssl102][PATCH 2/2] meta-openssl102: convert to new override syntax
Yi Zhao
This is the result of automated script conversion:
poky/scripts/contrib/convert-overrides.py meta-openssl102 Converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Yi Zhao <yi.zhao@...> --- .../openssl/openssl_1.0.2u.bb | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/recipes-connectivity/openssl/openssl_1.0.2u.bb b/recipes-connectivity/openssl/openssl_1.0.2u.bb index 10707ed..7fc3b12 100644 --- a/recipes-connectivity/openssl/openssl_1.0.2u.bb +++ b/recipes-connectivity/openssl/openssl_1.0.2u.bb @@ -9,7 +9,7 @@ LICENSE = "openssl" LIC_FILES_CHKSUM = "file://LICENSE;md5=f475368924827d06d4b416111c8bdb77" DEPENDS = "hostperl-runtime-native" -DEPENDS_append_class-target = " openssl-native" +DEPENDS:append:class-target = " openssl-native" SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://run-ptest \ @@ -54,12 +54,12 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://CVE-2021-23841.patch \ " -SRC_URI_append_class-target = " \ +SRC_URI:append:class-target = " \ file://reproducible-cflags.patch \ file://reproducible-mkbuildinf.patch \ " -SRC_URI_append_class-nativesdk = " \ +SRC_URI:append:class-nativesdk = " \ file://environment.d-openssl.sh \ " @@ -73,8 +73,8 @@ UPSTREAM_CHECK_REGEX = "openssl-(?P<pver>1\.0.+)\.tar" inherit pkgconfig siteinfo lib_package multilib_header ptest manpages PACKAGECONFIG ?= "cryptodev-linux" -PACKAGECONFIG_class-native = "" -PACKAGECONFIG_class-nativesdk = "" +PACKAGECONFIG:class-native = "" +PACKAGECONFIG:class-nativesdk = "" PACKAGECONFIG[disable-weak-ciphers] = "no-des no-ec no-ecdh no-ecdsa no-md2 no-mdc2,,," PACKAGECONFIG[cryptodev-linux] = "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS,,cryptodev-linux" @@ -90,8 +90,8 @@ EXTRA_OEMAKE = "${@bb.utils.contains('PACKAGECONFIG', 'manpages', '', 'OE_DISABL export OE_LDFLAGS = "${LDFLAGS}" TERMIO ?= "-DTERMIO" -TERMIO_libc-musl = "-DTERMIOS" -EXTRA_OECONF_append_libc-musl_powerpc64 = " no-asm" +TERMIO:libc-musl = "-DTERMIOS" +EXTRA_OECONF:append:libc-musl:powerpc64 = " no-asm" CFLAG = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \ ${TERMIO} ${CFLAGS} -Wall" @@ -100,7 +100,7 @@ CFLAG = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-DL_ENDIAN', '-DB # (and it causes issues with SELinux) CFLAG += "-Wa,--noexecstack" -CFLAG_append_class-native = " -fPIC" +CFLAG:append:class-native = " -fPIC" do_configure () { # The crypto_use_bigint patch means that perl's bignum module needs to be @@ -211,7 +211,7 @@ do_compile () { oe_runmake } -do_compile_class-target () { +do_compile:class-target () { sed -i 's/\((OPENSSL=\)".*"/\1"openssl"/' Makefile oe_runmake depend cc_sanitized=$(echo "${CC} ${CFLAG}" | sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' -e 's|${DEBUG_PREFIX_MAP}||g' -e 's/[ \t]\+/ /g') @@ -261,7 +261,7 @@ do_install () { ln -sf ${@oe.path.relative('${libdir}/ssl', '${sysconfdir}/ssl/openssl.cnf')} ${D}${libdir}/ssl/openssl.cnf } -do_install_append_class-native () { +do_install:append:class-native () { create_wrapper ${D}${bindir}/openssl \ OPENSSL_CONF=${libdir}/ssl/openssl.cnf \ SSL_CERT_DIR=${libdir}/ssl/certs \ @@ -269,7 +269,7 @@ do_install_append_class-native () { OPENSSL_ENGINES=${libdir}/ssl/engines } -do_install_append_class-nativesdk () { +do_install:append:class-nativesdk () { mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh } @@ -329,18 +329,18 @@ do_install_ptest () { PACKAGES =+ "libcrypto libssl openssl-conf ${PN}-engines ${PN}-misc" -FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" -FILES_libssl = "${libdir}/libssl${SOLIBS}" -FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf ${libdir}/ssl/openssl.cnf" -FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines" -FILES_${PN}-misc = "${libdir}/ssl/misc" -FILES_${PN} =+ "${libdir}/ssl/*" -FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" +FILES:libcrypto = "${libdir}/libcrypto${SOLIBS}" +FILES:libssl = "${libdir}/libssl${SOLIBS}" +FILES:openssl-conf = "${sysconfdir}/ssl/openssl.cnf ${libdir}/ssl/openssl.cnf" +FILES:${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines" +FILES:${PN}-misc = "${libdir}/ssl/misc" +FILES:${PN} =+ "${libdir}/ssl/*" +FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" -CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" +CONFFILES:openssl-conf = "${sysconfdir}/ssl/openssl.cnf" -RRECOMMENDS_libcrypto += "openssl-conf" -RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" -RDEPENDS_${PN}-ptest += "${PN}-misc make perl perl-module-filehandle bc" +RRECOMMENDS:libcrypto += "openssl-conf" +RDEPENDS:${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" +RDEPENDS:${PN}-ptest += "${PN}-misc make perl perl-module-filehandle bc" BBCLASSEXTEND = "native nativesdk" -- 2.25.1
|
|