mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-17 04:37:19 +00:00
Code Issues Projects Releases Wiki Activity

networkmanager: fix prevous commits

Browse Source 
The wrong patches were applied:

commit c5a0460081
Author: Armin Kuster <akuster808@gmail.com>
Date:   Fri Mar 30 19:56:03 2018 -0700

    networkmanager: Fix many typos in DISTRO_FEATURES PACKAGECONFIG decodes

commit 575c14ded5
Author: Andreas Müller <schnitzeltony@gmail.com>
Date:   Thu Mar 22 18:40:52 2018 +0100

    networkmanager: fix gobject-introspection/musl and cleanup

* musl fixed (tested)
* PACKAGECONFIG systemd: Logic was broken by c5a046. To avoid
  further confusion, the expression was put into one line.
* PACKAGECONFIG wifi: The expression 'bb.utils.filter.. ' was perfectly fine.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Andreas Müller
2018-04-26 00:05:05 +02:00
committed by Armin Kuster
parent 213c47118c
commit aedf26e08a
3 changed files with 134 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb
+10 -4
View File
@@ -35,6 +35,8 @@ SRC_URI = " \
file://musl/0002-musl-dlopen-configure-ac.patch \
file://musl/0003-musl-network-support.patch \
file://musl/0004-musl-process-util.patch \
file://musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch \
file://musl/0006-Add-a-strndupa-replacement-for-musl.patch \
"
SRC_URI[md5sum] = "de3c7147a693da6f80eb22f126086a14"
SRC_URI[sha256sum] = "6af0b1e856a3725f88791f55c4fbb04105dc0b20dbf182aaec8aad16481fac76"
@@ -54,17 +56,21 @@ EXTRA_OECONF = " \
# gobject-introspection related
GI_DATA_ENABLED_libc-musl = "False"
# stolen from https://github.com/voidlinux/void-packages/blob/master/srcpkgs/NetworkManager/template
CFLAGS_libc-musl_append = " \
-DHAVE_SECURE_GETENV -Dsecure_getenv=getenv \
-D__USE_POSIX199309 -DRTLD_DEEPBIND=0 \
"
do_compile_prepend() {
export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs"
}
PACKAGECONFIG ??= "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', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wifi', '', d)} \
${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \
"
PACKAGECONFIG[systemd] = " \
--with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \
--without-systemdsystemunitdir, \