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 <akuster...@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, \
--
2.7.4
--
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
