diff options
| author |   Paul Barker <pbarker@konsulko.com> | 2020-05-23 20:16:06 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2020-05-26 04:12:28 -1000 |
| commit | c88cf750f26f6786d6ba5b4f1f7e5d4f0c800e6e (patch) | |
| tree | 1623c74b361611b34d594f633d2815c9810084f7 /meta/recipes-connectivity | |
| parent | 5472a4f30aa1c599ca85efc3f973f2fd9dbc4476 (diff) | |
| download | openembedded-core-contrib-c88cf750f26f6786d6ba5b4f1f7e5d4f0c800e6e.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).
Signed-off-by: Paul Barker <pbarker@konsulko.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-connectivity')
| -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() { 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)}" |