networkmanager 0.9.2.0: add patch to fix dhcp version detection

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

2 files changed, 35 insertions, 0 deletions

diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch
new file mode 100644
index 0000000000..ba49bcd937
--- /dev/null
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch
@@ -0,0 +1,32 @@
+From 6e7ff802b689df18d7bd1d1a83639925371650cc Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Thu, 17 Nov 2011 11:17:42 +0100
+Subject: [PATCH] don't try to run /sbin/dhclient to get the version number, this break cross-compiling
+
+Upstream-status: Unknown
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ configure.ac |    6 ------
+ 1 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5ee0cb0..b727db7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -497,12 +497,6 @@ case "${with_dhclient}" in
+        /*)
+                DHCLIENT_PATH="${with_dhclient}"
+                DHCLIENT_VERSION=4
+-               if test -x "${with_dhclient}"; then
+-                       case `"${with_dhclient}" --version 2>&1` in
+-                               "isc-dhclient-4"*) DHCLIENT_VERSION=4; break;;
+-                               "isc-dhclient-V3"*) DHCLIENT_VERSION=3; break;;
+-                       esac
+-               fi
+                AC_MSG_NOTICE(using dhclient at ${DHCLIENT_PATH})
+                ;;
+        no)     AC_MSG_NOTICE(dhclient support disabled)
+-- 
+1.7.2.5
+
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
index 3173c726e7..6d5a7ac7bd 100644
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_0.9.2.0.bb
@@ -4,10 +4,13 @@ SECTION = "net/misc"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b"
 
+PR = "r1"
+
 DEPENDS = "systemd libnl dbus dbus-glib udev wireless-tools polkit gnutls util-linux ppp"
 inherit gnome gettext
 
 SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.bz2 \
+    file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
     file://gtk-doc.make \
 "
 SRC_URI[md5sum] = "bc0b00b8a187762d93c50a9706b4c5c3"