summaryrefslogtreecommitdiff
path: root/meta/classes/update-rc.d.bbclass
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2014-02-20 10:11:09 +0800
committerSaul Wold <sgw@linux.intel.com>2014-02-20 20:06:22 -0800
commita0353102184892f09d3f97f018e457a4684550ea (patch)
treea4cdc015454b89558495f2bec87ecb2b3e628b3f /meta/classes/update-rc.d.bbclass
parentef0adae63b4b9689c25ed7d84f2b09575c81ce83 (diff)
downloadopenembedded-core-a0353102184892f09d3f97f018e457a4684550ea.tar.gz
openembedded-core-a0353102184892f09d3f97f018e457a4684550ea.tar.bz2
openembedded-core-a0353102184892f09d3f97f018e457a4684550ea.zip
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 <kai.kang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/update-rc.d.bbclass')
-rw-r--r--meta/classes/update-rc.d.bbclass2
1 files changed, 1 insertions, 1 deletions
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: