From 16877ce14b9c6b813267e9b1cbf904ccf7b86292 Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Tue, 27 Jul 2010 16:05:29 +0800 Subject: 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 --- meta/packages/avahi/avahi.inc | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'meta/packages/avahi/avahi.inc') diff --git a/meta/packages/avahi/avahi.inc b/meta/packages/avahi/avahi.inc index 4e2949319..2a5bf4a18 100644 --- a/meta/packages/avahi/avahi.inc +++ b/meta/packages/avahi/avahi.inc @@ -64,6 +64,15 @@ INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" +do_install() { + autotools_do_install + + # don't install /var/run when populating rootfs. Do it through volatile + # /var/run of current version is empty, so just remove it. + # if /var/run become non-empty in the future, need to install it via volatile + rm -rf ${D}/var/run +} + # At the time the postinst runs, dbus might not be setup so only restart if running pkg_postinst_avahi-daemon () { -- cgit v1.2.3