From dd6fc5dcaa0a027b7651bb365d5dd0f623498f8f Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 2 Aug 2021 17:10:51 -0400 Subject: Convert to new override syntax This is mostly the result of running a slightly customized version of the convert-overrides.py script from poky with additional overrides added. A few minor fixups were done by hand afterwards during a review of the changes. The intent of these changes is to minimize the effort to keep the "next" branch that builds against poky master up to date and tested in preparation for the switch to the next Yocto LTS release in early 2022. Bug-AGL: SPEC-4052 Signed-off-by: Scott Murray Change-Id: Ia3bf63b7cb1aa1d95ada373d1a3ab56def0a125d Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26564 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- .../recipes-security/audit/audit_2.8.5.bb | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'meta-app-framework/recipes-security/audit') diff --git a/meta-app-framework/recipes-security/audit/audit_2.8.5.bb b/meta-app-framework/recipes-security/audit/audit_2.8.5.bb index af36ed5e2..19cc688fb 100644 --- a/meta-app-framework/recipes-security/audit/audit_2.8.5.bb +++ b/meta-app-framework/recipes-security/audit/audit_2.8.5.bb @@ -26,7 +26,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" @@ -41,8 +41,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)' \ @@ -51,8 +51,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." @@ -60,19 +60,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 -- cgit 1.2.3-korg