diff options
| author | Ulrich Ölmann <u.oelmann@pengutronix.de> | 2020-02-19 12:19:19 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-05-08 10:54:22 +0200 |
| commit | 94e2e19f52fad64f1c985728d781fe89488bb6df (patch) | |
| tree | 645af0122bc36f00a7059eb03089fd506e4f7c6d | |
| parent | 253816b843e2f13451935db114a714d3d0b905c0 (diff) | |
| download | ptxdist-94e2e19f52fad64f1c985728d781fe89488bb6df.tar.gz ptxdist-94e2e19f52fad64f1c985728d781fe89488bb6df.tar.xz | |
networkmanager: version bump 1.20.8 -> 1.22.10
Instead of hardcoding NetworkManager's major & minor versions in the URL derive
that information from the already existing parameter.
Two new config options have been added in the meantime (see NetworkManager
commits [1] & [2]) which are both set to their reasonable default values.
The license did not change, but its text was adjusted - citing from
NetworkManagers's commit [3]:
The update to the GPL text is purely cosmetic. However, shipping the exact
same file as GNU publishes may help distros that deduplicate the license texts
or hardlink duplicates.
[1] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/69f048bf0ca387d2dc4683cfdfe9d170bfceb52b
[2] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/d27fcd07541ae6f524115d5b0f36e14673135ca3
[3] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/e9f2ea6c22f36cb7986d2228763629ed44b9e76b
Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
Message-Id: <20200219111919.12568-1-u.oelmann@pengutronix.de>
[mol: update from 1.22.8, add missing dependency, sort meson options]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/networkmanager.in | 1 | ||||
| -rw-r--r-- | rules/networkmanager.make | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/rules/networkmanager.in b/rules/networkmanager.in index 16703ea6c..22c311f04 100644 --- a/rules/networkmanager.in +++ b/rules/networkmanager.in @@ -19,6 +19,7 @@ menuconfig NETWORKMANAGER select LIBNDP select LIBNEWT if NETWORKMANAGER_NMTUI select LIBUUID + select MOBILE_BROADBAND_PROVIDER_INFO if NETWORKMANAGER_WWAN select MODEMMANAGER if NETWORKMANAGER_WWAN select POLKIT if NETWORKMANAGER_POLKIT select PPP if NETWORKMANAGER_PPP diff --git a/rules/networkmanager.make b/rules/networkmanager.make index de0e755b3..db924254f 100644 --- a/rules/networkmanager.make +++ b/rules/networkmanager.make @@ -15,15 +15,15 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager # # Paths and names # -NETWORKMANAGER_VERSION := 1.20.8 -NETWORKMANAGER_MD5 := c0ceb5ab14bfdfeee07536d94cc5c548 +NETWORKMANAGER_VERSION := 1.22.10 +NETWORKMANAGER_MD5 := b7b8875c3ef1db0989f78351ba3e8ad8 NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) NETWORKMANAGER_SUFFIX := tar.xz -NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.20/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) +NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(basename $(NETWORKMANAGER_VERSION))/$(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 -NETWORKMANAGER_LICENSE_FILES := file://COPYING;md5=cbbffd568227ada506640fe950a4823b +NETWORKMANAGER_LICENSE_FILES := file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 # ---------------------------------------------------------------------------- # Prepare @@ -37,6 +37,7 @@ NETWORKMANAGER_CONF_OPT = \ $(CROSS_MESON_USR) \ -Dbluez5_dun=false \ -Dconcheck=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_CONCHECK) \ + -Dconfig_auth_polkit_default=default \ -Dconfig_dhcp_default=internal \ -Dconfig_dns_rc_manager_default=file \ -Dconfig_logging_backend_default=default \ @@ -65,6 +66,7 @@ NETWORKMANAGER_CONF_OPT = \ -Dmore_asserts=no \ -Dmore_logging=false \ -Dnetconfig=false \ + -Dnm_cloud_setup=false \ -Dnmcli=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_NMCLI) \ -Dnmtui=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_NMTUI) \ -Dofono=false \ |