Skip to contentSkip to conversation

network/modemmanager updates

PATCH Superseded Adrian Freihofer 3 participants 21 messages Nov 10, 2015 – Dec 18, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover network/modemmanager updates

Update networkmanager and modemmanager to latest upstream version Add fedora patches
Add PACKAGECONFIGs to support smaller images: ~17MB in total, ~13MB for gnutls (The default configuration is not changed by the new PACKAGECONFIGs.) Add networkmanager plugin for openvpn.
Provide package for nmtui.

Adrian Freihofer (17):
libqmi: update to 1.12.6
modemmanager: Update to 1.4.12
modemmanager: Add PACKAGECONFIGs
modemmanager: add dbus config
modemmanager: Start always
networkmanager: Update to 1.0.6
networkmanager: support gnutls and nss
networkmanager: add fedora bugfix patches
networkmanager: Add package for nmtui
networkmanager: run dispatcher
networkmanager: PACKAGECONFIG for ifupdown netconfig
networkmanager: PACKAGECONFIG for dhclient
networkmanager: PACKAGECONFIG for dnsmasq
networkmanager: PACKAGECONFIG for wifi
networkmanager: PACKAGECONFIG for adsl
networkmanager: use bluetooth from distro
networkmanager: add openvpn plugin

 .../libqmi/{libqmi_1.12.2.bb => libqmi_1.12.6.bb}  |   4 +-
 .../modemmanager/modemmanager_1.4.12.bb            |  53 +++++++
 .../modemmanager/modemmanager_1.4.2.bb             |  40 -----
 .../networkmanager/networkmanager-openvpn_1.0.6.bb |  43 ++++++
 .../0002-add-pkg-config-for-libgcrypt.patch        |  41 ++++++
 ...ix-parse-commandline-options-into-correct.patch |  35 +++++
 ...-vpn-connection-fix-unsetting-the-gateway.patch |  30 ++++
 ...tion-set-the-MTU-for-the-VPN-IP-interface.patch |  54 +++++++
 ...t-reset-NM_UNMANAGED_DEFAULT-when-platfor.patch |  33 +++++
 .../0007-nmcli-crash-vlan-priorities.patch         |  35 +++++
 .../0008-nmtui-fix-crash-in-secret-agent.patch     |  88 +++++++++++
 .../rh1175446-vpn-secondaries-connections.patch    |  57 ++++++++
 .../rh1261428-ipv6-ignore-auto-dns.patch           |  37 +++++
 .../rh1263185-nmcli-con-add-generic.patch          |  44 ++++++
 .../rh1263959-modem-supported-ip-families.patch    |  62 ++++++++
 .../rh1264676-fix-crash-on-device-removal.patch    |  80 ++++++++++
 .../rh1265993-nmcli-allow-ipv6-ppp-for-wwan.patch  |  46 ++++++
 ...rh1266003-fix-crash-on-bss-proxy-acquired.patch |  48 ++++++
 .../rh1272974-fix-s390-ctc-detection.patch         |  57 ++++++++
 .../rh1277693-vpn-service-timer.patch              | 161 +++++++++++++++++++++
 .../networkmanager/networkmanager_1.0.4.bb         |  90 ------------
 .../networkmanager/networkmanager_1.0.6.bb         | 141 ++++++++++++++++++
 22 files changed, 1147 insertions(+), 132 deletions(-)
 rename meta-oe/recipes-connectivity/libqmi/{libqmi_1.12.2.bb => libqmi_1.12.6.bb} (80%)
 create mode 100644 meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb
 delete mode 100644 meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.2.bb
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.0.6.bb
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-add-pkg-config-for-libgcrypt.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-config-bugfix-parse-commandline-options-into-correct.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-vpn-connection-fix-unsetting-the-gateway.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-vpn-connection-set-the-MTU-for-the-VPN-IP-interface.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0006-device-don-t-reset-NM_UNMANAGED_DEFAULT-when-platfor.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0007-nmcli-crash-vlan-priorities.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0008-nmtui-fix-crash-in-secret-agent.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1175446-vpn-secondaries-connections.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1261428-ipv6-ignore-auto-dns.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1263185-nmcli-con-add-generic.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1263959-modem-supported-ip-families.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1264676-fix-crash-on-device-removal.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1265993-nmcli-allow-ipv6-ppp-for-wwan.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1266003-fix-crash-on-bss-proxy-acquired.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1272974-fix-s390-ctc-detection.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1277693-vpn-service-timer.patch
 delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.4.bb
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
Signature · 1 line
2.4.3
#1 lore raw

PATCH 1/17 libqmi: update to 1.12.6

ModemManager 1.4.12 needs at least qmi-glib version 1.12.4

---
 .../libqmi/{libqmi_1.12.2.bb => libqmi_1.12.6.bb}                     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-connectivity/libqmi/{libqmi_1.12.2.bb => libqmi_1.12.6.bb} (80%)
meta-oe/recipes-connectivity/libqmi/libqmi_1.12.6.bb renamed from meta-oe/recipes-connectivity/libqmi/libqmi_1.12.2.bb +2 -2
similarity index 80%
rename from meta-oe/recipes-connectivity/libqmi/libqmi_1.12.2.bb
rename to meta-oe/recipes-connectivity/libqmi/libqmi_1.12.6.bb
index 789692b..7a15527 100644
@@ -12,5 +12,5 @@ DEPENDS = "glib-2.0"
 inherit autotools pkgconfig
 
 SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "5b3b6b37a57e2fa828fd4cb6f86d7a9f"
-SRC_URI[sha256sum] = "d1661d73b510482b29b93b7e396756c433d35360b3d44c72afa7921339a98624"
+SRC_URI[md5sum] = "24c9eb300662ba6cff0152de89bd9ec0"
+SRC_URI[sha256sum] = "0857bffece4e8ddfa7f721dd9ca63b4c78de345ac9ae2faebf04062cacba3780"
Signature · 1 line
2.4.3
#2 lore raw

PATCH 2/17 modemmanager: Update to 1.4.12

In reply to Adrian Freihofer

