Patchwork [v2,2/2] ModemManager: add new package

login
register
mail settings
Submitter Yegor Yefremov
Date Oct. 25, 2013, 10:28 a.m.
Message ID <1382696898-1901-2-git-send-email-yegorslists@googlemail.com>
Download mbox | patch
Permalink /patch/286121/
State Superseded
Headers show

Comments

Yegor Yefremov - Oct. 25, 2013, 10:28 a.m.
From: Yegor Yefremov <yegorslists@googlemail.com>

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
Changes:
	v2: typos, add select QMI to the config option, don't install to staging

 package/Config.in                      |    1 +
 package/modem-manager/Config.in        |   33 ++++++++++++++++++++++++++++++++
 package/modem-manager/modem-manager.mk |   21 ++++++++++++++++++++
 3 files changed, 55 insertions(+), 0 deletions(-)
 create mode 100644 package/modem-manager/Config.in
 create mode 100644 package/modem-manager/modem-manager.mk
Yegor Yefremov - Oct. 25, 2013, 10:55 a.m.
On Fri, Oct 25, 2013 at 12:28 PM,  <yegorslists@googlemail.com> wrote:
> From: Yegor Yefremov <yegorslists@googlemail.com>
>
> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
> ---
> Changes:
>         v2: typos, add select QMI to the config option, don't install to staging
>
>  package/Config.in                      |    1 +
>  package/modem-manager/Config.in        |   33 ++++++++++++++++++++++++++++++++
>  package/modem-manager/modem-manager.mk |   21 ++++++++++++++++++++
>  3 files changed, 55 insertions(+), 0 deletions(-)
>  create mode 100644 package/modem-manager/Config.in
>  create mode 100644 package/modem-manager/modem-manager.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index 0e6f86c..34c0e7b 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -820,6 +820,7 @@ source "package/lrzsz/Config.in"
>  source "package/macchanger/Config.in"
>  source "package/mii-diag/Config.in"
>  source "package/minidlna/Config.in"
> +source "package/modem-manager/Config.in"
>  source "package/mongoose/Config.in"
>  source "package/mongrel2/Config.in"
>  source "package/mrouted/Config.in"
> diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in
> new file mode 100644
> index 0000000..202d846
> --- /dev/null
> +++ b/package/modem-manager/Config.in
> @@ -0,0 +1,33 @@
> +config BR2_PACKAGE_MODEM_MANAGER
> +       bool "ModemManager"
> +       depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
> +       select BR2_PACKAGE_DBUS
> +       depends on BR2_INET_IPV6
> +       depends on BR2_LARGEFILE # acl
> +       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_GLIB
> +       select BR2_PACKAGE_UDEV
> +       select BR2_PACKAGE_UDEV_ALL_EXTRAS
> +       select BR2_PACKAGE_PCRE
> +       select BR2_PACKAGE_PCRE_UTF
> +       help
> +         ModemManager is a DBus-activated daemon which controls mobile
> +         broadband (2G/3G/4G) devices and connections.
> +
> +         http://www.freedesktop.org/wiki/Software/ModemManager/
> +
> +if BR2_PACKAGE_MODEM_MANAGER
> +
> +config BR2_PACKAGE_MODEM_MANAGER_LIBQMI
> +       bool "QMI support"
> +       select BR2_PACKAGE_LIBQMI
> +       help
> +         This option enables support for QMI protocol
> +endif
> +
> +comment "ModemkManager requires a toolchain with IPV6, LARGEFILE, WCHAR and thread support"
> +       depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || \
> +               !BR2_TOOLCHAIN_HAS_THREADS
> +
> diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk
> new file mode 100644
> index 0000000..ebf2617
> --- /dev/null
> +++ b/package/modem-manager/modem-manager.mk
> @@ -0,0 +1,21 @@
> +################################################################################
> +#
> +# modem-manager
> +#
> +################################################################################
> +
> +MODEM_MANAGER_VERSION = 1.0.0
> +MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
> +MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager/

