aboutsummaryrefslogtreecommitdiffstats
path: root/meta-app-framework/recipes-security
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2021-08-02 17:10:51 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-08-23 11:56:42 +0000
commitdd6fc5dcaa0a027b7651bb365d5dd0f623498f8f (patch)
tree428562251f7033e4d44c848e7258243fb9421a94 /meta-app-framework/recipes-security
parent756165e01db655cdbd2788eb134fba79fea7fd90 (diff)
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 <scott.murray@konsulko.com> 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 <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-app-framework/recipes-security')
-rw-r--r--meta-app-framework/recipes-security/audit/audit_2.8.5.bb26
-rw-r--r--meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb2
-rw-r--r--meta-app-framework/recipes-security/cynagora/cynagora-cynara-compat_2.1.bb6
-rw-r--r--meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb14
-rw-r--r--meta-app-framework/recipes-security/security-manager/security-manager.inc14
-rw-r--r--meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend4
6 files changed, 33 insertions, 33 deletions
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
diff --git a/meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb b/meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb
index c77c99189..d76181c98 100644
--- a/meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb
+++ b/meta-app-framework/recipes-security/cynagoauth/cynagoauth_0.1.bb
@@ -18,6 +18,6 @@ EXTRA_OECMAKE += " \
-DUNITDIR_SYSTEM=${systemd_system_unitdir} \
"
-FILES_${PN} += "${systemd_system_unitdir}"
+FILES:${PN} += "${systemd_system_unitdir}"
diff --git a/meta-app-framework/recipes-security/cynagora/cynagora-cynara-compat_2.1.bb b/meta-app-framework/recipes-security/cynagora/cynagora-cynara-compat_2.1.bb
index f146051cd..55edbcebe 100644
--- a/meta-app-framework/recipes-security/cynagora/cynagora-cynara-compat_2.1.bb
+++ b/meta-app-framework/recipes-security/cynagora/cynagora-cynara-compat_2.1.bb
@@ -11,9 +11,9 @@ S = "${WORKDIR}/git"
inherit cmake
PROVIDES = "cynara"
-RPROVIDES_${PN} = "cynara"
+RPROVIDES:${PN} = "cynara"
DEPENDS = "libcap"
-RDEPENDS_${PN} = "cynagora"
+RDEPENDS:${PN} = "cynagora"
EXTRA_OECMAKE += " \
-DWITH_SYSTEMD=OFF \
@@ -21,7 +21,7 @@ EXTRA_OECMAKE += " \
-DDIRECT_CYNARA_COMPAT=ON \
"
-do_install_append() {
+do_install:append() {
# remove cynagora stuff
rm $(find ${D} -name '*cynagora*')
# remove stupid test
diff --git a/meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb b/meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb
index 73f2f0949..2ed1b1541 100644
--- a/meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb
+++ b/meta-app-framework/recipes-security/cynagora/cynagora_2.1.bb
@@ -20,19 +20,19 @@ EXTRA_OECMAKE += " \
inherit useradd
USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "-r cynagora"
-USERADD_PARAM_${PN} = "\
+GROUPADD_PARAM:${PN} = "-r cynagora"
+USERADD_PARAM:${PN} = "\
--system --home ${localstatedir}/lib/empty \
--no-create-home --shell /bin/false \
--gid cynagora cynagora \
"
-FILES_${PN} += "${systemd_system_unitdir}"
+FILES:${PN} += "${systemd_system_unitdir}"
PACKAGES =+ "${PN}-tools"
-FILES_${PN}-tools += "${bindir}/cynagora-admin ${bindir}/cynagora-agent"
-RDEPENDS_${PN}_append_agl-devel = " ${PN}-tools"
+FILES:${PN}-tools += "${bindir}/cynagora-admin ${bindir}/cynagora-agent"
+RDEPENDS:${PN}:append:agl-devel = " ${PN}-tools"
inherit ptest
-SRC_URI_append = " file://run-ptest"
-RDEPENDS_${PN}-ptest_append = " ${PN}-tools"
+SRC_URI:append = " file://run-ptest"
+RDEPENDS:${PN}-ptest:append = " ${PN}-tools"
diff --git a/meta-app-framework/recipes-security/security-manager/security-manager.inc b/meta-app-framework/recipes-security/security-manager/security-manager.inc
index e1d1f4011..c6bc123d3 100644
--- a/meta-app-framework/recipes-security/security-manager/security-manager.inc
+++ b/meta-app-framework/recipes-security/security-manager/security-manager.inc
@@ -34,7 +34,7 @@ EXTRA_OECMAKE = " \
"
inherit systemd
-SYSTEMD_SERVICE_${PN} = "security-manager.service"
+SYSTEMD_SERVICE:${PN} = "security-manager.service"
inherit features_check
REQUIRED_DISTRO_FEATURES += "smack"
@@ -46,8 +46,8 @@ REQUIRED_DISTRO_FEATURES += "smack"
#
# Leave it empty to use the upstream Tizen policy.
SECURITY_MANAGER_POLICY ?= ""
-SRC_URI_append = " ${@' '.join(['file://' + x for x in d.getVar('SECURITY_MANAGER_POLICY', True).split()])}"
-python do_patch_append () {
+SRC_URI:append = " ${@' '.join(['file://' + x for x in d.getVar('SECURITY_MANAGER_POLICY', True).split()])}"
+python do_patch:append () {
import os
import shutil
import glob
@@ -62,22 +62,22 @@ python do_patch_append () {
shutil.copy(file, s + '/policy')
}
-do_install_append () {
+do_install:append () {
install -d ${D}/${systemd_unitdir}/system/multi-user.target.wants
ln -s ../security-manager.service ${D}/${systemd_unitdir}/system/multi-user.target.wants/security-manager.service
install -d ${D}/${systemd_unitdir}/system/sockets.target.wants
ln -s ../security-manager.socket ${D}/${systemd_unitdir}/system/sockets.target.wants/security-manager.socket
}
-RDEPENDS_${PN} += "sqlite3 cynara"
-FILES_${PN} += " \
+RDEPENDS:${PN} += "sqlite3 cynara"
+FILES:${PN} += " \
${systemd_unitdir} \
${TZ_SYS_DB} \
${bindir}/.security-manager-setup \
"
PACKAGES =+ "${PN}-policy"
-FILES_${PN}-policy = " \
+FILES:${PN}-policy = " \
${datadir}/${PN} \
${bindir}/security-manager-policy-reload \
"
diff --git a/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend b/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend
index ec8435369..ba3365f12 100644
--- a/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend
+++ b/meta-app-framework/recipes-security/security-manager/security-manager_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/security-manager:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/security-manager:"
EXTRA_OECMAKE =+ " -DGLOBALUSER=afm"
@@ -6,7 +6,7 @@ SRC_URI += " \
file://0001-Adapt-rules-to-AGL.patch \
"
-do_install_append() {
+do_install:append() {
# Needed for wayland-0 socket access and memfd usage
echo "~APP~ System::Weston rw" >> ${D}${datadir}/security-manager/policy/app-rules-template.smack
echo "System::Weston ~APP~ rw" >> ${D}${datadir}/security-manager/policy/app-rules-template.smack