diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-03-30 19:56:03 -0700 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2018-04-25 15:53:45 -0400 |
commit | c5a04600817e0d34dfa151d46073a76b506b4c3d (patch) | |
tree | 9756d8d028ed95e800a4f2ba0391364eac7a029a /meta-networking | |
parent | 575c14ded56e1e97582a6df0921d19b4da630961 (diff) | |
download | meta-openembedded-c5a04600817e0d34dfa151d46073a76b506b4c3d.tar.gz |
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 argument: 'd'
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb | 7 |
1 files 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 f201a75a0a..d90b782682 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() { | |||
59 | } | 59 | } |
60 | 60 | ||
61 | PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ | 61 | PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ |
62 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', \ | 62 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ |
63 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ | 63 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)} \ |
64 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ | 64 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ |
65 | ${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \ | 65 | ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wifi', '', d)} \ |
66 | " | 66 | " |
67 | |||
67 | PACKAGECONFIG[systemd] = " \ | 68 | PACKAGECONFIG[systemd] = " \ |
68 | --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ | 69 | --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ |
69 | --without-systemdsystemunitdir, \ | 70 | --without-systemdsystemunitdir, \ |