* [Buildroot] [PATCH v6 2/3] libmbim: add new package
2013-12-04 9:55 [Buildroot] [PATCH v6 1/3] libqmi: bump to 1.6.0 yegorslists at googlemail.com
@ 2013-12-04 9:55 ` yegorslists at googlemail.com
2013-12-06 9:05 ` Thomas Petazzoni
2013-12-04 9:55 ` [Buildroot] [PATCH v6 3/3] ModemManager: " yegorslists at googlemail.com
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: yegorslists at googlemail.com @ 2013-12-04 9:55 UTC (permalink / raw)
To: buildroot
From: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
package/Config.in | 1 +
package/libmbim/Config.in | 17 +++++++++++++++++
package/libmbim/libmbim.mk | 19 +++++++++++++++++++
3 files changed, 37 insertions(+), 0 deletions(-)
create mode 100644 package/libmbim/Config.in
create mode 100644 package/libmbim/libmbim.mk
diff --git a/package/Config.in b/package/Config.in
index 101c088..87aba87 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -543,6 +543,7 @@ source "package/libfreefare/Config.in"
source "package/libftdi/Config.in"
source "package/libhid/Config.in"
source "package/libiqrf/Config.in"
+source "package/libmbim/Config.in"
source "package/libnfc/Config.in"
source "package/libnfc-llcp/Config.in"
source "package/libqmi/Config.in"
diff --git a/package/libmbim/Config.in b/package/libmbim/Config.in
new file mode 100644
index 0000000..ccc0f25
--- /dev/null
+++ b/package/libmbim/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_LIBMBIM
+ bool "libmbim"
+ depends on BR2_USE_WCHAR # libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+ depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+ select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_UDEV_ALL_EXTRAS
+ help
+ libmbim is a glib-based library for talking to WWAN modems and
+ devices which speak the Mobile Interface Broadband Model (MBIM)
+ protocol.
+
+ http://www.freedesktop.org/wiki/Software/libmbim/
+
+comment "libmbim needs udev and a toolchain w/ wchar, threads"
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+ !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk
new file mode 100644
index 0000000..f6991f1
--- /dev/null
+++ b/package/libmbim/libmbim.mk
@@ -0,0 +1,19 @@
+################################################################################
+#
+# libmbim
+#
+################################################################################
+
+LIBMBIM_VERSION = 1.4.0
+LIBMBIM_SITE = http://www.freedesktop.org/software/libmbim/
+LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz
+LIBMBIM_LICENSE = GPLv2
+LIBMBIM_LICENSE_FILES = COPYING
+LIBMBIM_INSTALL_STAGING = YES
+
+LIBMBIM_DEPENDENCIES = libglib2 udev
+
+# we don't want -Werror
+LIBMBIM_CONF_OPT = --enable-more-warnings=no
+
+$(eval $(autotools-package))
--
1.7.7
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH v6 3/3] ModemManager: add new package
2013-12-04 9:55 [Buildroot] [PATCH v6 1/3] libqmi: bump to 1.6.0 yegorslists at googlemail.com
2013-12-04 9:55 ` [Buildroot] [PATCH v6 2/3] libmbim: add new package yegorslists at googlemail.com
@ 2013-12-04 9:55 ` yegorslists at googlemail.com
2013-12-06 9:10 ` Thomas Petazzoni
2013-12-06 9:10 ` [Buildroot] [PATCH v6 1/3] libqmi: bump to 1.6.0 Thomas Petazzoni
2013-12-06 9:33 ` Peter Korsgaard
3 siblings, 1 reply; 8+ messages in thread
From: yegorslists at googlemail.com @ 2013-12-04 9:55 UTC (permalink / raw)
To: buildroot
From: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Changes:
v6: remove PCRE UTF dependency as it is handled by GLIB2 itself
v5: add libmbim support
v4: change dependency comment to the standard one (Arnout Vandecappelle)
v3: depend on pcre, fix comments and indentation etc. (comments from Thomas Petazzoni)
v2: typos, add select QMI to the config option, don't install to staging
---
package/Config.in | 1 +
package/modem-manager/Config.in | 36 ++++++++++++++++++++++++++++++++
package/modem-manager/modem-manager.mk | 28 ++++++++++++++++++++++++
3 files changed, 65 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 87aba87..7d91a0c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -822,6 +822,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..4e2cfc7
--- /dev/null
+++ b/package/modem-manager/Config.in
@@ -0,0 +1,36 @@
+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
+ 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_LIBMBIM
+ bool "MBIM support"
+ select BR2_PACKAGE_LIBMBIM
+ help
+ This option enables support for MBIM protocol
+
+config BR2_PACKAGE_MODEM_MANAGER_LIBQMI
+ bool "QMI support"
+ select BR2_PACKAGE_LIBQMI
+ help
+ This option enables support for QMI protocol
+endif
+
+comment "modemmanager needs udev and a toolchain w/ largefile, wchar, threads, IPv6"
+ depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || !BR2_USE_WCHAR || \
+ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk
new file mode 100644
index 0000000..d600f39
--- /dev/null
+++ b/package/modem-manager/modem-manager.mk
@@ -0,0 +1,28 @@
+################################################################################
+#
+# 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_LICENSE = GPLv2
+MODEM_MANAGER_LICENSE_FILES = COPYING
+MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool
+
+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
+
+ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBMBIM),y)
+ MODEM_MANAGER_DEPENDENCIES += libmbim
+ MODEM_MANAGER_CONF_OPT += --with-mbim
+else
+ MODEM_MANAGER_CONF_OPT += --without-mbim
+endif
+
+$(eval $(autotools-package))
--
1.7.7
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [PATCH v6 3/3] ModemManager: add new package
2013-12-04 9:55 ` [Buildroot] [PATCH v6 3/3] ModemManager: " yegorslists at googlemail.com
@ 2013-12-06 9:10 ` Thomas Petazzoni
2013-12-06 9:21 ` Yegor Yefremov
0 siblings, 1 reply; 8+ messages in thread
From: Thomas Petazzoni @ 2013-12-06 9:10 UTC (permalink / raw)
To: buildroot
Yegor,
On Wed, 4 Dec 2013 10:55:04 +0100, yegorslists at googlemail.com wrote:
> +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_LICENSE = GPLv2
This should be:
MODEM_MANAGER_LICENSE = GPLv2+ (programs, plugins), LGPLv2+ (libmm-glib)
For those looking: there are two other libraries, libqcdm and libwmc,
under GPLv2+, but those libraries are not installed: they are directly
linked into the application, and just used as a way of splitting things
in the source code.
With the license information fixed, which hopefully Peter can adjust,
this patch has my:
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v6 3/3] ModemManager: add new package
2013-12-06 9:10 ` Thomas Petazzoni
@ 2013-12-06 9:21 ` Yegor Yefremov
0 siblings, 0 replies; 8+ messages in thread
From: Yegor Yefremov @ 2013-12-06 9:21 UTC (permalink / raw)
To: buildroot
On Fri, Dec 6, 2013 at 10:10 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Yegor,
>
> On Wed, 4 Dec 2013 10:55:04 +0100, yegorslists at googlemail.com wrote:
>
>> +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_LICENSE = GPLv2
>
> This should be:
>
> MODEM_MANAGER_LICENSE = GPLv2+ (programs, plugins), LGPLv2+ (libmm-glib)
>
> For those looking: there are two other libraries, libqcdm and libwmc,
> under GPLv2+, but those libraries are not installed: they are directly
> linked into the application, and just used as a way of splitting things
> in the source code.
>
> With the license information fixed, which hopefully Peter can adjust,
> this patch has my:
>
> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thanks for review. This licence stuff seems to be tricky sometimes.
Yegor
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v6 1/3] libqmi: bump to 1.6.0
2013-12-04 9:55 [Buildroot] [PATCH v6 1/3] libqmi: bump to 1.6.0 yegorslists at googlemail.com
2013-12-04 9:55 ` [Buildroot] [PATCH v6 2/3] libmbim: add new package yegorslists at googlemail.com
2013-12-04 9:55 ` [Buildroot] [PATCH v6 3/3] ModemManager: " yegorslists at googlemail.com
@ 2013-12-06 9:10 ` Thomas Petazzoni
2013-12-06 9:33 ` Peter Korsgaard
3 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2013-12-06 9:10 UTC (permalink / raw)
To: buildroot
Dear yegorslists at googlemail.com,
On Wed, 4 Dec 2013 10:55:02 +0100, yegorslists at googlemail.com wrote:
> From: Yegor Yefremov <yegorslists@googlemail.com>
>
> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
> ---
> package/libqmi/libqmi.mk | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH v6 1/3] libqmi: bump to 1.6.0
2013-12-04 9:55 [Buildroot] [PATCH v6 1/3] libqmi: bump to 1.6.0 yegorslists at googlemail.com
` (2 preceding siblings ...)
2013-12-06 9:10 ` [Buildroot] [PATCH v6 1/3] libqmi: bump to 1.6.0 Thomas Petazzoni
@ 2013-12-06 9:33 ` Peter Korsgaard
3 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2013-12-06 9:33 UTC (permalink / raw)
To: buildroot
>>>>> "yegorslists" == yegorslists <yegorslists@googlemail.com> writes:
> From: Yegor Yefremov <yegorslists@googlemail.com>
> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Committed series with the license fixups pointed out by Thomas, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread