diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-08-02 17:10:51 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-11-20 00:33:16 +0000 |
| commit | bad73bf315325c3428e331984f9d17bb8b2873b3 (patch) | |
| tree | f1af509d2d534d7232ab63304faf52e549fbaeca /meta-app-framework/recipes-security/security-manager/security-manager.inc | |
| parent | 5f1d801530f9b3d7f99826b4cc8cc23df77d1e42 (diff) | |
Convert to new override syntax
This is effectively a manual cherry-pick and squash of commits:
dd6fc5dcaa0a027b7651bb365d5dd0f623498f8f
917a82316bf53ead29d6345a39189d9e4efeef25
20e81c0a9d36660de671dd5ac2e006e31c0e621b
from the master branch with additional review and fixups.
The intent of these changes is to minimize the effort to backport
fixes from the master branch, which has been updated in preparation
for the switch to the next Yocto LTS release in early 2022.
Bug-AGL: SPEC-4144
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I91c1640c6335d7748a2531d2fe8bf86d2d2aee32
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26876
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/security-manager/security-manager.inc')
| -rw-r--r-- | meta-app-framework/recipes-security/security-manager/security-manager.inc | 14 |
1 files changed, 7 insertions, 7 deletions
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 \ " |