From dd6fc5dcaa0a027b7651bb365d5dd0f623498f8f Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
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 <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>
---
 .../recipes-security/security-manager/security-manager.inc | 14 +++++++-------
 .../security-manager/security-manager_%.bbappend           |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'meta-app-framework/recipes-security/security-manager')

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
-- 
cgit 1.2.3-korg