From: Laurentiu Palcu <laurentiu.palcu@intel.com>
To: Kai Kang <kai.kang@windriver.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH] update-rc.d.bbclass: fix inhibit check
Date: Wed, 19 Feb 2014 14:19:53 +0200 [thread overview]
Message-ID: <20140219121953.GD22316@lpalcu-linux> (raw)
In-Reply-To: <1392807566-15114-1-git-send-email-kai.kang@windriver.com>
On Wed, Feb 19, 2014 at 06:59:26PM +0800, Kai Kang wrote:
> In update-rc.d.bbclass it checks variable INITSCRIPT_PACKAGES to avoid
> inherit this class. But it is wrong logic to check INITSCRIPT_PACKAGES.
> When 'sysvinit' is in 'DISTRO_FEATURES', INITSCRIPT_PACKAGES will not be
> checked.
s/INITSCRIPT_PACKAGES/INHIBIT_UPDATERCD_BBCLASS/ above will make more
sense, I guess.
Because, as I see it, that 'if' will evaluate to True if 'sysvinit' is in
DISTRO_FEATURES, irrespective of how INHIBIT_UPDATERCD_BBCLASS is set...
which is a little bit wrong.
So, I think you just need to adjust the commit message.
laurentiu
>
> 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
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
next prev parent reply other threads:[~2014-02-19 12:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-19 10:59 [PATCH] update-rc.d.bbclass: fix inhibit check Kai Kang
2014-02-19 11:43 ` Phil Blundell
2014-02-20 1:32 ` Kang Kai
2014-02-19 12:19 ` Laurentiu Palcu [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-02-20 2:11 [PATCH] V2: " Kai Kang
2014-02-20 2:11 ` [PATCH] " Kai Kang
2014-02-21 12:24 ` Burton, Ross
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=20140219121953.GD22316@lpalcu-linux \
--to=laurentiu.palcu@intel.com \
--cc=kai.kang@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
/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