summaryrefslogtreecommitdiffstats
path: root/meta/packages/devicekit
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/devicekit
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/devicekit')
-rw-r--r--meta/packages/devicekit/devicekit_git.bb4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/packages/devicekit/devicekit_git.bb b/meta/packages/devicekit/devicekit_git.bb
index 06bcfd3f12..74b639f6c1 100644
--- a/meta/packages/devicekit/devicekit_git.bb
+++ b/meta/packages/devicekit/devicekit_git.bb
@@ -5,7 +5,7 @@ SRC_URI = "git://anongit.freedesktop.org/DeviceKit/DeviceKit;protocol=git \
5 file://volatile" 5 file://volatile"
6 6
7PV = "002+git${SRCREV}" 7PV = "002+git${SRCREV}"
8PR = "r1" 8PR = "r2"
9SRCREV = "014d168ba4bf40c9bae487bacff8bf2aa054b5f6" 9SRCREV = "014d168ba4bf40c9bae487bacff8bf2aa054b5f6"
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
@@ -25,8 +25,6 @@ pkg_postinst_devicekit () {
25 exit 1 25 exit 1
26 fi 26 fi
27 27
28 /etc/init.d/populate-volatile.sh update
29
30 DBUSPID=`pidof dbus-daemon` 28 DBUSPID=`pidof dbus-daemon`
31 29
32 if [ "x$DBUSPID" != "x" ]; then 30 if [ "x$DBUSPID" != "x" ]; then