aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/networkmanager
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-02-15 21:05:26 +0100
committerKoen Kooi <koen@openembedded.org>2010-02-17 09:43:41 +0100
commit9373490e2b986abf2cd70f7929e85f0c27657079 (patch)
tree2a4c8df66033e3493a41a57d25e6e56e1f2f18f8 /recipes/networkmanager
parent498e0177005dd33861c661f794aa1e90281aca98 (diff)
downloadopenembedded-9373490e2b986abf2cd70f7929e85f0c27657079.tar.gz
network-manager: fix 0.7.9999
Diffstat (limited to 'recipes/networkmanager')
-rw-r--r--recipes/networkmanager/networkmanager-0.7.inc4
-rw-r--r--recipes/networkmanager/networkmanager_0.7.999.bb3
2 files changed, 4 insertions, 3 deletions
diff --git a/recipes/networkmanager/networkmanager-0.7.inc b/recipes/networkmanager/networkmanager-0.7.inc
index 3494aa7ae3..91c9190a88 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 2cf07701a8..4d9c533583 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}"