On Fri, 12 May 2023 at 16:11, Eero Aaltonen via lists.openembedded.org
<eero.aaltonen=vaisala....@lists.openembedded.org> wrote:
> --- a/meta/recipes-connectivity/avahi/avahi_0.8.bb
> +++ b/meta/recipes-connectivity/avahi/avahi_0.8.bb
> @@ -83,10 +83,13 @@ RRECOMMENDS:${PN}:append:libc-glibc = " libnss-mdns"
> do_install() {
> autotools_do_install
> rm -rf ${D}/run
> - 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
>
> + if ${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'false', 'true',
> d)}; then
> + rm -rf ${D}${datadir}/dbus-1/interfaces
> + test -d ${D}${datadir}/dbus-1 && rmdir
> --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
> + fi
> +
> # Move example service files out of /etc/avahi/services so we don't
> # advertise ssh & sftp-ssh by default
> install -d ${D}${docdir}/avahi
> @@ -135,7 +138,7 @@ FILES:avahi-daemon = "${sbindir}/avahi-daemon \
> ${sysconfdir}/avahi/services \
> ${sysconfdir}/dbus-1 \
> ${sysconfdir}/init.d/avahi-daemon \
> - ${datadir}/avahi/introspection/*.introspect \
> + ${@bb.utils.contains('PACKAGECONFIG', 'dbus',
> '${datadir}/dbus-1/interfaces', '', d)} \
> ${datadir}/avahi/avahi-service.dtd \
> ${datadir}/avahi/service-types \
> ${datadir}/dbus-1/system-services"
Why are these conditional? That packageconfig is defined as
PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
so upstream should simply handle installing (or not) the needed files by itself?
Alex
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181233):
https://lists.openembedded.org/g/openembedded-core/message/181233
Mute This Topic: https://lists.openembedded.org/mt/98849856/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