Forgot about licencing information :-(

MODEM_MANAGER_LICENSE = GPLv2
MODEM_MANAGER_LICENSE_FILES = COPYING

> +MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool
> +
> +MODEM_MANAGER_CONF_OPT = \
> +               --without-mbim
> +
> +ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
> +       MODEM_MANAGER_DEPENDENCIES += libqmi
> +else
> +       MODEM_MANAGER_CONF_OPT += --without-qmi
> +endif
> +
> +$(eval $(autotools-package))
> --
> 1.7.7
>
Thomas Petazzoni - Oct. 27, 2013, 5:42 p.m.
Hello,

On Fri, 25 Oct 2013 12:28:18 +0200, yegorslists@googlemail.com wrote:
> diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in
> new file mode 100644
> index 0000000..202d846
> --- /dev/null
> +++ b/package/modem-manager/Config.in
> @@ -0,0 +1,33 @@
> +config BR2_PACKAGE_MODEM_MANAGER
> +	bool "ModemManager"

I think we want all the package names to be lower case.

> +	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
> +	select BR2_PACKAGE_DBUS
> +	depends on BR2_INET_IPV6
> +	depends on BR2_LARGEFILE # acl
> +	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_GLIB
> +	select BR2_PACKAGE_UDEV
> +	select BR2_PACKAGE_UDEV_ALL_EXTRAS
> +	select BR2_PACKAGE_PCRE
> +	select BR2_PACKAGE_PCRE_UTF
> +	help
> +	  ModemManager is a DBus-activated daemon which controls mobile
> +	  broadband (2G/3G/4G) devices and connections.
> +
> +	  http://www.freedesktop.org/wiki/Software/ModemManager/
> +
> +if BR2_PACKAGE_MODEM_MANAGER
> +
> +config BR2_PACKAGE_MODEM_MANAGER_LIBQMI
> +	bool "QMI support"
> +	select BR2_PACKAGE_LIBQMI
> +	help
> +	  This option enables support for QMI protocol
> +endif
> +
> +comment "ModemkManager requires a toolchain with IPV6, LARGEFILE, WCHAR and thread support"

typo on ModemManager (which should be lower case as well here).

> +	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || \
> +		!BR2_TOOLCHAIN_HAS_THREADS

Shouldn't we have a comment about the udev dependency?


> +MODEM_MANAGER_VERSION = 1.0.0
> +MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
> +MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager/
> +MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool

You don't depend on pcre?

Also, as you mentioned in a reply, please add the licensing
information. Note that it seems to be GPLv2+ and not GPLv2.

> +MODEM_MANAGER_CONF_OPT = \
> +		--without-mbim

One too many tabs in this indentation.

> +ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
> +	MODEM_MANAGER_DEPENDENCIES += libqmi

	MODEM_MANAGER_CONF_OPT += --with-qmi

> +else
> +	MODEM_MANAGER_CONF_OPT += --without-qmi
> +endif

Best regards,

Thomas
Yegor Yefremov - Oct. 27, 2013, 7:31 p.m.
On Sun, Oct 27, 2013 at 6:42 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> On Fri, 25 Oct 2013 12:28:18 +0200, yegorslists@googlemail.com wrote:
>> diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in
>> new file mode 100644
>> index 0000000..202d846
>> --- /dev/null
>> +++ b/package/modem-manager/Config.in
>> @@ -0,0 +1,33 @@
>> +config BR2_PACKAGE_MODEM_MANAGER
>> +     bool "ModemManager"
>
> I think we want all the package names to be lower case.

Should NetworkManager be also renamed in networkmanager?

>> +     depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
>> +     select BR2_PACKAGE_DBUS
>> +     depends on BR2_INET_IPV6
>> +     depends on BR2_LARGEFILE # acl
>> +     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_GLIB
>> +     select BR2_PACKAGE_UDEV
>> +     select BR2_PACKAGE_UDEV_ALL_EXTRAS
>> +     select BR2_PACKAGE_PCRE
>> +     select BR2_PACKAGE_PCRE_UTF
>> +     help
>> +       ModemManager is a DBus-activated daemon which controls mobile
>> +       broadband (2G/3G/4G) devices and connections.
>> +
>> +       http://www.freedesktop.org/wiki/Software/ModemManager/
>> +
>> +if BR2_PACKAGE_MODEM_MANAGER
>> +
>> +config BR2_PACKAGE_MODEM_MANAGER_LIBQMI
>> +     bool "QMI support"
>> +     select BR2_PACKAGE_LIBQMI
>> +     help
>> +       This option enables support for QMI protocol
>> +endif
>> +
>> +comment "ModemkManager requires a toolchain with IPV6, LARGEFILE, WCHAR and thread support"
>
> typo on ModemManager (which should be lower case as well here).

ACK

>> +     depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || \
>> +             !BR2_TOOLCHAIN_HAS_THREADS
>
> Shouldn't we have a comment about the udev dependency?

ACK

>> +MODEM_MANAGER_VERSION = 1.0.0
>> +MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
>> +MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager/
>> +MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool
>
> You don't depend on pcre?

ACK

> Also, as you mentioned in a reply, please add the licensing
> information. Note that it seems to be GPLv2+ and not GPLv2.
>
>> +MODEM_MANAGER_CONF_OPT = \
>> +             --without-mbim
>
> One too many tabs in this indentation.

ACK

>> +ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
>> +     MODEM_MANAGER_DEPENDENCIES += libqmi
>
>         MODEM_MANAGER_CONF_OPT += --with-qmi

ACK

>> +else
>> +     MODEM_MANAGER_CONF_OPT += --without-qmi
>> +endif

Thanks for review.

Yegor

Patch

diff --git a/package/Config.in b/package/Config.in
index 0e6f86c..34c0e7b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -820,6 +820,7 @@  source "package/lrzsz/Config.in"
 source "package/macchanger/Config.in"
 source "package/mii-diag/Config.in"
 source "package/minidlna/Config.in"
+source "package/modem-manager/Config.in"
 source "package/mongoose/Config.in"
 source "package/mongrel2/Config.in"
 source "package/mrouted/Config.in"
diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in
new file mode 100644
index 0000000..202d846
--- /dev/null
+++ b/package/modem-manager/Config.in
@@ -0,0 +1,33 @@ 
+config BR2_PACKAGE_MODEM_MANAGER
+	bool "ModemManager"
+	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+	select BR2_PACKAGE_DBUS
+	depends on BR2_INET_IPV6
+	depends on BR2_LARGEFILE # acl
+	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_GLIB
+	select BR2_PACKAGE_UDEV
+	select BR2_PACKAGE_UDEV_ALL_EXTRAS
+	select BR2_PACKAGE_PCRE
+	select BR2_PACKAGE_PCRE_UTF
+	help
+	  ModemManager is a DBus-activated daemon which controls mobile
+	  broadband (2G/3G/4G) devices and connections.
+
+	  http://www.freedesktop.org/wiki/Software/ModemManager/
+
+if BR2_PACKAGE_MODEM_MANAGER
+
+config BR2_PACKAGE_MODEM_MANAGER_LIBQMI
+	bool "QMI support"
+	select BR2_PACKAGE_LIBQMI
+	help
+	  This option enables support for QMI protocol
+endif
+
+comment "ModemkManager requires a toolchain with IPV6, LARGEFILE, WCHAR and thread support"
+	depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS
+
diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk
new file mode 100644
index 0000000..ebf2617
--- /dev/null
+++ b/package/modem-manager/modem-manager.mk
@@ -0,0 +1,21 @@ 
+################################################################################
+#
+# modem-manager
+#
+################################################################################
+
+MODEM_MANAGER_VERSION = 1.0.0
+MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
+MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager/
+MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool
+
+MODEM_MANAGER_CONF_OPT = \
+		--without-mbim
+
+ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
+	MODEM_MANAGER_DEPENDENCIES += libqmi
+else
+	MODEM_MANAGER_CONF_OPT += --without-qmi
+endif
+
+$(eval $(autotools-package))