[oe-commits] Koen Kooi : network-manager: fix 0.7.9999

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 9373490e2b986abf2cd70f7929e85f0c27657079
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9373490e2b986abf2cd70f7929e85f0c27657079

Author: Koen Kooi <koen at openembedded.org>
Date:   Mon Feb 15 21:05:26 2010 +0100

network-manager: fix 0.7.9999

---

 recipes/networkmanager/networkmanager-0.7.inc    |    4 ++--
 recipes/networkmanager/networkmanager_0.7.999.bb |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/recipes/networkmanager/networkmanager-0.7.inc b/recipes/networkmanager/networkmanager-0.7.inc
index 3494aa7..91c9190 100644
--- a/recipes/networkmanager/networkmanager-0.7.inc
+++ b/recipes/networkmanager/networkmanager-0.7.inc
@@ -28,7 +28,7 @@ do_stage () {
 # Work around dbus permission problems since we lack a proper at_console
 do_install_prepend() {
 		sed -i -e s:deny:allow:g ${S}/src/NetworkManager.conf
-		sed -i -e s:deny:allow:g ${S}/system-settings/src/nm-system-settings.conf
+		sed -i -e s:deny:allow:g ${S}/system-settings/src/nm-system-settings.conf || true
 		sed -i -e s:deny:allow:g ${S}/callouts/nm-dispatcher.conf
 }
 
@@ -38,7 +38,7 @@ do_install_append () {
         # Test binaries
         install -d ${D}/usr/bin
         install -m 0755 ${S}/test/.libs/nm-tool ${D}/usr/bin
-        install -m 0755 ${S}/test/.libs/libnm_glib_test ${D}/usr/bin
+        install -m 0755 ${S}/test/.libs/libnm* ${D}/usr/bin
         install -m 0755 ${S}/test/.libs/nm-online ${D}/usr/bin
 }
 
diff --git a/recipes/networkmanager/networkmanager_0.7.999.bb b/recipes/networkmanager/networkmanager_0.7.999.bb
index 2cf0770..4d9c533 100644
--- a/recipes/networkmanager/networkmanager_0.7.999.bb
+++ b/recipes/networkmanager/networkmanager_0.7.999.bb
@@ -2,7 +2,7 @@ require networkmanager-0.7.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += " \
     file://remove-gtk-doc-make.patch;patch=1 \
@@ -19,6 +19,7 @@ do_configure_prepend() {
     sed -i -e /^docs/d ${S}/configure.ac
 }
 
+FILES_${PN} += "  ${datadir}/polkit-1/"
 
 S = "${WORKDIR}/NetworkManager-${PV}"