summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <pbarker@konsulko.com>2020-05-20 17:31:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-22 17:07:41 +0100
commitcd237348221457ec5bd31da19668a68bb911edc8 (patch)
tree336ac511321eb181ce469001ec46dedb91a2c52d
parent8fc19639f47b959a141dae231395bbababa644e1 (diff)
downloadopenembedded-core-cd237348221457ec5bd31da19668a68bb911edc8.tar.gz
openembedded-core-cd237348221457ec5bd31da19668a68bb911edc8.tar.bz2
openembedded-core-cd237348221457ec5bd31da19668a68bb911edc8.zip
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). Signed-off-by: Paul Barker <pbarker@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/avahi/avahi_0.8.bb5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi_0.8.bb b/meta/recipes-connectivity/avahi/avahi_0.8.bb
index 3a2c24f9f8..2b0c71159d 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.8.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb
@@ -81,6 +81,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)}"