summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2014-02-20 10:11:09 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-21 16:09:07 +0000
commit27b81efd3aa35f27456820634b5bbb0f764c7e8f (patch)
tree96833257fa24bc6272afbad7582ec0f3870bde88
parentdf520a68569d192b7daab1e35a360c6ff0e381ca (diff)
downloadpoky-27b81efd3aa35f27456820634b5bbb0f764c7e8f.tar.gz
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. (From OE-Core rev: a0353102184892f09d3f97f018e457a4684550ea) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 () {
117 117
118 # Check that this class isn't being inhibited (generally, by 118 # Check that this class isn't being inhibited (generally, by
119 # systemd.bbclass) before doing any work. 119 # systemd.bbclass) before doing any work.
120 if oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) or \ 120 if oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) and \
121 not d.getVar("INHIBIT_UPDATERCD_BBCLASS", True): 121 not d.getVar("INHIBIT_UPDATERCD_BBCLASS", True):
122 pkgs = d.getVar('INITSCRIPT_PACKAGES', True) 122 pkgs = d.getVar('INITSCRIPT_PACKAGES', True)
123 if pkgs == None: 123 if pkgs == None: