diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/0001-networkmanager-trigger-dispatcher-on-per-device-conn.patch b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/0001-networkmanager-trigger-dispatcher-on-per-device-conn.patch index dd383515a..a26c8fabc 100644 --- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/0001-networkmanager-trigger-dispatcher-on-per-device-conn.patch +++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/0001-networkmanager-trigger-dispatcher-on-per-device-conn.patch @@ -1,5 +1,5 @@ -From: Javier Viguera -Date: Thu, 9 Nov 2017 11:49:14 +0100 +From: Arturo Buzarra +Date: Mon, 21 Jan 2019 11:30:57 +0100 Subject: [PATCH] networkmanager: trigger dispatcher on per-device connectivity loss @@ -9,15 +9,16 @@ check, regardless of the system having connectivity through a different interface. Signed-off-by: Javier Viguera +Signed-off-by: Arturo Buzarra --- shared/nm-dispatcher-api.h | 1 + - src/devices/nm-device.c | 3 +++ - src/nm-dispatcher.c | 40 +++++++++++++++++++++++++++++++++++++++- - src/nm-dispatcher.h | 9 ++++++++- - 4 files changed, 51 insertions(+), 2 deletions(-) + src/devices/nm-device.c | 4 ++++ + src/nm-dispatcher.c | 40 +++++++++++++++++++++++++++++++++++++- + src/nm-dispatcher.h | 10 +++++++++- + 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/shared/nm-dispatcher-api.h b/shared/nm-dispatcher-api.h -index b1f28e71d4c3..e83835b03057 100644 +index b1f28e71d..e83835b03 100644 --- a/shared/nm-dispatcher-api.h +++ b/shared/nm-dispatcher-api.h @@ -50,6 +50,7 @@ @@ -25,28 +26,29 @@ index b1f28e71d4c3..e83835b03057 100644 #define NMD_ACTION_DHCP6_CHANGE "dhcp6-change" #define NMD_ACTION_CONNECTIVITY_CHANGE "connectivity-change" +#define NMD_ACTION_DEVICE_CONNECTIVITY_CHANGE "device-connectivity-change" - + typedef enum { DISPATCH_RESULT_UNKNOWN = 0, diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c -index fbf315ed3bc8..503c4689b035 100644 +index f2dbe6594..865e68bd9 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c -@@ -1824,6 +1824,9 @@ update_connectivity_state (NMDevice *self, NMConnectivityState state) - nm_connectivity_state_to_string (priv->connectivity_state), - nm_connectivity_state_to_string (state)); - #endif -+ if (priv->connectivity_state == NM_CONNECTIVITY_FULL) -+ nm_dispatcher_call_device_connectivity(state, self, NULL, NULL, NULL); +@@ -2771,6 +2771,10 @@ concheck_update_state (NMDevice *self, NMConnectivityState state, gboolean allow + _LOGD (LOGD_CONCHECK, "connectivity state changed from %s to %s", + nm_connectivity_state_to_string (priv->connectivity_state), + nm_connectivity_state_to_string (state)); + - priv->connectivity_state = state; - _notify (self, PROP_CONNECTIVITY); - ++ if (priv->connectivity_state == NM_CONNECTIVITY_FULL) ++ nm_dispatcher_call_device_connectivity(state, self, NULL, NULL, NULL); ++ + priv->connectivity_state = state; + + _notify (self, PROP_CONNECTIVITY); diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c -index 0d482e0cad9d..8e3f95c0b819 100644 +index 368b781ad..a49b3ea61 100644 --- a/src/nm-dispatcher.c +++ b/src/nm-dispatcher.c -@@ -453,7 +453,8 @@ static const char *action_table[] = { +@@ -467,7 +467,8 @@ static const char *action_table[] = { [NM_DISPATCHER_ACTION_VPN_DOWN] = NMD_ACTION_VPN_DOWN, [NM_DISPATCHER_ACTION_DHCP4_CHANGE] = NMD_ACTION_DHCP4_CHANGE, [NM_DISPATCHER_ACTION_DHCP6_CHANGE] = NMD_ACTION_DHCP6_CHANGE, @@ -54,12 +56,12 @@ index 0d482e0cad9d..8e3f95c0b819 100644 + [NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE] = NMD_ACTION_CONNECTIVITY_CHANGE, + [NM_DISPATCHER_ACTION_DEVICE_CONNECTIVITY_CHANGE] = NMD_ACTION_DEVICE_CONNECTIVITY_CHANGE }; - + static const char * -@@ -903,6 +904,43 @@ nm_dispatcher_call_connectivity (NMConnectivityState connectivity_state, +@@ -915,6 +916,43 @@ nm_dispatcher_call_connectivity (NMConnectivityState connectivity_state, callback, user_data, out_call_id); } - + +/** + * nm_dispatcher_call_device_connectivity(): + * @connectivity_state: the #NMConnectivityState value @@ -101,7 +103,7 @@ index 0d482e0cad9d..8e3f95c0b819 100644 nm_dispatcher_call_cancel (guint call_id) { diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h -index 4448e8173fa7..9902a77ba683 100644 +index 1cdeeb882..9902a77ba 100644 --- a/src/nm-dispatcher.h +++ b/src/nm-dispatcher.h @@ -36,7 +36,8 @@ typedef enum { @@ -112,18 +114,19 @@ index 4448e8173fa7..9902a77ba683 100644 + NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE, + NM_DISPATCHER_ACTION_DEVICE_CONNECTIVITY_CHANGE } NMDispatcherAction; - + typedef void (*NMDispatcherFunc) (guint call_id, gpointer user_data); -@@ -82,6 +83,12 @@ gboolean nm_dispatcher_call_connectivity (NMConnectivityState state, +@@ -82,6 +83,13 @@ gboolean nm_dispatcher_call_connectivity (NMConnectivityState state, gpointer user_data, guint *out_call_id); - + +gboolean nm_dispatcher_call_device_connectivity(NMConnectivityState + connectivity_state, + NMDevice *device, + NMDispatcherFunc callback, + gpointer user_data, + guint *out_call_id); - ++ void nm_dispatcher_call_cancel (guint call_id); - + + void nm_dispatcher_init (void); diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend index 3e621dda6..c728062e1 100644 --- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend +++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend @@ -24,9 +24,9 @@ PACKAGECONFIG_remove = "consolekit" # Adjust other compile time options to save space PACKAGECONFIG_remove = "netconfig nss" -PACKAGECONFIG_append = " concheck gnutls modemmanager ppp" +PACKAGECONFIG_append = " gnutls modemmanager ppp" -EXTRA_OECONF_append = " --disable-introspection" +EXTRA_OECONF_append = " --disable-introspection --enable-concheck" # # NetworkManager only accepts IP addresses in CIDR format @@ -94,3 +94,7 @@ do_install_append() { # NetworkManager needs to be started after DBUS INITSCRIPT_NAME = "networkmanager" INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 80 0 6 1 ." + +FILES_${PN} += " \ + ${libdir}/pppd/*/nm-pppd-plugin.so \ +" diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.8.2.bb b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.8.2.bb deleted file mode 100644 index 71aa184a5..000000000 --- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.8.2.bb +++ /dev/null @@ -1,117 +0,0 @@ -SUMMARY = "NetworkManager is a network management framework" -DESCRIPTION = "NetworkManager is a system network service that manages \ -your network devices and connections, attempting to keep active network \ -connectivity when available." -HOMEPAGE = "http://www.gnome.org/projects/NetworkManager/" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ - file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \ - file://docs/api/html/license.html;md5=eb0c003714e5391000fdfd9c9615cccf \ -" - -DEPENDS = " \ - intltool-native \ - libnl \ - dbus \ - dbus-glib \ - dbus-glib-native \ - libgudev \ - util-linux \ - libndp \ - libnewt \ - polkit \ - jansson \ - python3-pygobject-native \ -" - -inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection - -SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz" -SRC_URI[md5sum] = "1acf7a551905ae85d9987aadbb5f7205" -SRC_URI[sha256sum] = "71a5efcd9e4c237ab57b2893ccc8f91f884ace3bec0e2bd4b31a4c9677ff1bf4" - -S = "${WORKDIR}/NetworkManager-${PV}" - -PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wifi', '', d)} \ -" -PACKAGECONFIG[systemd] = " \ - --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \ - --without-systemdsystemunitdir, \ - polkit \ -" -PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5" -# consolekit is not picked by shlibs, so add it to RDEPENDS too -PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit" -PACKAGECONFIG[concheck] = "--enable-concheck,--disable-concheck,curl" -PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager" -PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp" -# Use full featured dhcp client instead of internal one -PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client" -PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq" -PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" -PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls" -PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant wireless-tools" -PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" -PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no" -PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" - -EXTRA_OECONF = " \ - --disable-ifcfg-rh \ - --disable-ifnet \ - --disable-ifcfg-suse \ - --disable-more-warnings \ - --with-iptables=${sbindir}/iptables \ - --with-tests \ - --with-nmtui=yes \ - --with-udev-dir=${base_libdir}/udev \ -" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" -} - -PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-nmtui ${PN}-nmtui-doc ${PN}-adsl" - -FILES_libnmutil += "${libdir}/libnm-util.so.*" -FILES_libnmglib += "${libdir}/libnm-glib.so.*" -FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*" - -FILES_${PN}-adsl = "${libdir}/NetworkManager/libnm-device-plugin-adsl.so" - -FILES_${PN} += " \ - ${libexecdir} \ - ${libdir}/pppd/*/nm-pppd-plugin.so \ - ${libdir}/NetworkManager/*.so \ - ${libdir}/NetworkManager/conf.d \ - ${libdir}/NetworkManager/VPN \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${base_libdir}/udev/* \ - ${systemd_unitdir}/system \ -" - -FILES_${PN}-dev += " \ - ${datadir}/NetworkManager/gdb-cmd \ - ${libdir}/pppd/*/*.la \ - ${libdir}/NetworkManager/*.la \ -" - -FILES_${PN}-nmtui = " \ - ${bindir}/nmtui \ - ${bindir}/nmtui-edit \ - ${bindir}/nmtui-connect \ - ${bindir}/nmtui-hostname \ -" - -FILES_${PN}-nmtui-doc = " \ - ${mandir}/man1/nmtui* \ -" - -RRECOMMENDS_${PN} += "iptables ${@bb.utils.contains('PACKAGECONFIG', 'dnsmasq', 'dnsmasq', '', d)}" -RCONFLICTS_${PN} = "connman" - -SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service"