Skip to contentSkip to conversation

modem-manager: select libgudev, if systemd is enabled

PATCH New yegorslists at googlemail.com 3 participants 3 messages Sep 11, 2015 – Sep 20, 2015

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 modem-manager: select libgudev, if systemd is enabled

From: Yegor Yefremov <[email protected]>

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.

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

---
Changes:
v3: reduce comments and put select/depends reodering again (Thomas Petazzoni)
v2: change patch name (Vicente Olivert Riera)
add fix description (Vicente Olivert Riera)
add explanations to Config.in and *.mk files (Vicente Olivert Riera)

 package/modem-manager/Config.in        | 3 ++-
 package/modem-manager/modem-manager.mk | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)
package/modem-manager/Config.in +2 -1
index 59b8d88..1cd502b 100644
@@ -1,11 +1,12 @@
 config BR2_PACKAGE_MODEM_MANAGER
 	bool "modemmanager"
 	depends on BR2_PACKAGE_HAS_UDEV
-	select BR2_PACKAGE_DBUS
 	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
 	depends on BR2_USE_MMU # dbus
+	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_DBUS_GLIB
+	select BR2_PACKAGE_LIBGUDEV if BR2_INIT_SYSTEMD
 	help
 	  ModemManager is a DBus-activated daemon which controls mobile
 	  broadband (2G/3G/4G) devices and connections.
package/modem-manager/modem-manager.mk +4 -0
index 0e6b36a..36c8c0d 100644
@@ -12,6 +12,10 @@ MODEM_MANAGER_LICENSE_FILES = COPYING
 MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool
 MODEM_MANAGER_INSTALL_STAGING = YES
 
+ifeq ($(BR2_INIT_SYSTEMD),y)
+MODEM_MANAGER_DEPENDENCIES += libgudev
+endif
+
 ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
 MODEM_MANAGER_DEPENDENCIES += libqmi
 MODEM_MANAGER_CONF_OPTS += --with-qmi
Signature · 1 line
2.1.4
#1 lore raw

PATCH v3 1/1 modem-manager: select libgudev, if systemd is enabled

Dear Yegor Yefremov,

Quoted 8 lines · yegorslists at googlemail.com

From: Yegor Yefremov <[email protected]>

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.

Quoted 6 lines

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

Regards,

Vincent.

Quoted 45 lines

---
Changes:
v3: reduce comments and put select/depends reodering again (Thomas Petazzoni)
v2: change patch name (Vicente Olivert Riera)
add fix description (Vicente Olivert Riera)
add explanations to Config.in and *.mk files (Vicente Olivert Riera)

 package/modem-manager/Config.in        | 3 ++-
 package/modem-manager/modem-manager.mk | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)
package/modem-manager/Config.in +2 -1
index 59b8d88..1cd502b 100644
@@ -1,11 +1,12 @@
 config BR2_PACKAGE_MODEM_MANAGER
 	bool "modemmanager"
 	depends on BR2_PACKAGE_HAS_UDEV
-	select BR2_PACKAGE_DBUS
 	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
 	depends on BR2_USE_MMU # dbus
+	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_DBUS_GLIB
+	select BR2_PACKAGE_LIBGUDEV if BR2_INIT_SYSTEMD
 	help
 	  ModemManager is a DBus-activated daemon which controls mobile
 	  broadband (2G/3G/4G) devices and connections.
package/modem-manager/modem-manager.mk +4 -0
index 0e6b36a..36c8c0d 100644
@@ -12,6 +12,10 @@ MODEM_MANAGER_LICENSE_FILES = COPYING
 MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool
 MODEM_MANAGER_INSTALL_STAGING = YES
 
+ifeq ($(BR2_INIT_SYSTEMD),y)
+MODEM_MANAGER_DEPENDENCIES += libgudev
+endif
+
 ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
 MODEM_MANAGER_DEPENDENCIES += libqmi
 MODEM_MANAGER_CONF_OPTS += --with-qmi
#2 lore raw

PATCH v3 1/1 modem-manager: select libgudev, if systemd is enabled

In reply to yegorslists at googlemail.com

Dear yegorslists at googlemail.com,

Quoted 13 lines · yegorslists at googlemail.com

From: Yegor Yefremov <[email protected]>

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.

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

Quoted 7 lines

---
Changes:
v3: reduce comments and put select/depends reodering again (Thomas Petazzoni)
v2: change patch name (Vicente Olivert Riera)
add fix description (Vicente Olivert Riera)
add explanations to Config.in and *.mk files (Vicente Olivert Riera)

Applied, thanks.

Thomas

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