From 038b44be9a95f0298243cbdcaa99aeed5fa7db2c Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 25 Jan 2018 07:00:27 -0500 Subject: systemd: limit bbclass hooks to class-target scope Allow the phosphor systemd and dbus bbclasses to be inherited by recipes using BBCLASSEXTEND (native, etc). No-op in non-target recipe class context. Tested: Built an image and verified dbus and systemd unit files. Change-Id: Ib2f64233f89d05679c568527a074d9236729201f Signed-off-by: Brad Bishop --- meta-phosphor/classes/obmc-phosphor-dbus-service.bbclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'meta-phosphor/classes/obmc-phosphor-dbus-service.bbclass') diff --git a/meta-phosphor/classes/obmc-phosphor-dbus-service.bbclass b/meta-phosphor/classes/obmc-phosphor-dbus-service.bbclass index 029d26093..77fffe0ab 100644 --- a/meta-phosphor/classes/obmc-phosphor-dbus-service.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-dbus-service.bbclass @@ -124,6 +124,11 @@ python() { % (d.getVar('dbus_system_servicesdir', True), search_match)) + if d.getVar('CLASSOVERRIDE', True) != 'class-target': + return + + d.appendVarFlag('do_install', 'postfuncs', ' dbus_do_postinst') + for pkg in listvar_to_list(d, 'DBUS_PACKAGES'): if pkg not in (d.getVar('SYSTEMD_PACKAGES', True) or ''): set_append(d, 'SYSTEMD_PACKAGES', pkg) @@ -169,6 +174,4 @@ do_install_append() { done } -do_install[postfuncs] += "dbus_do_postinst" - inherit obmc-phosphor-systemd -- cgit v1.2.3