From a6ee553b428d657deaca9daf752f3fc52ee8f35a Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Sat, 23 May 2020 20:16:06 +0100 Subject: 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). (From OE-Core rev: 3d8fdfc57d7fd846c8668daf730cf820ea5ecb13) Signed-off-by: Paul Barker Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-connectivity/avahi/avahi.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index 94fe6a16b6..6acedb5412 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -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)}" -- cgit v1.2.3-54-g00ecf