diff options
author | Yu Ke <ke.yu@intel.com> | 2010-07-27 16:05:29 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-30 14:50:30 +0100 |
commit | 16877ce14b9c6b813267e9b1cbf904ccf7b86292 (patch) | |
tree | 78f603922456c06f55be10e491da8abbba7ceba1 /meta/packages/avahi/avahi.inc | |
parent | ae035f151f87a9a1ff48ceac10cff45754c21027 (diff) | |
download | poky-16877ce14b9c6b813267e9b1cbf904ccf7b86292.tar.gz |
avahi: fix the /var/run conflict with other package
avahi will create an empty /var/run dir, which will conflict with base-files package.
This patch fix this by using populate-volatiles.sh approach recommended by OE handbook.
Signed-off-by: Yu Ke <ke.yu@intel.com>
Diffstat (limited to 'meta/packages/avahi/avahi.inc')
-rw-r--r-- | meta/packages/avahi/avahi.inc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/meta/packages/avahi/avahi.inc b/meta/packages/avahi/avahi.inc index 4e29493196..2a5bf4a182 100644 --- a/meta/packages/avahi/avahi.inc +++ b/meta/packages/avahi/avahi.inc | |||
@@ -64,6 +64,15 @@ INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" | |||
64 | INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" | 64 | INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" |
65 | INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" | 65 | INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" |
66 | 66 | ||
67 | do_install() { | ||
68 | autotools_do_install | ||
69 | |||
70 | # don't install /var/run when populating rootfs. Do it through volatile | ||
71 | # /var/run of current version is empty, so just remove it. | ||
72 | # if /var/run become non-empty in the future, need to install it via volatile | ||
73 | rm -rf ${D}/var/run | ||
74 | } | ||
75 | |||
67 | # At the time the postinst runs, dbus might not be setup so only restart if running | 76 | # At the time the postinst runs, dbus might not be setup so only restart if running |
68 | 77 | ||
69 | pkg_postinst_avahi-daemon () { | 78 | pkg_postinst_avahi-daemon () { |