networkmanager: Update to 1.18.0
PATCH v2 1/1 networkmanager: Update to 1.18.0
From: Andrei Gherzan <[email protected]>
One patch was dropped (0003-dlopen-failure.patch) as a similar one was merged upstream. See:
https://github.com/NetworkManager/NetworkManager/commit/bd4957fcd78a0e64d26459e94ab3b84c91cd6f5f
Refreshed musl patches as well.
Signed-off-by Andrei Gherzan <[email protected]>
---
.../networkmanager/0003-dlopen-failure.patch | 34 -----
...Fix-build-with-musl-systemd-specific.patch | 128 ++++++++----------
.../musl/0002-Fix-build-with-musl.patch | 20 +--
...ger_1.16.0.bb => networkmanager_1.18.0.bb} | 6 +-
4 files changed, 70 insertions(+), 118 deletions(-)
delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-dlopen-failure.patch
rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.16.0.bb => networkmanager_1.18.0.bb} (96%)meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-dlopen-failure.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 57239fda56b68a8f3e413f7b6af5290ba0d86636 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> -Date: Thu, 22 Mar 2018 18:18:06 +0100 -Subject: [PATCH] musl: dlopen is included so LD_LIBS="" instead of - LD_LIBS="none required" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Stolen from [1] and prettyfied slightly - -[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches - -Signed-off-by: Andreas Müller <[email protected]> ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 487a266..96ae4f7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -235,6 +235,7 @@ dnl - dnl Checks for libdl - on certain platforms its part of libc - dnl - AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=]) -+AS_IF([test "$ac_cv_search_dlopen" = "none required"],[ac_cv_search_dlopen=""]) - AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen") - - PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0], --- -2.14.3
meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch +58 -70
192 lines not on this page · raw message
meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl.patch +10 -10
@@ -1,4 +1,4 @@ -From 0b0f2d5abe27b2c9587f449795f0ae3568fc3e38 Mon Sep 17 00:00:00 2001 +From 3d1307735667758f44378585482fe421db086af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> Date: Mon, 8 Apr 2019 23:10:43 +0200 Subject: [PATCH 2/2] Fix build with musl
@@ -23,7 +23,7 @@ The build issues caused by definition conflicts musl vs linux-libc headers Note: Be aware that this is still nasty business: We have to trust that musl headers define same signatures as linux would do - just because musl-makers consider -linux-libc headers 'notoriously broken for userspace' [2] (search for +linux-libc headers 'notoriously broken for userspace' [2] (search for 'error: redefinition of'). [1] http://lists.openembedded.org/pipermail/openembedded-core/2019-March/280440.html
@@ -53,7 +53,7 @@ index 43fbbc1..3eae286 100644 #include "nmtui.h" diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h -index 2b5baba..8a50131 100644 +index 2b5baba..f7abab6 100644 --- a/libnm-core/nm-utils.h +++ b/libnm-core/nm-utils.h @@ -25,6 +25,10 @@
@@ -68,7 +68,7 @@ index 2b5baba..8a50131 100644 #include <netinet/in.h> diff --git a/shared/nm-default.h b/shared/nm-default.h -index 26d6476..b29e8af 100644 +index 54e9916..26e9f4e 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h @@ -211,6 +211,9 @@
@@ -82,7 +82,7 @@ index 26d6476..b29e8af 100644 /*****************************************************************************/ diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c -index 7514fa7..d305fa5 100644 +index bd4fbcc..f70b309 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -24,6 +24,7 @@
@@ -102,17 +102,17 @@ index 7514fa7..d305fa5 100644 #include <linux/pkt_sched.h> diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c -index 2f5c75b..d6ca6d9 100644 +index d4b0115..22a3a90 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c -@@ -27,7 +27,6 @@ - #include <fcntl.h> +@@ -28,7 +28,6 @@ #include <libudev.h> + #include <linux/fib_rules.h> #include <linux/ip.h> -#include <linux/if_arp.h> + #include <linux/if_bridge.h> #include <linux/if_link.h> #include <linux/if_tun.h> - #include <linux/if_tunnel.h> -- -2.20.1 +2.17.1
meta-networking/recipes-connectivity/networkmanager/networkmanager_1.18.0.bb renamed from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb +2 -4
@@ -26,15 +26,13 @@ SRC_URI = " \ ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ file://0002-Do-not-create-settings-settings-property-documentati.patch \ - file://0003-dlopen-failure.patch \ " 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] = "10abacaafb162a67d2942adf03e7e9e4" -SRC_URI[sha256sum] = "8e962833b6ca03edda1bc57ed6614a7b8c2339531b44acef098d05f2324c5d2c" +SRC_URI[md5sum] = "c8c27116a8083bab5d5fcca0d03e988a" +SRC_URI[sha256sum] = "c6e8df25e5a3c7309bc17664be8971689314884cdd08afdd6b0847d29d2a8ba6" UPSTREAM_CHECK_URI = "${GNOME_MIRROR}/NetworkManager/1.16/" UPSTREAM_CHECK_REGEX = "NetworkManager\-(?P<pver>1\.10(\.\d+)+).tar.xz"
Signature · 1 line
2.17.1