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:44 +0100
commit662dfaeed9360c2ef95068d4eee0d23ad8ae7c8b (patch)
tree976d1cbda9659e8de60f2c5eed6349ea1d8e54eb
parentf5cc698a890c1a314218184697f634c70a9b0475 (diff)
downloadpoky-662dfaeed9360c2ef95068d4eee0d23ad8ae7c8b.tar.gz
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: cd237348221457ec5bd31da19668a68bb911edc8) 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() {
81 rm -rf ${D}${datadir}/dbus-1/interfaces 81 rm -rf ${D}${datadir}/dbus-1/interfaces
82 test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1 82 test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
83 rm -rf ${D}${libdir}/avahi 83 rm -rf ${D}${libdir}/avahi
84
85 # Move example service files out of /etc/avahi/services so we don't
86 # advertise ssh & sftp-ssh by default
87 install -d ${D}${docdir}/avahi
88 mv ${D}${sysconfdir}/avahi/services/* ${D}${docdir}/avahi
84} 89}
85 90
86PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd", "libavahi-compat-libdnssd", "", d)}" 91PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd", "libavahi-compat-libdnssd", "", d)}"