Skip to contentSkip to conversation

V2: update-rc.d.bbclass: fix inhibit check

PATCH New Kai Kang 2 participants 3 messages Feb 20, 2014 – Feb 21, 2014

lore
Share & tools
lore

Kai Kang

author
#0 lore raw

PATCH 1/1 V2: update-rc.d.bbclass: fix inhibit check

V2:
* update commit message that it is INHIBIT_UPDATERCD_BBCLASS which will not be checked

Kai Kang (1):
update-rc.d.bbclass: fix inhibit check

 meta/classes/update-rc.d.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 1/1 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.

---
 meta/classes/update-rc.d.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/update-rc.d.bbclass +1 -1
index 4b92d8d..0ac2af7 100644
@@ -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:
Signature · 1 line
1.8.1.2
Reviewed-by on v1 1/1
#2 lore raw

Re: [PATCH] update-rc.d.bbclass: fix inhibit check

Quoted 4 lines · Kai Kang

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.

Not sure what I was thinking there, well spotted.

Ross