[oe-commits] [meta-openembedded] 07/12: networkmanager: Fix many typos in DISTRO_FEATURES PACKAGECONFIG decodes

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

armin_kuster pushed a commit to branch master-next
in repository meta-openembedded.

commit 45cd132ff9d64902eb0152b5a3ee4c1a1c9504f5
Author: Armin Kuster <akuster808 at gmail.com>
AuthorDate: Fri Mar 30 19:56:03 2018 -0700

    networkmanager: Fix many typos in DISTRO_FEATURES PACKAGECONFIG decodes
    
    fixes issues found with yocto-check-layer
    
     File "/home/akuster/oss/maint/openembedded-core/bitbake/lib/bb/data_smart.py", line 436, in DataSmart.expand(s="nss ifupdown netconfig dhclient dnsmasq     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}     ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}     ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', '', d)} ", varname='PACKAGECONFIG'):
             def expand(self, s, varname = None):
        >        return self.expandWithRefs(s, varname).value
    
      File "/home/akuster/oss/maint/openembedded-core/bitbake/lib/bb/data_smart.py", line 426, in DataSmart.expandWithRefs(s="nss ifupdown netconfig dhclient dnsmasq     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}     ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)}     ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', '', d)} ", varname='PACKAGECONFIG'):
                     except Exception as exc:
        >                raise ExpansionError(varname, s, exc) from exc
    
    bb.data_smart.ExpansionError: Failure expanding variable PACKAGECONFIG, expression was nss ifupdown netconfig dhclient dnsmasq     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}     ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)}     ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', '', d)}  which triggered exception TypeError: contains() missing 1 required positional a [...]
    
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 .../recipes-connectivity/networkmanager/networkmanager_1.10.6.bb   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb
index f201a75..d90b782 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb
@@ -59,11 +59,12 @@ do_compile_prepend() {
 }
 
 PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
-    ${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wifi', '', d)} \
 "
+
 PACKAGECONFIG[systemd] = " \
     --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \
     --without-systemdsystemunitdir, \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.