diff mbox

[v3] modem-manager: select libgudev, if systemd is enabled

Message ID 1441955387-6002-1-git-send-email-yegorslists@googlemail.com
State Accepted
Headers show

Commit Message

Yegor Yefremov Sept. 11, 2015, 7:09 a.m. UTC
From: Yegor Yefremov <yegorslists@googlemail.com>

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>
---
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(-)

Comments

Vicente Olivert Riera Sept. 11, 2015, 8:19 a.m. UTC | #1
Dear Yegor Yefremov,

On 09/11/2015 08:09 AM, yegorslists@googlemail.com wrote:
> From: Yegor Yefremov <yegorslists@googlemail.com>
> 
> 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>

Regards,

Vincent.

> ---
> 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(-)
> 
> diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in
> index 59b8d88..1cd502b 100644
> --- a/package/modem-manager/Config.in
> +++ b/package/modem-manager/Config.in
> @@ -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.
> diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk
> index 0e6b36a..36c8c0d 100644
> --- a/package/modem-manager/modem-manager.mk
> +++ b/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_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
>
Thomas Petazzoni Sept. 20, 2015, 1:09 p.m. UTC | #2
Dear yegorslists@googlemail.com,

On Fri, 11 Sep 2015 09:09:47 +0200, yegorslists@googlemail.com wrote:
> From: Yegor Yefremov <yegorslists@googlemail.com>
> 
> 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>
> ---
> 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
diff mbox

Patch

diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in
index 59b8d88..1cd502b 100644
--- a/package/modem-manager/Config.in
+++ b/package/modem-manager/Config.in
@@ -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.
diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk
index 0e6b36a..36c8c0d 100644
--- a/package/modem-manager/modem-manager.mk
+++ b/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_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