diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-07-29 17:04:53 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-08-03 10:21:25 -0700 |
commit | c61dc077bbd81260e4f167fa2251643ba0ba6974 (patch) | |
tree | 66c3243f8f64ae60f66f70a16e8128c247254a65 /meta-oe/recipes-security | |
parent | c5f7cfb8db54cfa4257797db5bd87828dea43296 (diff) | |
download | meta-openembedded-contrib-c61dc077bbd81260e4f167fa2251643ba0ba6974.tar.gz |
Convert to new override syntax
This is the result of automated script (0.9.1) conversion:
oe-core/scripts/contrib/convert-overrides.py .
converting the metadata to use ":" as the override character instead of "_".
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-security')
-rw-r--r-- | meta-oe/recipes-security/audit/audit_2.8.5.bb | 26 | ||||
-rw-r--r-- | meta-oe/recipes-security/audit/audit_3.0.3.bb | 22 | ||||
-rw-r--r-- | meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb | 8 | ||||
-rw-r--r-- | meta-oe/recipes-security/nmap/nmap_7.80.bb | 6 | ||||
-rw-r--r-- | meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb | 12 | ||||
-rw-r--r-- | meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb | 4 |
7 files changed, 40 insertions, 40 deletions
diff --git a/meta-oe/recipes-security/audit/audit_2.8.5.bb b/meta-oe/recipes-security/audit/audit_2.8.5.bb index ee3b3b5e08..11ec9e9fc4 100644 --- a/meta-oe/recipes-security/audit/audit_2.8.5.bb +++ b/meta-oe/recipes-security/audit/audit_2.8.5.bb @@ -25,7 +25,7 @@ INITSCRIPT_NAME = "auditd" INITSCRIPT_PARAMS = "defaults" SYSTEMD_PACKAGES = "auditd" -SYSTEMD_SERVICE_auditd = "auditd.service" +SYSTEMD_SERVICE:auditd = "auditd.service" DEPENDS += "python3 tcp-wrappers libcap-ng linux-libc-headers swig-native" @@ -40,8 +40,8 @@ EXTRA_OECONF += "--without-prelude \ --without-golang \ --disable-zos-remote \ " -EXTRA_OECONF_append_arm = " --with-arm=yes" -EXTRA_OECONF_append_aarch64 = " --with-aarch64=yes" +EXTRA_OECONF:append:arm = " --with-arm=yes" +EXTRA_OECONF:append:aarch64 = " --with-aarch64=yes" EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \ PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \ @@ -50,8 +50,8 @@ EXTRA_OEMAKE += "PYLIBVER='python${PYTHON_BASEVERSION}' \ pkgconfigdir=${libdir}/pkgconfig \ " -SUMMARY_audispd-plugins = "Plugins for the audit event dispatcher" -DESCRIPTION_audispd-plugins = "The audispd-plugins package provides plugins for the real-time \ +SUMMARY:audispd-plugins = "Plugins for the audit event dispatcher" +DESCRIPTION:audispd-plugins = "The audispd-plugins package provides plugins for the real-time \ interface to the audit system, audispd. These plugins can do things \ like relay events to remote machines or analyze events for suspicious \ behavior." @@ -59,19 +59,19 @@ behavior." PACKAGES =+ "audispd-plugins" PACKAGES += "auditd ${PN}-python" -FILES_${PN} = "${sysconfdir}/libaudit.conf ${base_libdir}/libaudit.so.1* ${base_libdir}/libauparse.so.*" -FILES_auditd += "${bindir}/* ${base_sbindir}/* ${sysconfdir}/*" -FILES_audispd-plugins += "${sysconfdir}/audisp/audisp-remote.conf \ +FILES:${PN} = "${sysconfdir}/libaudit.conf ${base_libdir}/libaudit.so.1* ${base_libdir}/libauparse.so.*" +FILES:auditd += "${bindir}/* ${base_sbindir}/* ${sysconfdir}/*" +FILES:audispd-plugins += "${sysconfdir}/audisp/audisp-remote.conf \ ${sysconfdir}/audisp/plugins.d/au-remote.conf \ ${sbindir}/audisp-remote ${localstatedir}/spool/audit \ " -FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" -FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" +FILES:${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" +FILES:${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" -CONFFILES_auditd += "${sysconfdir}/audit/audit.rules" -RDEPENDS_auditd += "bash" +CONFFILES:auditd += "${sysconfdir}/audit/audit.rules" +RDEPENDS:auditd += "bash" -do_install_append() { +do_install:append() { rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la diff --git a/meta-oe/recipes-security/audit/audit_3.0.3.bb b/meta-oe/recipes-security/audit/audit_3.0.3.bb index c330c07f91..c30b971625 100644 --- a/meta-oe/recipes-security/audit/audit_3.0.3.bb +++ b/meta-oe/recipes-security/audit/audit_3.0.3.bb @@ -24,7 +24,7 @@ INITSCRIPT_NAME = "auditd" INITSCRIPT_PARAMS = "defaults" SYSTEMD_PACKAGES = "auditd" -SYSTEMD_SERVICE_auditd = "auditd.service" +SYSTEMD_SERVICE:auditd = "auditd.service" DEPENDS = "python3 tcp-wrappers libcap-ng linux-libc-headers swig-native" @@ -48,8 +48,8 @@ EXTRA_OEMAKE = "PYLIBVER='python${PYTHON_BASEVERSION}' \ pkgconfigdir=${libdir}/pkgconfig \ " -SUMMARY_audispd-plugins = "Plugins for the audit event dispatcher" -DESCRIPTION_audispd-plugins = "The audispd-plugins package provides plugins for the real-time \ +SUMMARY:audispd-plugins = "Plugins for the audit event dispatcher" +DESCRIPTION:audispd-plugins = "The audispd-plugins package provides plugins for the real-time \ interface to the audit system, audispd. These plugins can do things \ like relay events to remote machines or analyze events for suspicious \ behavior." @@ -57,22 +57,22 @@ behavior." PACKAGES =+ "audispd-plugins" PACKAGES += "auditd ${PN}-python" -FILES_${PN} = "${sysconfdir}/libaudit.conf ${base_libdir}/libaudit.so.1* ${base_libdir}/libauparse.so.*" -FILES_auditd = "${bindir}/* ${base_sbindir}/* ${sysconfdir}/* ${datadir}/audit/*" -FILES_audispd-plugins = "${sysconfdir}/audit/audisp-remote.conf \ +FILES:${PN} = "${sysconfdir}/libaudit.conf ${base_libdir}/libaudit.so.1* ${base_libdir}/libauparse.so.*" +FILES:auditd = "${bindir}/* ${base_sbindir}/* ${sysconfdir}/* ${datadir}/audit/*" +FILES:audispd-plugins = "${sysconfdir}/audit/audisp-remote.conf \ ${sysconfdir}/audit/plugins.d/au-remote.conf \ ${sysconfdir}/audit/plugins.d/syslog.conf \ ${base_sbindir}/audisp-remote \ ${base_sbindir}/audisp-syslog \ ${localstatedir}/spool/audit \ " -FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" -FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" +FILES:${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" +FILES:${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" -CONFFILES_auditd = "${sysconfdir}/audit/audit.rules" -RDEPENDS_auditd = "bash" +CONFFILES:auditd = "${sysconfdir}/audit/audit.rules" +RDEPENDS:auditd = "bash" -do_install_append() { +do_install:append() { rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la diff --git a/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb b/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb index 0a8c2e4834..00cca53b5a 100644 --- a/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb +++ b/meta-oe/recipes-security/keyutils/keyutils_1.6.1.bb @@ -40,7 +40,7 @@ do_install () { oe_runmake DESTDIR=${D} install } -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { install -d ${D}${datadir} src_dir="${D}${target_datadir}" mv $src_dir/* ${D}${datadir} @@ -58,8 +58,8 @@ do_install_ptest () { } -RDEPENDS_${PN}-ptest += "lsb-release" -RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" -RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils" +RDEPENDS:${PN}-ptest += "lsb-release" +RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils" +RDEPENDS:${PN}-ptest:append:libc-musl = " musl-utils" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-security/nmap/nmap_7.80.bb b/meta-oe/recipes-security/nmap/nmap_7.80.bb index 17bc40911d..c2e3585f9d 100644 --- a/meta-oe/recipes-security/nmap/nmap_7.80.bb +++ b/meta-oe/recipes-security/nmap/nmap_7.80.bb @@ -49,7 +49,7 @@ do_configure() { oe_runconf } -do_install_append() { +do_install:append() { for f in ndiff uninstall_ndiff; do if [ -f ${D}${bindir}/$f ]; then sed -i 's@^#!.*$@#!/usr/bin/env python3@g' ${D}${bindir}/$f @@ -57,6 +57,6 @@ do_install_append() { done } -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR} ${datadir}/ncat" +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR} ${datadir}/ncat" -RDEPENDS_${PN} += "python3-core" +RDEPENDS:${PN} += "python3-core" diff --git a/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb b/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb index dd302506d7..b148fdcb59 100644 --- a/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb +++ b/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb @@ -35,7 +35,7 @@ SRC_URI[sha256sum] = "d1fedeaf759e8a0f32d28b5811ef11b5a5365154849190f4b7fab670a7 # explicitly define LINUX_PAM in case DISTRO_FEATURES no pam # this package's pam_passwdqc.so needs pam -CFLAGS_append = " -Wall -fPIC -DHAVE_SHADOW -DLINUX_PAM" +CFLAGS:append = " -Wall -fPIC -DHAVE_SHADOW -DLINUX_PAM" # -e is no longer default setting in bitbake.conf EXTRA_OEMAKE = "-e" @@ -58,9 +58,9 @@ do_install() { PROVIDES += "pam-${BPN}" PACKAGES =+ "lib${BPN} pam-${BPN}" -FILES_lib${BPN} = "${base_libdir}/libpasswdqc.so.0" -FILES_pam-${BPN} = "${base_libdir}/security/pam_passwdqc.so" -FILES_${PN}-dbg += "${base_libdir}/security/.debug" +FILES:lib${BPN} = "${base_libdir}/libpasswdqc.so.0" +FILES:pam-${BPN} = "${base_libdir}/security/pam_passwdqc.so" +FILES:${PN}-dbg += "${base_libdir}/security/.debug" -RDEPENDS_${PN} = "lib${BPN} pam-${BPN}" -RDEPENDS_pam-${BPN} = "lib${BPN}" +RDEPENDS:${PN} = "lib${BPN} pam-${BPN}" +RDEPENDS:pam-${BPN} = "lib${BPN}" diff --git a/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb b/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb index aa91ab37f2..d7bcd4f03b 100644 --- a/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb +++ b/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb @@ -26,5 +26,5 @@ PACKAGECONFIG[botan] = "--with-botan=${STAGING_DIR_HOST}/usr --with-crypto-backe PACKAGECONFIG[migrate] = "--with-migrate" PACKAGECONFIG[pk11] = "--enable-p11-kit --with-p11-kit==${STAGING_DIR_HOST}/usr, --without-p11-kit, p11-kit, p11-kit" -RDEPENDS_${PN} = "sqlite3" +RDEPENDS:${PN} = "sqlite3" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb b/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb index f362775999..4b36dd63ea 100644 --- a/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb +++ b/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb @@ -14,8 +14,8 @@ S = "${WORKDIR}/${BPN}" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING.tomoyo;md5=751419260aa954499f7abaabaa882bbe" -FILES_${PN} += "${libdir}/tomoyo" -FILES_${PN}-dbg += "${libdir}/tomoyo/.debug" +FILES:${PN} += "${libdir}/tomoyo" +FILES:${PN}-dbg += "${libdir}/tomoyo/.debug" DEPENDS = "linux-libc-headers ncurses" |