- Fixes segfaults, memleaks and other bugs
- Support more modems

---
 .../{modemmanager_1.4.2.bb => modemmanager_1.4.12.bb}        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-connectivity/modemmanager/{modemmanager_1.4.2.bb => modemmanager_1.4.12.bb} (71%)
meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb renamed from meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.2.bb +6 -6
similarity index 71%
rename from meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.2.bb
rename to meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb
index b273c91..db7a28d 100644
@@ -1,19 +1,19 @@
 SUMMARY = "ModemManager is a daemon controlling broadband devices/connections"
 DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections"
 HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/"
-LICENSE = "GPLv2 & LGPLv2.1"
+LICENSE = "GPL-2.0 & LGPL-2.1"
 LIC_FILES_CHKSUM = " \
     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "
 
-inherit autotools gettext gtk-doc systemd
+inherit gnomebase gettext systemd
 
-DEPENDS = "glib-2.0 libmbim libqmi polkit libgudev dbus-glib"
+DEPENDS = "glib-2.0 libmbim libqmi (>=1.12.4) polkit libgudev dbus-glib"
 
-SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-SRC_URI[md5sum] = "fe74eaa9a77e51e552b4356b4c7195cb"
-SRC_URI[sha256sum] = "07d332fbe6f45f788f740810951e04042aaf023bd5ecf8ef0b3a06e37703585d"
+SRC_URI = "${GNOME_MIRROR}/ModemManager/ModemManager-${PV}.tar.xz"
+SRC_URI[md5sum] = "66cc7266b15525cb366253e6639fc564"
+SRC_URI[sha256sum] = "7ef5035375a953b285a742591df0a65fd442f4641ce4d8f4392a41d6d6bc70b3" 
 
 S = "${WORKDIR}/ModemManager-${PV}"
 
Signature · 1 line
2.4.3
#3 lore raw

PATCH 3/17 modemmanager: Add PACKAGECONFIGs

In reply to Adrian Freihofer
---
 .../modemmanager/modemmanager_1.4.12.bb                 | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)
meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb +16 -1
index db7a28d..1d630a9 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \
 
 inherit gnomebase gettext systemd
 
-DEPENDS = "glib-2.0 libmbim libqmi (>=1.12.4) polkit libgudev dbus-glib"
+DEPENDS = "glib-2.0 libgudev dbus-glib" 
 
 SRC_URI = "${GNOME_MIRROR}/ModemManager/ModemManager-${PV}.tar.xz"
 SRC_URI[md5sum] = "66cc7266b15525cb366253e6639fc564"
@@ -17,6 +17,21 @@ SRC_URI[sha256sum] = "7ef5035375a953b285a742591df0a65fd442f4641ce4d8f4392a41d6d6
 
 S = "${WORKDIR}/ModemManager-${PV}"
 
+# If you need a different configuration for modemmanager, add a statement
+# similar to the following example to your local.conf or distro config
+# PACKAGECONFIG_pn-modemmanager = "mbim qmi"
+PACKAGECONFIG ??= "mbim qmi polkit"
+
+EXTRA_OECONF = " \
+  ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '', d)} \
+"
+PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit"
+# Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol.
+PACKAGECONFIG[mbim] = "--with-mbim,--enable-mbim=no,libmbim,libmbim"
+# Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol.
+PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi (>=1.12.4),libqmi (>=1.12.4)"
+
+
 FILES_${PN} += " \
     ${datadir}/icons \
     ${datadir}/polkit-1 \
Signature · 1 line
2.4.3
#4 lore raw

PATCH 4/17 modemmanager: add dbus config

In reply to Adrian Freihofer
---
 meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb +1 -1
index 1d630a9..78ac6e2 100644
@@ -35,12 +35,12 @@ PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi (>=1.12.4),libqmi (>=1.12.
 FILES_${PN} += " \
     ${datadir}/icons \
     ${datadir}/polkit-1 \
+    ${datadir}/dbus-1 \
     ${libdir}/ModemManager \
     ${systemd_unitdir}/system \
 "
 
 FILES_${PN}-dev += " \
-    ${datadir}/dbus-1 \
     ${libdir}/ModemManager/*.la \
 "
 
Signature · 1 line
2.4.3
#5 lore raw

PATCH 5/17 modemmanager: Start always

In reply to Adrian Freihofer
---
 meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb | 2 --
 1 file changed, 2 deletions(-)
meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb +0 -2
index 78ac6e2..948b800 100644
@@ -51,5 +51,3 @@ FILES_${PN}-staticdev += " \
 FILES_${PN}-dbg += "${libdir}/ModemManager/.debug"
 
 SYSTEMD_SERVICE_${PN} = "ModemManager.service"
-# no need to start on boot - dbus will start on demand
-SYSTEMD_AUTO_ENABLE = "disable"
Signature · 1 line
2.4.3
#6 lore raw

PATCH 6/17 networkmanager: Update to 1.0.6

In reply to Adrian Freihofer
---
 ...tworkmanager_1.0.4.bb => networkmanager_1.0.6.bb} | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-connectivity/networkmanager/{networkmanager_1.0.4.bb => networkmanager_1.0.6.bb} (81%)
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb renamed from meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.4.bb +14 -6
similarity index 81%
rename from meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.4.bb
rename to meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb
index 310a83b..d529b4a 100644
@@ -2,18 +2,21 @@ SUMMARY = "NetworkManager"
 SECTION = "net/misc"
 
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b"
+LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
+                    file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
+                    file://docs/api/html/license.html;md5=51d7fb67bde992e58533a8481cee070b"
 
 DEPENDS = "libnl dbus dbus-glib libgudev wireless-tools nss util-linux libndp"
 
-inherit gnome gettext systemd
+inherit gnomebase gettext systemd
 
 SRC_URI = " \
     ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
     file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
 "
-SRC_URI[md5sum] = "7eabef7bd3bbdd6dc0473dd32aeac924"
-SRC_URI[sha256sum] = "e4099fa2f4f4b8d95d0ad9fdd03ec20960845085fa500bf79aecbf54cee018c9"
+
+SRC_URI[md5sum] = "00f5f9ec69725a9f9b99366853c6f73e"
+SRC_URI[sha256sum] = "38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd"
 
 S = "${WORKDIR}/NetworkManager-${PV}"
 
