From: Kai Kang <kai.kang@windriver.com>
To: <pb@pbcl.net>, <laurentiu.palcu@intel.com>
Cc: openembedded-core@lists.openembedded.org
Subject: [PATCH] update-rc.d.bbclass: fix inhibit check
Date: Thu, 20 Feb 2014 10:11:09 +0800 [thread overview]
Message-ID: <1392862269-14520-2-git-send-email-kai.kang@windriver.com> (raw)
In-Reply-To: <1392862269-14520-1-git-send-email-kai.kang@windriver.com>
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>
---
meta/classes/update-rc.d.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 4b92d8d..0ac2af7 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:
--
1.8.1.2
next prev parent reply other threads:[~2014-02-20 2:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-20 2:11 [PATCH] V2: update-rc.d.bbclass: fix inhibit check Kai Kang
2014-02-20 2:11 ` Kai Kang [this message]
2014-02-21 12:24 ` [PATCH] " Burton, Ross
-- strict thread matches above, loose matches on Subject: below --
2014-02-19 10:59 Kai Kang
2014-02-19 11:43 ` Phil Blundell
2014-02-20 1:32 ` Kang Kai
2014-02-19 12:19 ` Laurentiu Palcu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1392862269-14520-2-git-send-email-kai.kang@windriver.com \
--to=kai.kang@windriver.com \
--cc=laurentiu.palcu@intel.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=pb@pbcl.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox