diff options
Diffstat (limited to 'recipes-connectivity/openssl')
4 files changed, 11 insertions, 11 deletions
diff --git a/recipes-connectivity/openssl/openssl-fips-example_2.0.16.bb b/recipes-connectivity/openssl/openssl-fips-example_2.0.16.bb index 1a720cd..c6d069f 100644 --- a/recipes-connectivity/openssl/openssl-fips-example_2.0.16.bb +++ b/recipes-connectivity/openssl/openssl-fips-example_2.0.16.bb @@ -19,14 +19,14 @@ DEPENDS = " \ openssl \ " -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ openssl-fips-dev \ openssl-dev \ openssl-staticdev \ packagegroup-core-buildessential \ " -FILES_${PN} += "${libdir}/ssl/fips-2.0/test" +FILES:${PN} += "${libdir}/ssl/fips-2.0/test" do_configure[noexec] = "1" @@ -47,7 +47,7 @@ do_install() { sed -i "s:@LIBDIR@:${libdir}:g" ${D}/${libdir}/ssl/fips-2.0/test/Makefile } -INSANE_SKIP_${PN} += "dev-deps" +INSANE_SKIP:${PN} += "dev-deps" python __anonymous() { if d.getVar("OPENSSL_FIPS_ENABLED", True) != "1": diff --git a/recipes-connectivity/openssl/openssl-fips_2.0.16.bb b/recipes-connectivity/openssl/openssl-fips_2.0.16.bb index b7cb34b..7a2949a 100644 --- a/recipes-connectivity/openssl/openssl-fips_2.0.16.bb +++ b/recipes-connectivity/openssl/openssl-fips_2.0.16.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" # Set "OPENSSL_FIPS_PREBUILT" to the location of the prebuilt # openssl-fips-TARGET_ARCH-install.tar.bz2 files. # -FILESEXTRAPATHS_prepend := "${OPENSSL_FIPS_PREBUILT}:" +FILESEXTRAPATHS:prepend := "${OPENSSL_FIPS_PREBUILT}:" PREBUILT_OPENSSL_FIPS = "openssl-fips-${PV}-${TARGET_ARCH}-install.tar.bz2" @@ -20,8 +20,8 @@ SRC_URI = "file://${PREBUILT_OPENSSL_FIPS} \ " S = "${WORKDIR}" -RDEPENDS_${PN}-dev = "" -FILES_${PN}-dev += "${bindir}/fipsld ${libdir}/ssl/fips-2.0" +RDEPENDS:${PN}-dev = "" +FILES:${PN}-dev += "${bindir}/fipsld ${libdir}/ssl/fips-2.0" INHIBIT_PACKAGE_DEBUG_SPLIT = '1' INHIBIT_PACKAGE_STRIP = '1' diff --git a/recipes-connectivity/openssl/openssl_1.0.2%.bbappend b/recipes-connectivity/openssl/openssl_1.0.2%.bbappend index 517f1c2..41a7302 100644 --- a/recipes-connectivity/openssl/openssl_1.0.2%.bbappend +++ b/recipes-connectivity/openssl/openssl_1.0.2%.bbappend @@ -1,4 +1,4 @@ FIPSINC = "" -FIPSINC_class-target = "${@'' if d.getVar('OPENSSL_FIPS_ENABLED', True) != '1' else 'openssl_fips.inc'}" +FIPSINC:class-target = "${@'' if d.getVar('OPENSSL_FIPS_ENABLED', True) != '1' else 'openssl_fips.inc'}" require ${FIPSINC} diff --git a/recipes-connectivity/openssl/openssl_fips.inc b/recipes-connectivity/openssl/openssl_fips.inc index 5480096..9ae23cd 100644 --- a/recipes-connectivity/openssl/openssl_fips.inc +++ b/recipes-connectivity/openssl/openssl_fips.inc @@ -1,11 +1,11 @@ -PACKAGECONFIG_append = " fips" +PACKAGECONFIG:append = " fips" PACKAGECONFIG[fips] = "fips --with-fipsdir=${STAGING_DIR_TARGET}${libdir}/ssl/fips-2.0,,openssl-fips,," -FILESEXTRAPATHS_prepend := "${THISDIR}/openssl:" +FILESEXTRAPATHS:prepend := "${THISDIR}/openssl:" # This adds the necessary symbols if fips is enabled. -SRC_URI_append = " file://openssl-fips-version.patch \ +SRC_URI:append = " file://openssl-fips-version.patch \ file://0001-make-fips_premain_dso-support-cross-compiling.patch \ " @@ -14,7 +14,7 @@ DEPENDS += "qemu-native" inherit qemu # We need to run the special fips_premain_dso under QEMU -do_compile_prepend() { +do_compile:prepend() { qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_LIBDIR}','${STAGING_BASELIBDIR}'])}" cat << EOF > fips_premain_dso #! /bin/sh |