@@ -31,15 +34,15 @@ EXTRA_OECONF = " \
     --with-dnsmasq=${bindir}/dnsmasq \
 "
 
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
 PACKAGECONFIG[systemd] = " \
     --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \
     --without-systemdsystemunitdir, \
     polkit \
 "
 # consolekit is not picked by shlibs, so add it to RDEPENDS too
-PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
 PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
+PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
 PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4"
 PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager"
 PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp"
@@ -73,8 +76,13 @@ FILES_${PN}-dbg += " \
 "
 
 FILES_${PN}-dev += " \
+    ${datadir}/NetworkManager/gdb-cmd \
+"
+
+FILES_${PN}-staticdev += " \
     ${libdir}/pppd/*/*.la \
     ${libdir}/NetworkManager/*.la \
+    ${libdir}/*.la \
 "
 
 FILES_${PN}-tests = " \
Signature · 1 line
2.4.3
#7 lore raw

PATCH 7/17 networkmanager: support gnutls and nss

In reply to Adrian Freihofer
---
 .../0002-add-pkg-config-for-libgcrypt.patch        | 41 ++++++++++++++++++++++
 .../networkmanager/networkmanager_1.0.6.bb         | 14 ++++++--
 2 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-add-pkg-config-for-libgcrypt.patch
meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-add-pkg-config-for-libgcrypt.patch new file +41 -0
new file mode 100644
index 0000000..bb95eaa
@@ -0,0 +1,41 @@
+From a9261fee4a41045c42e0d292237cee532e11982c Mon Sep 17 00:00:00 2001
+From: Adrian <[email protected]>
+Date: Thu, 27 Nov 2014 15:43:26 +0100
+Subject: [PATCH] add pkg config for libgcrypt
+
+---
+ configure.ac | 18 +++++++-----------
+ 1 file changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 94b0758..654a015 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -480,17 +480,13 @@ if test x"$ac_crypto" = xnss; then
+   with_nss=yes
+ elif test x"$ac_crypto" = xgnutls; then
+   PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.2])
+-  AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
+-  if test x"$LIBGCRYPT_CONFIG" = xno; then
+-    AC_MSG_ERROR([gnutls explicitly requested but gcrypt not found on system])
+-  else
+-    AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have libgnutls])
+-    LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
+-    LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
+-    AC_SUBST(LIBGCRYPT_CFLAGS)
+-    AC_SUBST(LIBGCRYPT_LIBS)
+-    with_gnutls=yes
+-  fi
++  AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have libgnutls])
++  PKG_CHECK_MODULES(LIBGCRYPT, [libgcrypt >= 1.1.42], [
++      AC_DEFINE(HAVE_GCRYPT, 1, [Define if gcrypt library is available.])
++      with_gnutls=yes
++    ], [
++      AC_MSG_ERROR([gnutls explicitly requested but gcrypt not found on system])
++    ])
+ else
+   AC_MSG_ERROR([Please choose either 'nss' or 'gnutls' for certificate and crypto operations])
+ fi
+-- 
+1.9.1
+
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +11 -3
index d529b4a..3d3f63e 100644
@@ -6,13 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
                     file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
                     file://docs/api/html/license.html;md5=51d7fb67bde992e58533a8481cee070b"
 
-DEPENDS = "libnl dbus dbus-glib libgudev wireless-tools nss util-linux libndp"
+DEPENDS = "libnl dbus dbus-glib libgudev wireless-tools util-linux libndp"
 
 inherit gnomebase gettext systemd
 
 SRC_URI = " \
     ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
     file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
+    file://0002-add-pkg-config-for-libgcrypt.patch \
 "
 
 SRC_URI[md5sum] = "00f5f9ec69725a9f9b99366853c6f73e"
@@ -26,7 +27,6 @@ EXTRA_OECONF = " \
     --disable-ifnet \
     --disable-ifcfg-suse \
     --with-netconfig \
-    --with-crypto=nss \
     --disable-more-warnings \
     --with-dhclient=${base_sbindir}/dhclient \
     --with-iptables=${sbindir}/iptables \
@@ -34,7 +34,13 @@ EXTRA_OECONF = " \
     --with-dnsmasq=${bindir}/dnsmasq \
 "
 
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
+# If you need a different configuration for networkmanager, add a line similar to
+# the following examples to your local.conf or distro config
+# PACKAGECONFIG_pn-networkmanager = "systemd gnutls"
+# PACKAGECONFIG_append_pn-networkmanager = " modemmanager ppp"
+PACKAGECONFIG ??= "nss \
+    ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
+"
 PACKAGECONFIG[systemd] = " \
     --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \
     --without-systemdsystemunitdir, \
@@ -46,6 +52,8 @@ PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
 PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4"
 PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager"
 PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp"
+PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
+PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt,gnutls libgcrypt"
 
 PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion"
 
Signature · 1 line
2.4.3
#8 lore raw

PATCH 8/17 networkmanager: add fedora bugfix patches

