Skip to contentSkip to conversation

networkmanager: Upgrade 1.18.2 -> 1.18.4

PATCH In review Andreas Müller 2 participants 4 messages Nov 27, 2019 – Dec 2, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 networkmanager: Upgrade 1.18.2 -> 1.18.4

From: Adrian Bunk <[email protected]>

(cherry picked from commit 1db745db41e31c61448743842104d92a61e7ddfb)
---
 .../{networkmanager_1.18.2.bb => networkmanager_1.18.4.bb}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.18.2.bb => networkmanager_1.18.4.bb} (97%)
meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb renamed from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb +2 -2
similarity index 97%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
index 0d6e1a0b0..085807c4c 100644
@@ -31,8 +31,8 @@ SRC_URI_append_libc-musl = " \
     file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
     file://musl/0002-Fix-build-with-musl.patch \
 "
-SRC_URI[md5sum] = "ca1e6175c6ba97ca1adf65a67861ccd9"
-SRC_URI[sha256sum] = "4dd97ca974cd1f97990746527258f551f4257cbf011fecd01d10b7d74a6fa5c3"
+SRC_URI[md5sum] = "fc86588a3ae54e0d406b560a312d5a5d"
+SRC_URI[sha256sum] = "a3bd07f695b6d3529ec6adbd9a1d6385b967e9c8ae90946f51d8852b320fd05e"
 
 S = "${WORKDIR}/NetworkManager-${PV}"
 
Signature · 1 line
2.21.0
#1 lore raw

PATCH 2/2 networkmanager: do not deploy unnecessary udev rule file

From: Stefan Agner <[email protected]>

The 84-nm-drivers.rules is not required for systemd-udevd versions v210 and later. The file has been split into a separate file so distributions with a new enough systemd version can drop it. See also:
https://github.com/NetworkManager/NetworkManager/commit/1e0375826252abf9aab2aef273a2a24cd08c9f42

I noticed this while investigating into a warning show during bootup:
/usr/lib/udev/rules.d/84-nm-drivers.rules:10 Invalid value "/bin/sh -c 'ethtool -i $1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}" for PROGRAM (char 24: invalid substitution type), ignoring, but please fix it.

(cherry picked from commit 82ecc0e69fe3920360d1ba8bd1b5e6ede164de42)
---
 .../networkmanager/networkmanager_1.18.4.bb                  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb +4 -1
index 085807c4c..27508c4d9 100644
@@ -141,8 +141,11 @@ do_install_append() {
 
     rm -rf ${D}/run ${D}${localstatedir}/run
 
-    # For read-only filesystem, do not create links during bootup
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+        # For read-only filesystem, do not create links during bootup
         ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager
+
+        # systemd v210 and newer do not need this rule file
+        rm ${D}/${nonarch_base_libdir}/udev/rules.d/84-nm-drivers.rules
     fi
 }
Signature · 1 line
2.21.0
#2 lore raw
In reply to Andreas Müller
Quoted 5 lines · Andreas Müller

From: Adrian Bunk <[email protected]>

(cherry picked from commit 1db745db41e31c61448743842104d92a61e7ddfb)

Why?

is this a bug fix only?

- armin

Quoted 23 lines
---
 .../{networkmanager_1.18.2.bb => networkmanager_1.18.4.bb}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.18.2.bb => networkmanager_1.18.4.bb} (97%)
meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb renamed from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb +2 -2
similarity index 97%
rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.2.bb
rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.4.bb
index 0d6e1a0b0..085807c4c 100644
@@ -31,8 +31,8 @@ SRC_URI_append_libc-musl = " \
     file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
     file://musl/0002-Fix-build-with-musl.patch \
 "
-SRC_URI[md5sum] = "ca1e6175c6ba97ca1adf65a67861ccd9"
-SRC_URI[sha256sum] = "4dd97ca974cd1f97990746527258f551f4257cbf011fecd01d10b7d74a6fa5c3"
+SRC_URI[md5sum] = "fc86588a3ae54e0d406b560a312d5a5d"
+SRC_URI[sha256sum] = "a3bd07f695b6d3529ec6adbd9a1d6385b967e9c8ae90946f51d8852b320fd05e"
 
 S = "${WORKDIR}/NetworkManager-${PV}"
 
#3 lore raw
Quoted 6 lines · On Wed, Nov 27, 2019 at 11:53 PM akuster808 <[email protected]> wrote:
Quoted 2 lines · Andreas Müller

From: Adrian Bunk <[email protected]>

Quoted 8 lines
Quoted 3 lines
(cherry picked from commit 1db745db41e31c61448743842104d92a61e7ddfb)

Why?

is this a bug fix only?

Did cherry-pick original patch which did not mention anything about it. So yes it is a bugfix-only release. From [1]

===============================================
NetworkManager-1.18.4
Overview of changes since NetworkManager-1.18.2
===============================================

This is a new stable release of NetworkManager. Notable changes include:

* Improve handling of externally added policy routing rules and for rules that are taken over after a restart of NetworkManager service.
* Fix taking over OVS devices after restart of NetworkManager.
* Bugfix reapplying IP configuration while activating.
* Allow reapplying Wi-Fi profile when seen-bssids changes.
* Various other bugfixes for minor issues and memory leaks.
* Various build and test fixes.

[1] http://ftp.gnome.org/pub/gnome/sources/NetworkManager/1.18/NetworkManager-1.18.4.news

Andreas