From c74367dec5d0cc7dec134f790023c4633f91a113 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 16 Mar 2022 16:32:41 +0800 Subject: [PATCH] networkmanager: upgrade 1.36.0 -> 1.36.2 0001-do-not-ask-host-for-ifcfg-defaults.patch refreshed for new version Changelog: ========== * When the list of plugins is not specified via "main.plugins" in NetworkManager.conf and no build-time default is set with "--with-config-plugins-default" configure argument, now all known plugins found in the plugin directory are loaded (and the built-in "keyfile" plugin is preferred over others). * Preserve external ports during checkpoint rollback * Fix removal of ovsdb entry when an OVS interface goes away * Fix DNS configuration for WWAN connections Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- .../0001-do-not-ask-host-for-ifcfg-defaults.patch | 9 +++------ ...networkmanager_1.36.0.bb => networkmanager_1.36.2.bb} | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.36.0.bb => networkmanager_1.36.2.bb} (99%) diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-do-not-ask-host-for-ifcfg-defaults.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-do-not-ask-host-for-ifcfg-defaults.patch index d3393b50c1..92b129320c 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-do-not-ask-host-for-ifcfg-defaults.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-do-not-ask-host-for-ifcfg-defaults.patch @@ -1,4 +1,4 @@ -From 3894ddf5f677a42ed01d676b68e25a414fd8a0ce Mon Sep 17 00:00:00 2001 +From 37559b659e22886d5f55837d4f167ba5fda73e85 Mon Sep 17 00:00:00 2001 From: Adrian Freihofer Date: Sun, 29 Aug 2021 15:50:35 +0200 Subject: [PATCH] do-not-ask-host-for-ifcfg-defaults @@ -8,7 +8,7 @@ Subject: [PATCH] do-not-ask-host-for-ifcfg-defaults 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index 3c4be61509..8833c62fa3 100644 +index d0cec83..289aa1b 100644 --- a/meson.build +++ b/meson.build @@ -304,8 +304,8 @@ else @@ -21,7 +21,4 @@ index 3c4be61509..8833c62fa3 100644 +enable_ifupdown = get_option('ifupdown') config_plugins_default = get_option('config_plugins_default') - if config_plugins_default == '' --- -2.31.1 - + config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_PLUGINS', config_plugins_default) diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb similarity index 99% rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.0.bb rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb index 0ab8cad21c..b09ff18bf7 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.0.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb @@ -30,7 +30,7 @@ SRC_URI = " \ file://enable-iwd.conf \ file://0001-do-not-ask-host-for-ifcfg-defaults.patch \ " -SRC_URI[sha256sum] = "faa389c9e9ca78243cfab4a8bed6db132f82e5b5e66bb9d44af93379d1348398" +SRC_URI[sha256sum] = "ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab" S = "${WORKDIR}/NetworkManager-${PV}"