From: Kai Kang Date: Thu, 20 Feb 2014 02:11:09 +0000 (+0800) Subject: update-rc.d.bbclass: fix inhibit check X-Git-Tag: 2015-4~3577 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a0353102184892f09d3f97f018e457a4684550ea;p=openembedded-core.git update-rc.d.bbclass: fix inhibit check In update-rc.d.bbclass it checks variable INHIBIT_UPDATERCD_BBCLASS to inhibit from inheriting this class. But it is wrong logic that when 'sysvinit' is in 'DISTRO_FEATURES', INHIBIT_UPDATERCD_BBCLASS will not be checked. Replace 'or' with 'and' to fix it. Signed-off-by: Kai Kang Signed-off-by: Saul Wold --- diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 4b92d8d6f1..0ac2af7d97 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass @@ -117,7 +117,7 @@ python populate_packages_updatercd () { # Check that this class isn't being inhibited (generally, by # systemd.bbclass) before doing any work. - if oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) or \ + if oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) and \ not d.getVar("INHIBIT_UPDATERCD_BBCLASS", True): pkgs = d.getVar('INITSCRIPT_PACKAGES', True) if pkgs == None: