libostree: make sure libavahi-client is built
PATCH 1/1 libostree: make sure libavahi-client is built
Avahi support also needs libavahi-client, which is built by avahi if avahi-daemon and dbus is selected.
Fixes:
http://autobuild.buildroot.net/results/1edfb60add17945eabc557e1dbfb08a0ba466df9/
--- package/libostree/libostree.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
package/libostree/libostree.mk +6 -2
@@ -27,9 +27,13 @@ else LIBOSTREE_CONF_OPTS += --without-openssl endif -ifeq ($(BR2_PACKAGE_AVAHI),y) +# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon +# and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config +# option yet, use the avahi-daemon and dbus config symbols to check for +# libavahi-client. +ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) LIBOSTREE_CONF_OPTS += --with-avahi -LIBOSTREE_DEPENDENCIES += avahi +LIBOSTREE_DEPENDENCIES += avahi dbus else LIBOSTREE_CONF_OPTS += --without-avahi endif
Signature · 1 line
2.15.1
PATCH 1/1 libostree: make sure libavahi-client is built
Marcus,
Quoted 18 lines · Marcus Folkesson
Avahi support also needs libavahi-client, which is built by avahi if avahi-daemon and dbus is selected.
Fixes:
http://autobuild.buildroot.net/results/1edfb60add17945eabc557e1dbfb08a0ba466df9/Signed-off-by Marcus Folkesson <[email protected]>--- package/libostree/libostree.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)package/libostree/libostree.mk +0
-0@@ -27,9 +27,13 @@ else LIBOSTREE_CONF_OPTS += --without-openssl endif
package/libostree/libostree.mk else · line 36
Quoted 10 lines
package/libostree/libostree.mk +6
-2-ifeq ($(BR2_PACKAGE_AVAHI),y) +# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon +# and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config +# option yet, use the avahi-daemon and dbus config symbols to check for +# libavahi-client. +ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) LIBOSTREE_CONF_OPTS += --with-avahi -LIBOSTREE_DEPENDENCIES += avahi +LIBOSTREE_DEPENDENCIES += avahi dbus
I patched the failing build and it now builds.
I've kicked off a validation using utils/test-pkg with the following config and both of your libostree patches applied. BR2_TOOLCHAIN_USES_GLIBC=y
BR2_PACKAGE_LIBOSTREE=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_LIBFUSE=y
BR2_PACKAGE_LIBGLIB2=y
BR2_PACKAGE_LIBGPGME=y
BR2_PACKAGE_XZ=y
BR2_PACKAGE_AVAHI=y
BR2_PACKAGE_AVAHI_DAEMON=y
BR2_PACKAGE_DBUS=y
If anything pops up, I'll respond here tomorrow.
Matt
PATCH 1/1 libostree: make sure libavahi-client is built
Marcus,
Quoted 10 lines · Matthew Weber
Marcus,
Quoted 6 lines · Marcus Folkesson
Avahi support also needs libavahi-client, which is built by avahi if avahi-daemon and dbus is selected.
Fixes:
http://autobuild.buildroot.net/results/1edfb60add17945eabc557e1dbfb08a0ba466df9/
[snip]
Quoted 16 lines
Tested-by Matt Weber <[email protected]>I've kicked off a validation using utils/test-pkg with the following config and both of your libostree patches applied. BR2_TOOLCHAIN_USES_GLIBC=y
BR2_PACKAGE_LIBOSTREE=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_LIBFUSE=y
BR2_PACKAGE_LIBGLIB2=y
BR2_PACKAGE_LIBGPGME=y
BR2_PACKAGE_XZ=y
BR2_PACKAGE_AVAHI=y
BR2_PACKAGE_AVAHI_DAEMON=y
BR2_PACKAGE_DBUS=y
test-pkg looked good with the above config and the case of avahi&dbus disabled.
Matt
PATCH 1/1 libostree: make sure libavahi-client is built
Matthew,
Quoted 33 lines · Matthew Weber
Marcus,
Quoted 10 lines · Matthew Weber
Marcus,
Quoted 6 lines · Marcus Folkesson
Avahi support also needs libavahi-client, which is built by avahi if avahi-daemon and dbus is selected.
Fixes:
http://autobuild.buildroot.net/results/1edfb60add17945eabc557e1dbfb08a0ba466df9/[snip]
Quoted 16 lines
Tested-by Matt Weber <[email protected]>I've kicked off a validation using utils/test-pkg with the following config and both of your libostree patches applied. BR2_TOOLCHAIN_USES_GLIBC=y
BR2_PACKAGE_LIBOSTREE=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_LIBFUSE=y
BR2_PACKAGE_LIBGLIB2=y
BR2_PACKAGE_LIBGPGME=y
BR2_PACKAGE_XZ=y
BR2_PACKAGE_AVAHI=y
BR2_PACKAGE_AVAHI_DAEMON=y
BR2_PACKAGE_DBUS=y
Quoted 3 lines
test-pkg looked good with the above config and the case of avahi&dbus disabled.
Matt
Thank you for testing.
Best regards
Marcus Folkesson
PATCH 1/1 libostree: make sure libavahi-client is built
In reply to Marcus FolkessonHello,
Quoted 18 lines · Marcus Folkesson
Avahi support also needs libavahi-client, which is built by avahi if avahi-daemon and dbus is selected.
Fixes:
http://autobuild.buildroot.net/results/1edfb60add17945eabc557e1dbfb08a0ba466df9/Signed-off-by Marcus Folkesson <[email protected]>--- package/libostree/libostree.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)package/libostree/libostree.mk +0
-0@@ -27,9 +27,13 @@ else LIBOSTREE_CONF_OPTS += --without-openssl endif
package/libostree/libostree.mk else · line 36
Quoted 10 lines
package/libostree/libostree.mk +6
-2-ifeq ($(BR2_PACKAGE_AVAHI),y) +# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon +# and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config +# option yet, use the avahi-daemon and dbus config symbols to check for +# libavahi-client. +ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) LIBOSTREE_CONF_OPTS += --with-avahi -LIBOSTREE_DEPENDENCIES += avahi +LIBOSTREE_DEPENDENCIES += avahi dbus
Adding the dependency on dbus here isn't needed: libostree doesn't need dbus itself, it only needs libavahi-client. So I've applied your patch, but after dropping the dbus dependency.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com