In reply to Adrian Freihofer
---
 ...ix-parse-commandline-options-into-correct.patch |  35 +++++
 ...-vpn-connection-fix-unsetting-the-gateway.patch |  30 ++++
 ...tion-set-the-MTU-for-the-VPN-IP-interface.patch |  54 +++++++
 ...t-reset-NM_UNMANAGED_DEFAULT-when-platfor.patch |  33 +++++
 .../0007-nmcli-crash-vlan-priorities.patch         |  35 +++++
 .../0008-nmtui-fix-crash-in-secret-agent.patch     |  88 +++++++++++
 .../rh1175446-vpn-secondaries-connections.patch    |  57 ++++++++
 .../rh1261428-ipv6-ignore-auto-dns.patch           |  37 +++++
 .../rh1263185-nmcli-con-add-generic.patch          |  44 ++++++
 .../rh1263959-modem-supported-ip-families.patch    |  62 ++++++++
 .../rh1264676-fix-crash-on-device-removal.patch    |  80 ++++++++++
 .../rh1265993-nmcli-allow-ipv6-ppp-for-wwan.patch  |  46 ++++++
 ...rh1266003-fix-crash-on-bss-proxy-acquired.patch |  48 ++++++
 .../rh1272974-fix-s390-ctc-detection.patch         |  57 ++++++++
 .../rh1277693-vpn-service-timer.patch              | 161 +++++++++++++++++++++
 .../networkmanager/networkmanager_1.0.6.bb         |  15 ++
 16 files changed, 882 insertions(+)
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-config-bugfix-parse-commandline-options-into-correct.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-vpn-connection-fix-unsetting-the-gateway.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-vpn-connection-set-the-MTU-for-the-VPN-IP-interface.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0006-device-don-t-reset-NM_UNMANAGED_DEFAULT-when-platfor.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0007-nmcli-crash-vlan-priorities.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0008-nmtui-fix-crash-in-secret-agent.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1175446-vpn-secondaries-connections.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1261428-ipv6-ignore-auto-dns.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1263185-nmcli-con-add-generic.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1263959-modem-supported-ip-families.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1264676-fix-crash-on-device-removal.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1265993-nmcli-allow-ipv6-ppp-for-wwan.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1266003-fix-crash-on-bss-proxy-acquired.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1272974-fix-s390-ctc-detection.patch
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1277693-vpn-service-timer.patch
meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-config-bugfix-parse-commandline-options-into-correct.patch new file +35 -0
new file mode 100644
index 0000000..0457c8d
@@ -0,0 +1,35 @@
+From 8a22a98157f7f6773f3d1f295419569c6c880a47 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ulrich=20=C3=96lmann?= <[email protected]>
+Date: Thu, 27 Aug 2015 22:18:55 +0200
+Subject: [PATCH] config: bugfix: parse commandline options into correct object
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Config related commandline options should be parsed into a function argument but
+were instead parsed into an object with local scope. As a result none of them
+had any impact.
+
+Signed-off-by: Ulrich Ölmann <[email protected]>
+
+Fixes: b4ad7434a87c165a77b615accbe1868a9df9221b
+
+https://mail.gnome.org/archives/networkmanager-list/2015-August/msg00033.html
+---
+ src/main.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/main.c b/src/main.c
+index 495262e..a9bc479 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -246,7 +246,6 @@ do_early_setup (int *argc, char **argv[], NMConfigCmdLineOptions *config_cli)
+ 		{NULL}
+ 	};
+ 
+-	config_cli = nm_config_cmd_line_options_new ();
+ 	if (!nm_main_utils_early_setup ("NetworkManager",
+ 	                                argc,
+ 	                                argv,
+-- 
+2.4.3
meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-vpn-connection-fix-unsetting-the-gateway.patch new file +30 -0
new file mode 100644
index 0000000..abd0739
@@ -0,0 +1,30 @@
+From 15e4ee69dfeec8dd3670da262c11306de7488156 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <[email protected]>
+Date: Wed, 2 Sep 2015 19:19:18 +0200
+Subject: [PATCH 3/4] vpn-connection: fix unsetting the gateway
+
+Addresses the clash between the two commits which would cause the parent device
+gateway to be overwritten with 0.0.0.0 upon route-based VPN activation:
+
+Fixes: 063677101ab7d43a9aa94c70eb1ca3a201269043
+Fixes: 1465c1d3260712fbe2fd0c78c7a1fcf0fb8ce753
+(cherry picked from commit da2ae8ce4e6cb03931454d7d6fa94866b03f6be2)
+---
+ src/vpn-manager/nm-vpn-connection.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c
+index c34155e..f0e6149 100644
+--- a/src/vpn-manager/nm-vpn-connection.c
++++ b/src/vpn-manager/nm-vpn-connection.c
+@@ -933,7 +933,7 @@ apply_parent_device_config (NMVpnConnection *connection)
+ 		 * default route. */
+ 		if (vpn4_parent_config) {
+ 			nm_ip4_config_merge (vpn4_parent_config, priv->ip4_config, NM_IP_CONFIG_MERGE_DEFAULT);
+-			nm_ip4_config_set_gateway (vpn4_parent_config, 0);
++			nm_ip4_config_unset_gateway (vpn4_parent_config);
+ 		}
+ 		if (vpn6_parent_config) {
+ 			nm_ip6_config_merge (vpn6_parent_config, priv->ip6_config, NM_IP_CONFIG_MERGE_DEFAULT);
+-- 
+2.4.3
meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-vpn-connection-set-the-MTU-for-the-VPN-IP-interface.patch new file +54 -0

54 lines not on this page · raw message

meta-oe/recipes-connectivity/networkmanager/networkmanager/0006-device-don-t-reset-NM_UNMANAGED_DEFAULT-when-platfor.patch new file +33 -0
new file mode 100644
index 0000000..74c08bd
@@ -0,0 +1,33 @@
+From e10a8f1f375c9ff669a14674e14f9789b2f321b6 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <[email protected]>
+Date: Wed, 2 Sep 2015 19:39:00 +0200
+Subject: [PATCH 4/4] device: don't reset NM_UNMANAGED_DEFAULT when platform
+ doesn't override this
+
+This would cause the ip_vti0 generic device (that appears upon insertion of
+ip_vti module during libreswan ipsec stack init) to go managed and brought UP.
+Without addresses assigned the device would cause all the VPN traffic to
+disappear in the oblivion.
+
+(cherry picked from commit 1c46ddf196b1e87782049e8f9ee3ada93e0dc85b)
+---
+ src/devices/nm-device.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
+index 5889582..b4e9252 100644
+--- a/src/devices/nm-device.c
++++ b/src/devices/nm-device.c
+@@ -1158,8 +1158,8 @@ nm_device_finish_init (NMDevice *self)
+ 			 * Currently it can happen that NM deletes 127.0.0.1 address. */
+ 			nm_device_set_initial_unmanaged_flag (self, NM_UNMANAGED_DEFAULT, TRUE);
+ 		} else if (priv->platform_link_initialized || (priv->is_nm_owned && nm_device_is_software (self))) {
+-			nm_platform_link_get_unmanaged (NM_PLATFORM_GET, priv->ifindex, &platform_unmanaged);
+-			nm_device_set_initial_unmanaged_flag (self, NM_UNMANAGED_DEFAULT, platform_unmanaged);
++			if (nm_platform_link_get_unmanaged (NM_PLATFORM_GET, priv->ifindex, &platform_unmanaged))
++				nm_device_set_initial_unmanaged_flag (self, NM_UNMANAGED_DEFAULT, platform_unmanaged);
+ 		} else {
+ 			/* Hardware and externally-created software links stay unmanaged
+ 			 * until they are fully initialized by the platform. NM created
+-- 
+2.4.3
meta-oe/recipes-connectivity/networkmanager/networkmanager/0007-nmcli-crash-vlan-priorities.patch new file +35 -0
new file mode 100644
index 0000000..cfaa04d
@@ -0,0 +1,35 @@
+From 7cfd6fc64185bebb09274107d64e65df748b149e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <[email protected]>
+Date: Tue, 1 Sep 2015 16:06:54 +0200
+Subject: [PATCH] libnm-core: fix a crash in priority_strv_to_maplist()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+strv can be NULL.
+
+Reproducer:
+$ nmcli con mod my-vlan vlan.ingress 1:5
+
+(cherry picked from commit 71c8c2e5872d2c6b15e24d37d3c000c11d0eba07)
+Signed-off-by: Jiří Klimeš <[email protected]>
+---
+ libnm-core/nm-setting-vlan.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c
+index 859eb13..cbc85b3 100644
+--- a/libnm-core/nm-setting-vlan.c
++++ b/libnm-core/nm-setting-vlan.c
+@@ -565,7 +565,7 @@ priority_strv_to_maplist (NMVlanPriorityMap map, char **strv)
+ 	GSList *list = NULL;
+ 	int i;
+ 
+-	for (i = 0; strv[i]; i++) {
++	for (i = 0; strv && strv[i]; i++) {
+ 		PriorityMap *item;
+ 
+ 		item = priority_map_new_from_str (map, strv[i]);
+-- 
+2.1.0
+
meta-oe/recipes-connectivity/networkmanager/networkmanager/0008-nmtui-fix-crash-in-secret-agent.patch new file +88 -0

88 lines not on this page · raw message

meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1175446-vpn-secondaries-connections.patch new file +57 -0

57 lines not on this page · raw message

meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1261428-ipv6-ignore-auto-dns.patch new file +37 -0
new file mode 100644
index 0000000..6f0f774
@@ -0,0 +1,37 @@
+From 8de6ee4ebad93cd1f552c666183a4fac76274aa5 Mon Sep 17 00:00:00 2001
+From: Thomas Haller <[email protected]>
+Date: Wed, 9 Sep 2015 12:59:01 +0200
+Subject: [PATCH] core: fix handling ignore-auto-dns for IPv6 nameservers
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1261428
+
+Fixes: f7a8962dd47099425438ee484e02f40e18b6ee79
+(cherry picked from commit e0fe47b74e92e9614717a3d918eed3fc0bc6b2ea)
+Signed-off-by: Jiří Klimeš <[email protected]>
+---
+ src/nm-ip6-config.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
+index 9647268..ef25623 100644
+--- a/src/nm-ip6-config.c
++++ b/src/nm-ip6-config.c
+@@ -635,8 +635,10 @@ nm_ip6_config_merge (NMIP6Config *dst, const NMIP6Config *src, NMIPConfigMergeFl
+ 		nm_ip6_config_add_address (dst, nm_ip6_config_get_address (src, i));
+ 
+ 	/* nameservers */
+-	for (i = 0; i < nm_ip6_config_get_num_nameservers (src); i++)
+-		nm_ip6_config_add_nameserver (dst, nm_ip6_config_get_nameserver (src, i));
++	if (!NM_FLAGS_HAS (merge_flags, NM_IP_CONFIG_MERGE_NO_DNS)) {
++		for (i = 0; i < nm_ip6_config_get_num_nameservers (src); i++)
++			nm_ip6_config_add_nameserver (dst, nm_ip6_config_get_nameserver (src, i));
++	}
+ 
+ 	/* default gateway */
+ 	if (nm_ip6_config_get_gateway (src))
+-- 
+2.1.0
+
meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1263185-nmcli-con-add-generic.patch new file +44 -0

44 lines not on this page · raw message

meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1263959-modem-supported-ip-families.patch new file +62 -0

62 lines not on this page · raw message

meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1264676-fix-crash-on-device-removal.patch new file +80 -0

80 lines not on this page · raw message

meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1265993-nmcli-allow-ipv6-ppp-for-wwan.patch new file +46 -0

46 lines not on this page · raw message

meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1266003-fix-crash-on-bss-proxy-acquired.patch new file +48 -0

48 lines not on this page · raw message

meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1272974-fix-s390-ctc-detection.patch new file +57 -0

57 lines not on this page · raw message

meta-oe/recipes-connectivity/networkmanager/networkmanager/rh1277693-vpn-service-timer.patch new file +161 -0

161 lines not on this page · raw message

meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +15 -0
index 3d3f63e..294a666 100644
@@ -14,6 +14,21 @@ SRC_URI = " \
     ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
     file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
     file://0002-add-pkg-config-for-libgcrypt.patch \
+    file://0003-config-bugfix-parse-commandline-options-into-correct.patch \
+    file://0004-vpn-connection-fix-unsetting-the-gateway.patch \
+    file://0005-vpn-connection-set-the-MTU-for-the-VPN-IP-interface.patch \
+    file://0006-device-don-t-reset-NM_UNMANAGED_DEFAULT-when-platfor.patch \
+    file://0007-nmcli-crash-vlan-priorities.patch \
+    file://0008-nmtui-fix-crash-in-secret-agent.patch \
+    file://rh1175446-vpn-secondaries-connections.patch \
+    file://rh1261428-ipv6-ignore-auto-dns.patch \
+    file://rh1263185-nmcli-con-add-generic.patch \
+    file://rh1263959-modem-supported-ip-families.patch \
+    file://rh1264676-fix-crash-on-device-removal.patch \
+    file://rh1265993-nmcli-allow-ipv6-ppp-for-wwan.patch \
+    file://rh1266003-fix-crash-on-bss-proxy-acquired.patch \
+    file://rh1272974-fix-s390-ctc-detection.patch \
+    file://rh1277693-vpn-service-timer.patch \
 "
 
 SRC_URI[md5sum] = "00f5f9ec69725a9f9b99366853c6f73e"
Signature · 1 line
2.4.3
#9 lore raw

PATCH 9/17 networkmanager: Add package for nmtui

In reply to Adrian Freihofer
---
 .../networkmanager/networkmanager_1.0.6.bb               | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +14 -2
index 294a666..3277fdc 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
                     file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
                     file://docs/api/html/license.html;md5=51d7fb67bde992e58533a8481cee070b"
 
-DEPENDS = "libnl dbus dbus-glib libgudev wireless-tools util-linux libndp"
+DEPENDS = "libnl dbus dbus-glib libgudev wireless-tools util-linux libndp libnewt"
 
 inherit gnomebase gettext systemd
 
@@ -47,6 +47,7 @@ EXTRA_OECONF = " \
     --with-iptables=${sbindir}/iptables \
     --with-tests \
     --with-dnsmasq=${bindir}/dnsmasq \
+    --with-nmtui=yes \
 "
 
 # If you need a different configuration for networkmanager, add a line similar to
@@ -70,7 +71,7 @@ PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp"
 PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
 PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt,gnutls libgcrypt"
 
-PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion"
+PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion ${PN}-nmtui ${PN}-nmtui-doc"
 
 FILES_libnmutil += "${libdir}/libnm-util.so.*"
 FILES_libnmglib += "${libdir}/libnm-glib.so.*"
@@ -114,6 +115,17 @@ FILES_${PN}-tests = " \
 
 FILES_${PN}-bash-completion = "${datadir}/bash-completion"
 
+FILES_${PN}-nmtui = " \
+    ${bindir}/nmtui \
+    ${bindir}/nmtui-edit \
+    ${bindir}/nmtui-connect \
+    ${bindir}/nmtui-hostname \
+"
+
+FILES_${PN}-nmtui-doc = " \
+    ${mandir}/man1/nmtui* \
+"
+
 SYSTEMD_SERVICE_${PN} = "NetworkManager.service"
 
 do_install_append() {
Signature · 1 line
2.4.3
#10 lore raw

Re: [meta-oe][PATCH 09/17] networkmanager: Add package for nmtui

Quoted 36 lines · Adrian Freihofer
---
 .../networkmanager/networkmanager_1.0.6.bb               | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +3 -2
index 294a666..3277fdc 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
                     file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
                     file://docs/api/html/license.html;md5=51d7fb67bde992e58533a8481cee070b"
 
-DEPENDS = "libnl dbus dbus-glib libgudev wireless-tools util-linux libndp"
+DEPENDS = "libnl dbus dbus-glib libgudev wireless-tools util-linux libndp libnewt"
 
 inherit gnomebase gettext systemd
 
@@ -47,6 +47,7 @@ EXTRA_OECONF = " \
     --with-iptables=${sbindir}/iptables \
     --with-tests \
     --with-dnsmasq=${bindir}/dnsmasq \
+    --with-nmtui=yes \
 "
 
 # If you need a different configuration for networkmanager, add a line similar to
@@ -70,7 +71,7 @@ PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp"
 PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
 PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt,gnutls libgcrypt"
 
-PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion"
+PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion ${PN}-nmtui ${PN}-nmtui-doc"
 
 FILES_libnmutil += "${libdir}/libnm-util.so.*"
 FILES_libnmglib += "${libdir}/libnm-glib.so.*"

meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb FILES_${PN}-tests = " \ · line 123

Quoted 9 lines
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +6 -0
@@ -114,6 +115,17 @@ FILES_${PN}-tests = " \
 
 FILES_${PN}-bash-completion = "${datadir}/bash-completion"
 
+FILES_${PN}-nmtui = " \
+    ${bindir}/nmtui \
+    ${bindir}/nmtui-edit \
+    ${bindir}/nmtui-connect \
+    ${bindir}/nmtui-hostname \
+"

Please fix:
networkmanager-1.0.6: /usr/bin/nmtui-connect_networkmanager-nmtui contained in package networkmanager-nmtui requires libnewt.so()(64bit), but no providers found in its RDEPENDS [file-rdeps] networkmanager-1.0.6: /usr/bin/nmtui-connect_networkmanager-nmtui contained in package networkmanager-nmtui requires libnewt.so, but no providers found in its RDEPENDS [file-rdeps]

In follow-up patch.

Quoted 16 lines
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +5 -0
+
+FILES_${PN}-nmtui-doc = " \
+    ${mandir}/man1/nmtui* \
+"
+
 SYSTEMD_SERVICE_${PN} = "NetworkManager.service"
 
 do_install_append() {
Signature · 7 lines
2.4.3

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#11 lore raw

PATCH 10/17 networkmanager: run dispatcher

In reply to Adrian Freihofer
---
 meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +1 -1
index 3277fdc..4df8793 100644
@@ -126,7 +126,7 @@ FILES_${PN}-nmtui-doc = " \
     ${mandir}/man1/nmtui* \
 "
 
-SYSTEMD_SERVICE_${PN} = "NetworkManager.service"
+SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service"
 
 do_install_append() {
     rm -rf ${D}/run ${D}${localstatedir}/run
Signature · 1 line
2.4.3
#12 lore raw

PATCH 11/17 networkmanager: PACKAGECONFIG for ifupdown netconfig

In reply to Adrian Freihofer
---
 meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +3 -3
index 4df8793..e2bb1ff 100644
@@ -37,11 +37,9 @@ SRC_URI[sha256sum] = "38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb9264
 S = "${WORKDIR}/NetworkManager-${PV}"
 
 EXTRA_OECONF = " \
-    --enable-ifupdown \
     --disable-ifcfg-rh \
     --disable-ifnet \
     --disable-ifcfg-suse \
-    --with-netconfig \
     --disable-more-warnings \
     --with-dhclient=${base_sbindir}/dhclient \
     --with-iptables=${sbindir}/iptables \
@@ -54,7 +52,7 @@ EXTRA_OECONF = " \
 # the following examples to your local.conf or distro config
 # PACKAGECONFIG_pn-networkmanager = "systemd gnutls"
 # PACKAGECONFIG_append_pn-networkmanager = " modemmanager ppp"
-PACKAGECONFIG ??= "nss \
+PACKAGECONFIG ??= "nss ifupdown netconfig \
     ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
 "
 PACKAGECONFIG[systemd] = " \
@@ -70,6 +68,8 @@ PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1
 PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp"
 PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
 PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt,gnutls libgcrypt"
+PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
+PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no"
 
 PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests ${PN}-bash-completion ${PN}-nmtui ${PN}-nmtui-doc"
 
Signature · 1 line
2.4.3
#13 lore raw

PATCH 12/17 networkmanager: PACKAGECONFIG for dhclient

In reply to Adrian Freihofer
---
 meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +3 -3
index e2bb1ff..88f495b 100644
@@ -41,7 +41,6 @@ EXTRA_OECONF = " \
     --disable-ifnet \
     --disable-ifcfg-suse \
     --disable-more-warnings \
-    --with-dhclient=${base_sbindir}/dhclient \
     --with-iptables=${sbindir}/iptables \
     --with-tests \
     --with-dnsmasq=${bindir}/dnsmasq \
@@ -52,7 +51,7 @@ EXTRA_OECONF = " \
 # the following examples to your local.conf or distro config
 # PACKAGECONFIG_pn-networkmanager = "systemd gnutls"
 # PACKAGECONFIG_append_pn-networkmanager = " modemmanager ppp"
-PACKAGECONFIG ??= "nss ifupdown netconfig \
+PACKAGECONFIG ??= "nss ifupdown netconfig dhclient \
     ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
 "
 PACKAGECONFIG[systemd] = " \
@@ -66,6 +65,8 @@ PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
 PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4"
 PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager"
 PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp"
+# Use full featured dhcp client instead of internal one
+PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client"
 PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
 PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt,gnutls libgcrypt"
 PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
@@ -91,7 +92,6 @@ RRECOMMENDS_${PN} += "iptables dnsmasq"
 RCONFLICTS_${PN} = "connman"
 RDEPENDS_${PN} = " \
     wpa-supplicant \
-    dhcp-client \
 "
 
 FILES_${PN}-dbg += " \
Signature · 1 line
2.4.3
#14 lore raw

PATCH 13/17 networkmanager: PACKAGECONFIG for dnsmasq

In reply to Adrian Freihofer
---
 .../recipes-connectivity/networkmanager/networkmanager_1.0.6.bb   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +5 -3
index 88f495b..c00e544 100644
@@ -43,7 +43,6 @@ EXTRA_OECONF = " \
     --disable-more-warnings \
     --with-iptables=${sbindir}/iptables \
     --with-tests \
-    --with-dnsmasq=${bindir}/dnsmasq \
     --with-nmtui=yes \
 "
 
@@ -51,7 +50,7 @@ EXTRA_OECONF = " \
 # the following examples to your local.conf or distro config
 # PACKAGECONFIG_pn-networkmanager = "systemd gnutls"
 # PACKAGECONFIG_append_pn-networkmanager = " modemmanager ppp"
-PACKAGECONFIG ??= "nss ifupdown netconfig dhclient \
+PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
     ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
 "
 PACKAGECONFIG[systemd] = " \
@@ -67,6 +66,7 @@ PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1
 PACKAGECONFIG[ppp] = "--enable-ppp,--disable-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 libgcrypt,gnutls libgcrypt"
 PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
@@ -88,7 +88,9 @@ FILES_${PN} += " \
     ${systemd_unitdir}/system \
 "
 
-RRECOMMENDS_${PN} += "iptables dnsmasq"
+RRECOMMENDS_${PN} += "iptables \
+    ${@bb.utils.contains('PACKAGECONFIG','dnsmasq','dnsmasq','',d)} \
+"
 RCONFLICTS_${PN} = "connman"
 RDEPENDS_${PN} = " \
     wpa-supplicant \
Signature · 1 line
2.4.3
#15 lore raw

PATCH 14/17 networkmanager: PACKAGECONFIG for wifi

In reply to Adrian Freihofer
---
 .../recipes-connectivity/networkmanager/networkmanager_1.0.6.bb  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +4 -5
index c00e544..590ce3b 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
                     file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
                     file://docs/api/html/license.html;md5=51d7fb67bde992e58533a8481cee070b"
 
-DEPENDS = "libnl dbus dbus-glib libgudev wireless-tools util-linux libndp libnewt"
+DEPENDS = "libnl dbus dbus-glib libgudev util-linux libndp libnewt"
 
 inherit gnomebase gettext systemd
 
@@ -48,10 +48,11 @@ EXTRA_OECONF = " \
 
 # If you need a different configuration for networkmanager, add a line similar to
 # the following examples to your local.conf or distro config
-# PACKAGECONFIG_pn-networkmanager = "systemd gnutls"
+# PACKAGECONFIG_pn-networkmanager = "systemd gnutls wifi"
 # PACKAGECONFIG_append_pn-networkmanager = " modemmanager ppp"
 PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
     ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES','wifi','wifi','',d)} \
 "
 PACKAGECONFIG[systemd] = " \
     --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \
@@ -69,6 +70,7 @@ PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-clien
 PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
 PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
 PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt,gnutls libgcrypt"
+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"
 
@@ -92,9 +94,6 @@ RRECOMMENDS_${PN} += "iptables \
     ${@bb.utils.contains('PACKAGECONFIG','dnsmasq','dnsmasq','',d)} \
 "
 RCONFLICTS_${PN} = "connman"
-RDEPENDS_${PN} = " \
-    wpa-supplicant \
-"
 
 FILES_${PN}-dbg += " \
     ${libdir}/NetworkManager/.debug/ \
Signature · 1 line
2.4.3
#16 lore raw

PATCH 15/17 networkmanager: PACKAGECONFIG for adsl

In reply to Adrian Freihofer
---
 .../recipes-connectivity/networkmanager/networkmanager_1.0.6.bb   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +7 -1
index 590ce3b..383aae9 100644
@@ -50,7 +50,7 @@ EXTRA_OECONF = " \
 # the following examples to your local.conf or distro config
 # PACKAGECONFIG_pn-networkmanager = "systemd gnutls wifi"
 # PACKAGECONFIG_append_pn-networkmanager = " modemmanager ppp"
-PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
+PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq adsl \
     ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)} \
     ${@bb.utils.contains('DISTRO_FEATURES','wifi','wifi','',d)} \
 "
@@ -71,6 +71,7 @@ PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
 PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
 PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt,gnutls libgcrypt"
 PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant wireless-tools"
+PACKAGECONFIG[adsl] = ""
 PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
 PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no"
 
@@ -131,4 +132,9 @@ SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.servic
 
 do_install_append() {
     rm -rf ${D}/run ${D}${localstatedir}/run
+
+    # Delete adsl plugin if adsl is not in config flags
+    if ${@bb.utils.contains('PACKAGECONFIG','adsl','false','true',d)}; then
+        rm ${D}/${libdir}/NetworkManager/libnm-device-plugin-adsl.so
+    fi
 }
Signature · 1 line
2.4.3
#17 lore raw

Re: [meta-oe][PATCH 15/17] networkmanager: PACKAGECONFIG for adsl

Why don't you package adsl plugin in separate package? Seems cleaner than deleting already built file.

Quoted 56 lines · Adrian Freihofer
---
 .../recipes-connectivity/networkmanager/networkmanager_1.0.6.bb   | 8
+++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

networkmanager_1.0.6.bb b/meta-oe/recipes-connectivity/networkmanager/ networkmanager_1.0.6.bb
index 590ce3b..383aae9 100644

meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +1 -1
@@ -50,7 +50,7 @@ EXTRA_OECONF = " \
 # the following examples to your local.conf or distro config
 # PACKAGECONFIG_pn-networkmanager = "systemd gnutls wifi"
 # PACKAGECONFIG_append_pn-networkmanager = " modemmanager ppp"
-PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
+PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq adsl \
 
 ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}
 \
     ${@bb.utils.contains('DISTRO_FEATURES','wifi','wifi','',d)} \

"

meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +0 -0
@@ -71,6 +71,7 @@ PACKAGECONFIG[dnsmasq] =

"--with-dnsmasq=${bindir}/dnsmasq"
PACKAGECONFIG[nss] = "--with-crypto=nss,,nss" PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls libgcrypt,gnutls
libgcrypt"
PACKAGECONFIG[wifi] =
"--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant wireless-tools"

meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +1 -0
+PACKAGECONFIG[adsl] = ""
 PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
 PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no"
@@ -131,4 +132,9 @@ SYSTEMD_SERVICE_${PN} = "NetworkManager.service

NetworkManager-dispatcher.servic

 do_install_append() {
     rm -rf ${D}/run ${D}${localstatedir}/run
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +3 -0
+
+    # Delete adsl plugin if adsl is not in config flags
+    if ${@bb.utils.contains('PACKAGECONFIG','adsl','false','true',d)};

then

meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +2 -1
+        rm ${D}/${libdir}/NetworkManager/libnm-device-plugin-adsl.so
+    fi
 }
--

2.4.3

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#18 lore raw

PATCH 16/17 networkmanager: use bluetooth from distro

In reply to Adrian Freihofer
---
 meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.6.bb +2 -1
index 383aae9..9b358da 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
 
 DEPENDS = "libnl dbus dbus-glib libgudev util-linux libndp libnewt"
 
-inherit gnomebase gettext systemd
+inherit gnomebase gettext systemd bluetooth
 
 SRC_URI = " \
     ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
@@ -52,6 +52,7 @@ EXTRA_OECONF = " \
 # PACKAGECONFIG_append_pn-networkmanager = " modemmanager ppp"
 PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq adsl \
     ${@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] = " \
Signature · 1 line
2.4.3
#19 lore raw

PATCH 17/17 networkmanager: add openvpn plugin

In reply to Adrian Freihofer
---
 .../networkmanager/networkmanager-openvpn_1.0.6.bb | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.0.6.bb
meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.0.6.bb new file +43 -0
new file mode 100644
index 0000000..cebfe41
@@ -0,0 +1,43 @@
+SUMMARY = "NetworkManager-openvpn-plugin"
+SECTION = "net/misc"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c"
+
+DEPENDS = "dbus dbus-glib networkmanager openvpn"
+
+inherit gnomebase useradd gettext systemd 
+
+SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz"
+
+SRC_URI[md5sum] = "02931c0302310d06e43d413b5a7a3261"
+SRC_URI[sha256sum] = "c982b644fa43d3019cb654a17e692bb3a7175a86d28065ea51f55ae7dfe45d8c"
+
+S = "${WORKDIR}/NetworkManager-openvpn-${PV}"
+
+PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
+
+# Create user and group nm-openvpn that are needed since version 1.0.6
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system nm-openvpn"
+
+FILES_${PN} += " \
+    ${libdir}/NetworkManager/*.so \
+"
+
+RDEPENDS_${PN} = " \
+    networkmanager \
+    openvpn \
+"
+
+FILES_${PN}-dbg += " \
+    ${libdir}/NetworkManager/.debug/ \
+"
+
+FILES_${PN}-dev += " \
+    ${datadir}/NetworkManager/gdb-cmd \
+"
+
+FILES_${PN}-staticdev += " \
+    ${libdir}/NetworkManager/*.la \
+"
Signature · 1 line
2.4.3