Skip to contentSkip to conversation

avahi: Don't advertise example services by default

PATCH New Paul Barker 1 participant 1 message May 23, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 avahi: Don't advertise example services by default

The example service files are placed into /etc/avahi/services when we run make install for avahi. This results in ssh and sftp-ssh services being announced by default even if no ssh server is installed in an image.

These example files should be moved away to another location such as /usr/share/doc/avahi (taking inspiration from Arch Linux).

---
 meta/recipes-connectivity/avahi/avahi.inc | 5 +++++
 1 file changed, 5 insertions(+)
meta/recipes-connectivity/avahi/avahi.inc +5 -0
index 94fe6a16b6..6acedb5412 100644
@@ -77,6 +77,11 @@ do_install() {
 	rm -rf ${D}${datadir}/dbus-1/interfaces
 	test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
 	rm -rf ${D}${libdir}/avahi
+
+	# Move example service files out of /etc/avahi/services so we don't
+	# advertise ssh & sftp-ssh by default
+	install -d ${D}${docdir}/avahi
+	mv ${D}${sysconfdir}/avahi/services/* ${D}${docdir}/avahi
 }
 
 PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd", "libavahi-compat-libdnssd", "", d)}"
Signature · 1 line
2.26.2