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 <[email protected]> > --- > 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 > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-core _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
