diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2014-09-26 12:35:11 +0200 |
---|---|---|
committer | Andreas Müller <schnitzeltony@googlemail.com> | 2014-10-01 10:11:35 +0200 |
commit | 3820c85c24ae0a6d1291cd863b0a673566aae65c (patch) | |
tree | f34d7a5d4ac9a8f7cbf5ad46413e7de86065e193 /meta-oe | |
parent | cc16308a7434f2c3266e8e901d55c204834f3806 (diff) | |
download | meta-openembedded-contrib-3820c85c24ae0a6d1291cd863b0a673566aae65c.tar.gz |
networkmanager update to 0.9.8.10
* use nss as default crypto engine to get out of blacklist due to missing gcrypt
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-NetworkManager.service-remove-reference-to-NetworkMa.patch | 32 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb (renamed from meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb) | 11 |
2 files changed, 4 insertions, 39 deletions
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-NetworkManager.service-remove-reference-to-NetworkMa.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-NetworkManager.service-remove-reference-to-NetworkMa.patch deleted file mode 100644 index bbcd021c13..0000000000 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-NetworkManager.service-remove-reference-to-NetworkMa.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1137846f778dc9f3be0c89cb2df18d3a37f844d7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 19 Apr 2013 18:34:09 +0200 -Subject: [PATCH] NetworkManager.service: remove reference to - NetworkManager-wait-online.service -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* NetworkManager-wait-online.service crashes -* NetworkManager works fine without NetworkManager-wait-online - -Upstream-Status: Inappropriate [config] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - data/NetworkManager.service.in | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in -index 16b53b6..a2e913c 100644 ---- a/data/NetworkManager.service.in -+++ b/data/NetworkManager.service.in -@@ -18,5 +18,4 @@ KillMode=process - [Install] - WantedBy=multi-user.target - Alias=dbus-org.freedesktop.NetworkManager.service --Also=NetworkManager-wait-online.service - --- -1.7.4.4 - diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb index bdda59c040..0792e8ed17 100644 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.0.bb +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.8.10.bb @@ -4,20 +4,17 @@ SECTION = "net/misc" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b" -DEPENDS = "libnl dbus dbus-glib udev wireless-tools gnutls util-linux ppp" - -PNBLACKLIST[networkmanager] = "BROKEN: needs to detect gcrypt from pkg-config (error: gnutls explicitly requested but gcrypt not found on system)" +DEPENDS = "libnl dbus dbus-glib udev wireless-tools nss util-linux ppp" inherit gnome gettext systemd SRC_URI = " \ ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \ - file://0002-NetworkManager.service-remove-reference-to-NetworkMa.patch \ file://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \ " -SRC_URI[md5sum] = "38d28f6bd9220d85dfff47210706195c" -SRC_URI[sha256sum] = "c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b" +SRC_URI[md5sum] = "aad2558887e25417c52eb2deaade2f85" +SRC_URI[sha256sum] = "064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972" S = "${WORKDIR}/NetworkManager-${PV}" @@ -28,7 +25,7 @@ EXTRA_OECONF = " \ --disable-ifnet \ --disable-ifcfg-suse \ --with-netconfig \ - --with-crypto=gnutls \ + --with-crypto=nss \ --disable-more-warnings \ --with-dhclient=${base_sbindir}/dhclient \ --with-iptables=${sbindir}/iptables \ |