projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f836766)
package/mender: the dbus plugin requires libglib2
authorAdam Duskett <aduskett@gmail.com>
Thu, 20 May 2021 20:34:36 +0000 (13:34 -0700)
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Fri, 21 May 2021 08:54:39 +0000 (10:54 +0200)
If libglib2 is not build before building the dbus plugin, mender fails to
compile with the following error:
Package 'gio-2.0', required by 'virtual:world', not found

 - Add a check for libglib2 in addition to dbus when enabling the dbus plugin.
 - Depend on libglib2 if both packages are selected.

Fixes:
http://autobuild.buildroot.org/results/1bc5893b88db08612059ad899c2bc3b2abb291fb

Signed-off-by: Adam Duskett <aduskett@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
package/mender/mender.mk patch | blob | history

diff --git a/package/mender/mender.mk b/package/mender/mender.mk
index b4c5761151ffbe738a4b5193e8c6b0fdf938b1b6..a110caf551792e987cfba1c67af6783b68430cab 100644 (file)
--- a/package/mender/mender.mk
+++ b/package/mender/mender.mk
@@ -87,7 +87,8 @@ else
 MENDER_TAGS += nolzma
 endif
 
-ifeq ($(BR2_PACKAGE_DBUS),y)
+ifeq ($(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_LIBGLIB2),yy)
+MENDER_DEPENDENCIES += libglib2
 define MENDER_INSTALL_DBUS_AUTHENTICATION_MANAGER_CONF
        $(INSTALL) -D -m 0755 $(@D)/support/dbus/io.mender.AuthenticationManager.conf \
                      $(TARGET_DIR)/etc/dbus-1/system.d/io.mender.AuthenticationManager.conf