Skip to contentSkip to conversation

avahi: fix installed but not shipped warning

PATCH New Robert Yang 1 participant 2 messages Mar 5, 2013

lore
Share & tools
lore
#0 lore raw

cover avahi: fix installed but not shipped warning

The following changes since commit 93ec7b4d1550e07caec86e2998d0f94a01c7e785:

xserver-xf86-config: atom-pc doesn't need a xorg.conf (2013-03-04 14:42:11 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib robert/avahi
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/avahi

Robert Yang (1):
avahi: fix installed but not shipped warning

 meta/recipes-connectivity/avahi/avahi.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
1.7.11.2
#1 lore raw

PATCH 1/1 avahi: fix installed but not shipped warning

The avahi recipe has a warning when build without systemd feature:

WARNING: QA Issue: avahi: Files/directories were installed but not shipped
/usr/share/dbus-1

The /usr/share/dbus-1 is empty without systemd feature, there would be /usr/share/dbus-1/system-services with systemd. Use rmdir to fix the problem, and remove the ${datadir}/dbus-1/interfaces from the FILES list which had been removed clearly by the do_install.

[YOCTO #3939]

---
 meta/recipes-connectivity/avahi/avahi.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/avahi/avahi.inc +1 -1
index 3a4547c..1b7e26a 100644
@@ -90,7 +90,6 @@ FILES_avahi-daemon = "${sbindir}/avahi-daemon \
                       ${datadir}/avahi/introspection/*.introspect \
                       ${datadir}/avahi/avahi-service.dtd \
                       ${datadir}/avahi/service-types \
-                      ${datadir}/dbus-1/interfaces \
                       ${datadir}/dbus-1/system-services"
 FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
 FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*"
@@ -128,6 +127,7 @@ do_install() {
 	# if /var/run become non-empty in the future, need to install it via volatile
 	rm -rf ${D}/var/run
 	rm -rf ${D}${datadir}/dbus-1/interfaces
+	rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
 	rm -rf ${D}${libdir}/avahi
 
 	install -d ${D}${sysconfdir}/udhcpc.d
Signature · 1 line
1.7.11.2