summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRob Bradford <rob@linux.intel.com>2008-10-31 12:32:21 +0000
committerRob Bradford <rob@linux.intel.com>2008-10-31 13:35:29 +0000
commit03d16ab59d183eff3f747e9bb376b23b0a53f78f (patch)
tree1afc8f0661ee55ffa5f508934ea61a5dcc21c4cb /meta/packages
parent1f833df9f471754b7ec290aeb6213b30f26de181 (diff)
downloadpoky-03d16ab59d183eff3f747e9bb376b23b0a53f78f.tar.gz
networkmanager: Remove conflicting directories (managed by volatiles)
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/networkmanager/networkmanager_svn.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/packages/networkmanager/networkmanager_svn.bb b/meta/packages/networkmanager/networkmanager_svn.bb
index 0061bb28e9..2ff20ca4b0 100644
--- a/meta/packages/networkmanager/networkmanager_svn.bb
+++ b/meta/packages/networkmanager/networkmanager_svn.bb
@@ -7,7 +7,7 @@ DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp gnome-common"
7RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client" 7RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
8 8
9PV = "0.7+svnr${SRCREV}" 9PV = "0.7+svnr${SRCREV}"
10PR = "r7" 10PR = "r8"
11 11
12SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \ 12SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
13 file://no-restarts.diff;patch=1;pnum=0 \ 13 file://no-restarts.diff;patch=1;pnum=0 \
@@ -33,6 +33,8 @@ do_install_append () {
33 install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles 33 install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
34 # This overwrites the provided init script 34 # This overwrites the provided init script
35 install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/ 35 install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/
36 rmdir ${D}/var/run/NetworkManager
37 rmdir ${D}/var/run
36} 38}
37 39
38do_stage () { 40do_stage () {