[Buildroot] [PATCH 2/2] modem-manager: Update to version 1.7.990

[Baruch Siach]

Hi Jared,

On Thu, Feb 15, 2018 at 02:45:06PM -0600, Jared Bents wrote:
> Update to modem manager 1.7.990 which does not require
> udev.  Added option to build without udev but if udev
> exists in the build, it will default to build with
> libgudev.
> 
> Signed-off-by: Jared Bents <jared.bents at rockwellcollins.com>
> ---
>  package/modem-manager/Config.in          | 12 +++++++++---
>  package/modem-manager/modem-manager.hash |  2 +-
>  package/modem-manager/modem-manager.mk   | 11 +++++++++--
>  3 files changed, 19 insertions(+), 6 deletions(-)
> 
> diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in
> index 8e995b4..38e017b 100644
> --- a/package/modem-manager/Config.in
> +++ b/package/modem-manager/Config.in
> @@ -1,12 +1,10 @@
>  config BR2_PACKAGE_MODEM_MANAGER
>  	bool "modemmanager"
> -	depends on BR2_PACKAGE_HAS_UDEV
>  	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 # runtime dependency
>  	select BR2_PACKAGE_LIBGLIB2
> -	select BR2_PACKAGE_LIBGUDEV
>  	help
>  	  ModemManager is a DBus-activated daemon which controls mobile
>  	  broadband (2G/3G/4G) devices and connections.
> @@ -26,9 +24,17 @@ config BR2_PACKAGE_MODEM_MANAGER_LIBQMI
>  	select BR2_PACKAGE_LIBQMI
>  	help
>  	  This option enables support for QMI protocol
> +
> +config BR2_PACKAGE_MODEM_MANAGER_UDEV
> +	bool "Use udev"
> +	default y if BR2_PACKAGE_HAS_UDEV
> +	select BR2_PACKAGE_LIBGUDEV
> +	help
> +	  This option allows support for builds without udev. If udev
> +	  is not included, say N.

Is udev an actual run-time dependency when building with libgudev? If not, you 
can remove this part, and make libgudev an optional dependency. See below.

Even if udev is really needed, I don't think it should be user selectable. 
Just do

  select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV

This reduced the number of options, which is something we always try to do.

>  endif
>  
> -comment "modemmanager needs udev /dev management and a toolchain w/ wchar, threads"
> +comment "modemmanager needs /dev management and a toolchain w/ wchar, threads"
>  	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
>  		!BR2_PACKAGE_HAS_UDEV
>  	depends on BR2_USE_MMU
> diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash
> index bc08044..52cc7a6 100644
> --- a/package/modem-manager/modem-manager.hash
> +++ b/package/modem-manager/modem-manager.hash
> @@ -1,4 +1,4 @@
>  # Locally computed
> -sha256  bc74326fa69ae8012f806e235f3d296144922669b952d4d4987dd0af645d5f68  ModemManager-1.6.10.tar.xz
> +sha256  d465094fc6fc173354f5a00d212049056829cc245d60a9083f3c53f86a8f90ec  ModemManager-1.7.990.tar.xz
>  sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
>  sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
> diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk
> index b741acf..3015b00 100644
> --- a/package/modem-manager/modem-manager.mk
> +++ b/package/modem-manager/modem-manager.mk
> @@ -4,12 +4,12 @@
>  #
>  ################################################################################
>  
> -MODEM_MANAGER_VERSION = 1.6.10
> +MODEM_MANAGER_VERSION = 1.7.990

Looks like a beta release. Any reason you need this specific release?

>  MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
>  MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager
>  MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib)
>  MODEM_MANAGER_LICENSE_FILES = COPYING COPYING.LIB
> -MODEM_MANAGER_DEPENDENCIES = host-pkgconf host-intltool libglib2 libgudev
> +MODEM_MANAGER_DEPENDENCIES = host-pkgconf host-intltool libglib2
>  MODEM_MANAGER_INSTALL_STAGING = YES
>  
>  ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
> @@ -26,6 +26,13 @@ else
>  MODEM_MANAGER_CONF_OPTS += --without-mbim
>  endif
>  
> +ifeq ($(BR2_PACKAGE_MODEM_MANAGER_UDEV),y)
> +MODEM_MANAGER_DEPENDENCIES += libgudev
> +MODEM_MANAGER_CONF_OPTS += --with-udev
> +else
> +MODEM_MANAGER_CONF_OPTS += --without-udev
> +endif

Something like (copied from libmbim.mk):

ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
LIBMBIM_DEPENDENCIES += libgudev
LIBMBIM_CONF_OPTS += --with-udev
else
LIBMBIM_CONF_OPTS += --without-udev
endif

with the needed changes.

> +
>  define MODEM_MANAGER_INSTALL_INIT_SYSV
>  	$(INSTALL) -m 0755 -D package/modem-manager/S44modem-manager \
>  		$(TARGET_DIR)/etc/init.d/S44modem-manager

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -