소스 검색

modem-manager: select libgudev, if systemd is enabled

When eudev is used as the udev provider, libgudev is automatically
provided as it is part of eudev. However, when systemd is used as
the udev provider, libgudev is not provided, and needs to be built
separately. This is why we select the libgudev package only if
systemd is used.

Fixes: http://autobuild.buildroot.net/results/d59/d597a81271a082c8252e2333906815c437b6576d/

While at it, group the existing dbus select together with the dbus-glib
select, so that all "select" statements are together.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Yegor Yefremov 10 년 전
부모
커밋
259fe50be7
2개의 변경된 파일6개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      package/modem-manager/Config.in
  2. 4 0
      package/modem-manager/modem-manager.mk

+ 2 - 1
package/modem-manager/Config.in

@@ -1,11 +1,12 @@
 config BR2_PACKAGE_MODEM_MANAGER
 config BR2_PACKAGE_MODEM_MANAGER
 	bool "modemmanager"
 	bool "modemmanager"
 	depends on BR2_PACKAGE_HAS_UDEV
 	depends on BR2_PACKAGE_HAS_UDEV
-	select BR2_PACKAGE_DBUS
 	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
 	depends on BR2_USE_MMU # dbus
 	depends on BR2_USE_MMU # dbus
+	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_DBUS_GLIB
 	select BR2_PACKAGE_DBUS_GLIB
+	select BR2_PACKAGE_LIBGUDEV if BR2_INIT_SYSTEMD
 	help
 	help
 	  ModemManager is a DBus-activated daemon which controls mobile
 	  ModemManager is a DBus-activated daemon which controls mobile
 	  broadband (2G/3G/4G) devices and connections.
 	  broadband (2G/3G/4G) devices and connections.

+ 4 - 0
package/modem-manager/modem-manager.mk

@@ -12,6 +12,10 @@ MODEM_MANAGER_LICENSE_FILES = COPYING
 MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool
 MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool
 MODEM_MANAGER_INSTALL_STAGING = YES
 MODEM_MANAGER_INSTALL_STAGING = YES
 
 
+ifeq ($(BR2_INIT_SYSTEMD),y)
+MODEM_MANAGER_DEPENDENCIES += libgudev
+endif
+
 ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
 ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
 MODEM_MANAGER_DEPENDENCIES += libqmi
 MODEM_MANAGER_DEPENDENCIES += libqmi
 MODEM_MANAGER_CONF_OPTS += --with-qmi
 MODEM_MANAGER_CONF_OPTS += --with-qmi