libqmi: bump to 1.6.0
PATCH v6 1/3 libqmi: bump to 1.6.0
From: Yegor Yefremov <[email protected]>
--- package/libqmi/libqmi.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/libqmi/libqmi.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.4.0 +LIBQMI_VERSION = 1.6.0 LIBQMI_SITE = http://www.freedesktop.org/software/libqmi/ LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz LIBQMI_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
Signature · 1 line
1.7.7
PATCH v6 2/3 libmbim: add new package
From: Yegor Yefremov <[email protected]>
--- 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
package/Config.in +1 -0
@@ -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"
package/libmbim/Config.in new file +17 -0
@@ -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
package/libmbim/libmbim.mk new file +19 -0
@@ -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))
Signature · 1 line
1.7.7
PATCH v6 2/3 libmbim: add new package
Yegor,
package/libmbim/libmbim.mk line 10
Quoted 4 lines · yegorslists at googlemail.com
package/libmbim/libmbim.mk new file +4
-0+LIBMBIM_VERSION = 1.4.0 +LIBMBIM_SITE = http://www.freedesktop.org/software/libmbim/ +LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz +LIBMBIM_LICENSE = GPLv2
This should be:
LIBMBIM_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
Hopefully Peter can change this will committing, so you don't have to resubmit a new version.
Other than that:
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v6 3/3 ModemManager: add new package
In reply to yegorslists at googlemail.comFrom: Yegor Yefremov <[email protected]>
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
package/Config.in +1 -0
@@ -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"
package/modem-manager/Config.in new file +36 -0
@@ -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
package/modem-manager/modem-manager.mk new file +28 -0
@@ -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))
Signature · 1 line
1.7.7
PATCH v6 3/3 ModemManager: add new package
Yegor,
package/modem-manager/modem-manager.mk line 10
Quoted 4 lines · yegorslists at googlemail.com
package/modem-manager/modem-manager.mk new file +4
-0+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:
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v6 3/3 ModemManager: add new package
Quoted 18 lines · Thomas Petazzoni
Yegor,
package/modem-manager/modem-manager.mk line 10
Quoted 4 lines · yegorslists at googlemail.com
package/modem-manager/modem-manager.mk new file +4
-0+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 = GPLv2This 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.
Quoted 4 lines
With the license information fixed, which hopefully Peter can adjust, this patch has my:
Acked-by Thomas Petazzoni <[email protected]>
Thanks for review. This licence stuff seems to be tricky sometimes.
Yegor
PATCH v6 1/3 libqmi: bump to 1.6.0
In reply to yegorslists at googlemail.comDear yegorslists at googlemail.com,
Quoted 6 lines · yegorslists at googlemail.com
From: Yegor Yefremov <[email protected]>
Signed-off-by Yegor Yefremov <[email protected]>--- package/libqmi/libqmi.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v6 1/3 libqmi: bump to 1.6.0
In reply to yegorslists at googlemail.comQuoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"yegorslists" == yegorslists <[email protected]> writes:
From: Yegor Yefremov <[email protected]>
Signed-off-by Yegor Yefremov <[email protected]>
Committed series with the license fixups pointed out by Thomas, thanks.
Signature · 1 line
Bye, Peter Korsgaard