Skip to contentSkip to conversation

avahi: create missing "services" directory

PATCH New Maxime Hadjinlian 2 participants 3 messages Jul 4, 2017 – Aug 17, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 avahi: create missing "services" directory

Fixes a warning in avahi-daemon startup log:
"Failed to read /etc/avahi/services."

This directory can contain services files that you want avahi to advertise.

---
 package/avahi/avahi.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/avahi/avahi.mk +6 -0
index a356a08291..5f6f3c36b3 100644
@@ -180,6 +180,12 @@ endef
 
 AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_REMOVE_INITSCRIPT
 
+define AVAHI_CREATE_SERVICES_DIRECTORY
+	mkdir -p $(TARGET_DIR)/etc/avahi/services
+endef
+
+AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_CREATE_SERVICES_DIRECTORY
+
 ifeq ($(BR2_PACKAGE_AVAHI_AUTOIPD),y)
 define AVAHI_INSTALL_AUTOIPD
 	rm -f $(TARGET_DIR)/var/lib/avahi-autoipd

--
2.13.2

#1 lore raw

PATCH 1/1 qt5base: disable libraries not built

From: Maxime Hadjinlian <[email protected]>

We don't build theses libraries by default (we deactivate them at configure time).
Theses are at the moment enabled by default in BR, a better patch will be made at a later time.

---
 package/qt5/qt5base/qt5base.mk | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)
package/qt5/qt5base/qt5base.mk +16 -16
index 2b9db5cb66..ddc1f64174 100644
@@ -186,22 +186,22 @@ QT5BASE_INSTALL_LIBS_y                                 += Qt5Core
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XCB)        += Qt5XcbQpa
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK)    += Qt5Network
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_CONCURRENT) += Qt5Concurrent
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL)        += Qt5Sql
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST)       += Qt5Test
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML)        += Qt5Xml
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS)      += Qt5EglFSDeviceIntegration
-ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS)      += Qt5EglFsKmsSupport
-endif
-else
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS)      += Qt5EglDeviceIntegration
-endif
-
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI)          += Qt5Gui
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS)      += Qt5Widgets
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport
+#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL)        += Qt5Sql
+#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST)       += Qt5Test
+#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML)        += Qt5Xml
+#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL
+#ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS)      += Qt5EglFSDeviceIntegration
+#ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
+#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS)      += Qt5EglFsKmsSupport
+#endif
+#else
+#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS)      += Qt5EglDeviceIntegration
+#endif
+#
+#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI)          += Qt5Gui
+#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS)      += Qt5Widgets
+#QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport
 
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus
 
Signature · 1 line
2.13.2
#2 lore raw

PATCH 1/1 avahi: create missing "services" directory

In reply to Maxime Hadjinlian

Hello,

Quoted 7 lines · Maxime Hadjinlian

Fixes a warning in avahi-daemon startup log:
"Failed to read /etc/avahi/services."

This directory can contain services files that you want avahi to advertise.

I don't understand why this patch is necessary. Indeed, with the following defconfig:

BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2017.05-1078-g95b1dae.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_PACKAGE_AVAHI=y
BR2_PACKAGE_AVAHI_DAEMON=y

I do get the /etc/avahi/services directory created by the avahi Makefiles, during the installation step:

Quoted 1 line
Quoted 1 line
Quoted 1 line

avahi 0.6.32 Installing to target

[...]
/usr/bin/mkdir -p '/home/thomas/projets/buildroot/output/target/etc/avahi/services'
/usr/bin/mkdir -p '/home/thomas/projets/buildroot/output/target/etc/avahi'
/bin/sh ../libtool --mode=install /usr/bin/install -c avahi-daemon '/home/thomas/projets/buildroot/output/target/usr/sbin'
/usr/bin/install -c -m 644 ssh.service sftp-ssh.service '/home/thomas/projets/buildroot/output/target/etc/avahi/services'

Two files are even installed in this folder.

Of course, if you disable BR2_PACKAGE_AVAHI_DAEMON=y, this folder is not created, but there's also no S50avahi-daemon init script installed, and therefore no daemon launched at boot time.

Could you check that your patch is still really needed, and if it is, extend the commit log to explain under which configuration you're seeing the problem ?

Thanks a lot,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com