summaryrefslogtreecommitdiffstats
path: root/meta/packages/networkmanager
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-08-11 13:34:54 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-12 15:39:24 +0100
commite101642a61fc418273c1cd4d58a9564b4bdecc5c (patch)
tree8890d90be0403bd1a9161f32ceb3d5cd1b7a27b5 /meta/packages/networkmanager
parentcf1e754b3fee3c7ae907e7ae30233083d7892215 (diff)
downloadpoky-e101642a61fc418273c1cd4d58a9564b4bdecc5c.tar.gz
populate-volatile.sh: cleanup duplicated invocations and remove boot warning
For one, populate-volatile.sh is itself a rcS script which is invoked earlier than package's own postinst method (last one in rcS). If package has already installed their volatile files correctly, it doesn't make sense to update volatile again in postinst since nothing is changed. On the other hand, dbus/hal are special since their user/group are only created in the target. If they pre-install volatiles like others, populate-volatile.sh will report "undefined user" since at that time their user/group haven't been created. The better way solving this is to generate their volatile in the fly after user/group are created, and then update volatiles. This fix [BUGID #121] Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta/packages/networkmanager')
-rw-r--r--meta/packages/networkmanager/networkmanager_svn.bb9
1 files changed, 1 insertions, 8 deletions
diff --git a/meta/packages/networkmanager/networkmanager_svn.bb b/meta/packages/networkmanager/networkmanager_svn.bb
index f60496db70..40f04e497c 100644
--- a/meta/packages/networkmanager/networkmanager_svn.bb
+++ b/meta/packages/networkmanager/networkmanager_svn.bb
@@ -8,7 +8,7 @@ DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp gnome-common p
8RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client" 8RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
9 9
10PV = "0.7+svnr${SRCREV}" 10PV = "0.7+svnr${SRCREV}"
11PR = "r9" 11PR = "r10"
12 12
13SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \ 13SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \
14 file://no-restarts.diff;patch=1;pnum=0 \ 14 file://no-restarts.diff;patch=1;pnum=0 \
@@ -38,13 +38,6 @@ do_install_append () {
38 rmdir ${D}/var/run 38 rmdir ${D}/var/run
39} 39}
40 40
41pkg_postinst_${PN} () {
42 if [ "x$D" != "x" ]; then
43 exit 1
44 fi
45 /etc/init.d/populate-volatile.sh update
46}
47
48PACKAGES =+ "libnmutil libnmglib" 41PACKAGES =+ "libnmutil libnmglib"
49 42
50FILES_libnmutil += "${libdir}/libnm-util.so.*" 43FILES_libnmutil += "${libdir}/libnm-util.so.*"