summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-08-15 16:55:22 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-15 17:21:54 (GMT)
commit093149d22461a3a76980635bc46cdba1c7c0b181 (patch)
tree48ff9e52ac8c51682f0350f4b6440ef94d6e54bc /meta/recipes-connectivity
parentccec1994420c543e54377dd1c080cd807c8c0e7c (diff)
downloadpoky-093149d22461a3a76980635bc46cdba1c7c0b181.tar.gz
avahi: unset FILES_avahi to avoid packaging files there
The main avahi recipe doesn't package anything into ${PN}. If a library is enabled but not put into a separate package it ends up in ${PN} and all the packages are renamed using it's soname - ie libdns-sd-daemon. Avoid this by clearing FILES_avahi so extra files are unpackaged instead of creating a new package. Also actually remove /var as the comments claim so the avahi package is truly empty. (From OE-Core rev: 324c6ac33ab44e4c1949b8001a53a8ffd2a979e2) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 3318f40..b97c4c5 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -73,6 +73,9 @@ do_configure_prepend() {
73 73
74PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils" 74PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils"
75 75
76# As avahi doesn't put any files into PN, clear the files list to avoid problems
77# if extra libraries appear.
78FILES_avahi = ""
76FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ 79FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
77 ${sysconfdir}/avahi/avahi-autoipd.action \ 80 ${sysconfdir}/avahi/avahi-autoipd.action \
78 ${sysconfdir}/dhcp/*/avahi-autoipd \ 81 ${sysconfdir}/dhcp/*/avahi-autoipd \
@@ -122,7 +125,8 @@ do_install() {
122 # don't install /var/run when populating rootfs. Do it through volatile 125 # don't install /var/run when populating rootfs. Do it through volatile
123 # /var/run of current version is empty, so just remove it. 126 # /var/run of current version is empty, so just remove it.
124 # if /var/run become non-empty in the future, need to install it via volatile 127 # if /var/run become non-empty in the future, need to install it via volatile
125 rm -rf ${D}/var/run 128 rm -rf ${D}${localstatedir}/run
129 rmdir --ignore-fail-on-non-empty ${D}${localstatedir}
126 rm -rf ${D}${datadir}/dbus-1/interfaces 130 rm -rf ${D}${datadir}/dbus-1/interfaces
127 rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1 131 rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
128 rm -rf ${D}${libdir}/avahi 132 rm -rf ${D}${libdir}/avahi