summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <pbarker@konsulko.com>2020-05-23 19:16:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-02 12:32:50 (GMT)
commita6ee553b428d657deaca9daf752f3fc52ee8f35a (patch)
tree6e1f879a22a53c974c016144f3d86339fb65b3f7
parent00c9ca0b030f6ec9072bcccc22cb07d46a4f12c4 (diff)
downloadpoky-a6ee553b428d657deaca9daf752f3fc52ee8f35a.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: 3d8fdfc57d7fd846c8668daf730cf820ea5ecb13) Signed-off-by: Paul Barker <pbarker@konsulko.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 94fe6a1..6acedb5 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -77,6 +77,11 @@ do_install() {
77 rm -rf ${D}${datadir}/dbus-1/interfaces 77 rm -rf ${D}${datadir}/dbus-1/interfaces
78 test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1 78 test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
79 rm -rf ${D}${libdir}/avahi 79 rm -rf ${D}${libdir}/avahi
80
81 # Move example service files out of /etc/avahi/services so we don't
82 # advertise ssh & sftp-ssh by default
83 install -d ${D}${docdir}/avahi
84 mv ${D}${sysconfdir}/avahi/services/* ${D}${docdir}/avahi
80} 85}
81 86
82PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd", "libavahi-compat-libdnssd", "", d)}" 87PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd", "libavahi-compat-libdnssd", "", d)}"