* [ptxdist] [PATCH] networkmanager: version bump 1.12.2 -> 1.14.0
@ 2018-09-17 8:04 Ladislav Michl
0 siblings, 0 replies; only message in thread
From: Ladislav Michl @ 2018-09-17 8:04 UTC (permalink / raw)
To: ptxdist
Also remove patches as those are already in 1.14.0.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
...ile-error-due-to-NM_AVAILABLE_IN_1_1.patch | 25 ----------
...uild-add-a-some-missing-dependencies.patch | 46 -------------------
patches/NetworkManager-1.12.2/autogen.sh | 19 --------
patches/NetworkManager-1.12.2/series | 5 --
rules/networkmanager.make | 13 +++---
5 files changed, 7 insertions(+), 101 deletions(-)
delete mode 100644 patches/NetworkManager-1.12.2/0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch
delete mode 100644 patches/NetworkManager-1.12.2/0002-build-add-a-some-missing-dependencies.patch
delete mode 100755 patches/NetworkManager-1.12.2/autogen.sh
delete mode 100644 patches/NetworkManager-1.12.2/series
diff --git a/patches/NetworkManager-1.12.2/0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch b/patches/NetworkManager-1.12.2/0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch
deleted file mode 100644
index aa75cf9b3..000000000
--- a/patches/NetworkManager-1.12.2/0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Thomas Haller <thaller@redhat.com>
-Date: Tue, 31 Jul 2018 14:13:57 +0200
-Subject: [PATCH] version: fix compile error due to NM_AVAILABLE_IN_1_12_2
- macro
-
-Fixes: 8d09660481e1ff8b513aa60b2c40a4982ccc57cd
-
-https://mail.gnome.org/archives/networkmanager-list/2018-July/msg00023.html
----
- libnm-core/nm-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
-index ee6dbc0bd9e8..c24048955c57 100644
---- a/libnm-core/nm-version.h
-+++ b/libnm-core/nm-version.h
-@@ -161,7 +161,7 @@
- #endif
-
- #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_12_2
--# define NM_AVAILABLE_IN_1_12_2 G_UNAVAILABLE(1,12,2)
-+# define NM_AVAILABLE_IN_1_12_2 G_UNAVAILABLE(1,12.2)
- #else
- # define NM_AVAILABLE_IN_1_12_2
- #endif
diff --git a/patches/NetworkManager-1.12.2/0002-build-add-a-some-missing-dependencies.patch b/patches/NetworkManager-1.12.2/0002-build-add-a-some-missing-dependencies.patch
deleted file mode 100644
index 06c84fa11..000000000
--- a/patches/NetworkManager-1.12.2/0002-build-add-a-some-missing-dependencies.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Thu, 26 Jul 2018 12:44:20 +0200
-Subject: [PATCH] build: add a some missing dependencies
-
- CC src/devices/ovs/src_devices_ovs_libnm_device_plugin_ovs_la-nm-device-ovs-bridge.lo
- In file included from src/devices/ovs/nm-device-ovs-bridge.c:20:
- In file included from ./shared/nm-default.h:307:
- In file included from ./src/nm-logging.h:25:
- ./libnm-core/nm-core-types.h:28:10: fatal error: 'nm-core-enum-types.h' file not found
- #include "nm-core-enum-types.h"
- ^~~~~~~~~~~~~~~~~~~~~~
- 1 error generated.
-
- CC src/settings/plugins/ifupdown/src_settings_plugins_ifupdown_libnms_ifupdown_core_la-nms-ifupdown-interface-parser.lo
- In file included from src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c:23:
- In file included from ./shared/nm-default.h:307:
- In file included from ./src/nm-logging.h:25:
- ./libnm-core/nm-core-types.h:28:10: fatal error: 'nm-core-enum-types.h' file not found
- #include "nm-core-enum-types.h"
- ^~~~~~~~~~~~~~~~~~~~~~
- 1 error generated.
- make: *** [Makefile:13904: src/settings/plugins/ifupdown/src_settings_plugins_ifupdown_libnms_ifupdown_core_la-nms-ifupdown-interface-parser.lo] Error 1
----
- Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index b1a2e69e6971..972b481f5cab 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -585,6 +585,7 @@ $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS): $(li
- $(src_devices_team_libnm_device_plugin_team_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
- $(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
- $(src_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-+$(src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-
- libnm_core_libnm_core_la_CPPFLAGS = \
- $(dflt_cppflags_libnm_core) \
-@@ -2496,6 +2497,7 @@ src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD = \
- $(LIBUDEV_LIBS)
-
- $(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-+$(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-
- check-local-symbols-settings-ifupdown: src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
- $(call check_so_symbols,$(builddir)/src/settings/plugins/ifupdown/.libs/libnm-settings-plugin-ifupdown.so)
diff --git a/patches/NetworkManager-1.12.2/autogen.sh b/patches/NetworkManager-1.12.2/autogen.sh
deleted file mode 100755
index 3b15bf8ab..000000000
--- a/patches/NetworkManager-1.12.2/autogen.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -e
-
-aclocal $ACLOCAL_FLAGS
-
-libtoolize \
- --force \
- --copy
-
-AUTOPOINT='intltoolize --automake --copy' \
-autoreconf \
- --force \
- --install \
- --warnings=cross \
- --warnings=syntax \
- --warnings=obsolete \
- --warnings=unsupported
-
diff --git a/patches/NetworkManager-1.12.2/series b/patches/NetworkManager-1.12.2/series
deleted file mode 100644
index 0d42250dd..000000000
--- a/patches/NetworkManager-1.12.2/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch
-0002-build-add-a-some-missing-dependencies.patch
-# 2c526f1cf5cee0068b11d0f9a9f3e046 - git-ptx-patches magic
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 5ee8dcd3e..0de554aed 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
#
# Paths and names
#
-NETWORKMANAGER_VERSION := 1.12.2
-NETWORKMANAGER_MD5 := 94d02b80b120f166927e6ef242b29a9b
+NETWORKMANAGER_VERSION := 1.14.0
+NETWORKMANAGER_MD5 := bedae3bb29bc68825b6c616a68cc6ba9
NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
NETWORKMANAGER_SUFFIX := tar.xz
-NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.12/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
+NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.14/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER)
NETWORKMANAGER_LICENSE := GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -69,7 +69,9 @@ NETWORKMANAGER_CONF_OPT = \
--disable-gtk-doc-html \
--disable-gtk-doc-pdf \
--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WIRELESS)-wext \
+ --with-iwd=no \
--without-libnm-glib \
+ --with-udev-dir=/usr/lib/udev \
--with-systemdsystemunitdir=/usr/lib/systemd/system \
--with-hostname-persist=default \
--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT)-systemd-journal \
@@ -89,7 +91,6 @@ NETWORKMANAGER_CONF_OPT = \
--without-dhcpcanon \
--with-dhclient=/usr/sbin/dhclient \
--without-dhcpcd \
- --without-dhcpcd-supports-ipv6 \
--with-config-dhcp-default=internal \
--without-resolvconf \
--without-netconfig \
@@ -102,8 +103,8 @@ NETWORKMANAGER_CONF_OPT = \
--without-libpsl \
--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_NMCLI)-nmcli \
--$(call ptx/wwo,PTXCONF_NETWORKMANAGER_NMTUI)-nmtui \
- --without-valgrind \
- --without-tests
+ --with-address-sanitizer=no \
+ --without-valgrind
ifdef PTXCONF_NETWORKMANAGER_WWAN
NETWORKMANAGER_LDFLAGS := \
--
2.19.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2018-09-17 8:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-17 8:04 [ptxdist] [PATCH] networkmanager: version bump 1.12.2 -> 1.14.0 Ladislav Michl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox