Signed-off-by: Ladislav Michl <la...@linux-mips.org> --- ...-sleep-monitor-upower-add-missing-include.patch | 26 ---------------------- rules/networkmanager.make | 6 ++--- 2 files changed, 3 insertions(+), 29 deletions(-)
diff --git a/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch b/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch deleted file mode 100644 index 425974c..0000000 --- a/patches/NetworkManager-1.2.2/0001-sleep-monitor-upower-add-missing-include.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Michael Olbrich <m.olbr...@pengutronix.de> -Date: Wed, 18 May 2016 10:16:15 +0200 -Subject: [PATCH] sleep-monitor-upower: add missing include - -Otherwise building fails with: - -nm-sleep-monitor-upower.c:132:45: error: expected declaration specifiers or '...' before 'nm_sleep_monitor_get' -nm-sleep-monitor-upower.c:132:67: error: expected declaration specifiers or '...' before '(' token - -Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> ---- - src/nm-sleep-monitor-upower.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c -index 5f0ff24552b2..8d0719039ccf 100644 ---- a/src/nm-sleep-monitor-upower.c -+++ b/src/nm-sleep-monitor-upower.c -@@ -24,6 +24,7 @@ - #include <sys/stat.h> - - #include "nm-core-internal.h" -+#include "NetworkManagerUtils.h" - - #include "nm-sleep-monitor.h" - diff --git a/rules/networkmanager.make b/rules/networkmanager.make index 3e4d2ac..cd06bd6 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.2.2 -NETWORKMANAGER_MD5 := a922bf20c2243c9014fb14c4427ad035 +NETWORKMANAGER_VERSION := 1.4.2 +NETWORKMANAGER_MD5 := 59b5b5585467756787c6cb535cbd306e NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz -NETWORKMANAGER_URL := http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.2/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) +NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) -- 2.10.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de