diff options
author | Paul Barker <pbarker@konsulko.com> | 2020-05-23 20:16:06 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-28 18:15:29 +0100 |
commit | 9c8049068406532c3dd5d8906c595218b0fefd40 (patch) | |
tree | 702edbe581b02ba4a86a28d095cf701e3b82ceb9 | |
parent | df1424206ab6effe00cd9d0aa1247c3eb9aa9663 (diff) | |
download | poky-9c8049068406532c3dd5d8906c595218b0fefd40.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: c88cf750f26f6786d6ba5b4f1f7e5d4f0c800e6e)
Signed-off-by: Paul Barker <pbarker@konsulko.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/avahi/avahi.inc | 5 |
1 files changed, 5 insertions, 0 deletions
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() { | |||
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 | ||
82 | PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd", "libavahi-compat-libdnssd", "", d)}" | 87 | PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd", "libavahi-compat-libdnssd", "", d)}" |