[oe-commits] Koen Kooi : networkmanager 0.8.1: cleanup recipe, fix loopback init with a patch from debian, fix dhclient and iptable paths as well

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: b7c4a26d9b83e9efa92fd052521cd9175663a39d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b7c4a26d9b83e9efa92fd052521cd9175663a39d

Author: Koen Kooi <koen at openembedded.org>
Date:   Fri Sep 24 17:52:34 2010 +0200

networkmanager 0.8.1: cleanup recipe, fix loopback init with a patch from debian, fix dhclient and iptable paths as well

---

 .../10-dont_require_ifup_for_lo.patch              |   30 ++++++++++++++++++++
 recipes/networkmanager/networkmanager_0.8.1.bb     |   16 ++++++----
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/recipes/networkmanager/networkmanager-0.8.1/10-dont_require_ifup_for_lo.patch b/recipes/networkmanager/networkmanager-0.8.1/10-dont_require_ifup_for_lo.patch
new file mode 100644
index 0000000..ffea6ff
--- /dev/null
+++ b/recipes/networkmanager/networkmanager-0.8.1/10-dont_require_ifup_for_lo.patch
@@ -0,0 +1,30 @@
+commit 7e87d79de6d1eeeb47c8e43fb44962bce9c70664
+Author: Dan Williams <dcbw at redhat.com>
+Date:   Tue Aug 3 11:36:59 2010 -0700
+
+    debian: don't require ifup for enabling loopback (bgo #625427)
+    
+    But use it if it's installed.
+
+diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c
+index ef9475a..37eb645 100644
+--- a/src/backends/NetworkManagerDebian.c
++++ b/src/backends/NetworkManagerDebian.c
+@@ -1,3 +1,4 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+ /* NetworkManager -- Network link manager
+  *
+  * Matthew Garrett <mjg59 at srcf.ucam.org>
+@@ -44,7 +45,11 @@
+  */
+ void nm_system_enable_loopback (void)
+ {
+-	nm_spawn_process ("/sbin/ifup lo");
++	/* ifupdown isn't always installed (bgo #625427) */
++	if (g_file_test ("/sbin/ifup", G_FILE_TEST_EXISTS))
++		nm_spawn_process ("/sbin/ifup lo");
++	else
++		nm_generic_enable_loopback ();
+ }
+ 
+ /*
diff --git a/recipes/networkmanager/networkmanager_0.8.1.bb b/recipes/networkmanager/networkmanager_0.8.1.bb
index eb77279..90b8946 100644
--- a/recipes/networkmanager/networkmanager_0.8.1.bb
+++ b/recipes/networkmanager/networkmanager_0.8.1.bb
@@ -1,11 +1,12 @@
 require networkmanager-0.7.inc
 
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI += " \
     file://remove-gtk-doc-make.patch \
+    file://10-dont_require_ifup_for_lo.patch \ 
     file://nm-system-settings.conf \
     file://NetworkManager \
     file://gtk-doc.make \
@@ -14,6 +15,11 @@ SRC_URI += " \
 SRC_URI[md5sum] = "96e551149dda8f6e0a5621f77468ba79"
 SRC_URI[sha256sum] = "dc126fbe3199d47899c4781e4fff32cee404dc7c728c6ade9eaa899bd80f19fa"
 
+S = "${WORKDIR}/NetworkManager-${PV}"
+
+EXTRA_OECONF += " --with-dhclient=${base_sbindir}/dhclient \
+                  --with-iptables=${sbindir}/iptables \
+"
 
 do_configure_prepend() {
     cp ${WORKDIR}/gtk-doc.make ${S}/
@@ -22,13 +28,9 @@ do_configure_prepend() {
     sed -i -e /^docs/d ${S}/configure.ac
 }
 
-FILES_${PN} += "  ${datadir}/polkit-1/"
-
-S = "${WORKDIR}/NetworkManager-${PV}"
-
 do_install_append () {
 	install -d ${D}/etc/NetworkManager/
-	install -m 0644 ${WORKDIR}/nm-system-settings.conf ${D}/etc/NetworkManager/
+	install -m 0644 ${WORKDIR}/nm-system-settings.conf ${D}/etc/NetworkManager/NetworkManager.conf
 	install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d
 	
 	# Install an empty VPN folder as nm-connection-editor will happily segfault without it :o.
@@ -36,4 +38,6 @@ do_install_append () {
 	install -d ${D}/etc/NetworkManager/VPN
 }
 
+FILES_${PN} += " ${datadir}/polkit-1/"
+RRECOMMENDS_${PN} += "iptables"