From 860dcbac18562ae4f3190fc6cbff93a45c1b14a6 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Mon, 12 Oct 2020 13:44:38 +0200 Subject: [PATCH 1/3] libqmi: update version to 1.26.4 https://lists.freedesktop.org/archives/libqmi-devel/2020-August/003377.html Signed-off-by: Aleksander Morgado --- libs/libqmi/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libqmi/Makefile b/libs/libqmi/Makefile index 9d46a76b4..758e57ffb 100644 --- a/libs/libqmi/Makefile +++ b/libs/libqmi/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libqmi -PKG_VERSION:=1.26.2 +PKG_VERSION:=1.26.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/libqmi -PKG_HASH:=133467b2fe0706850eb587c0103ae6e61b97ce6e2c440d66358f2b72b0db7b03 +PKG_HASH:=c0adcb84ba452e3e13edeb3f94f7b003ea927b354bc187629e05efb333ce270b PKG_MAINTAINER:=Nicholas Smith From ebe4f5ff2777875dbd0809f00028fa2a9716b65c Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Mon, 12 Oct 2020 13:45:38 +0200 Subject: [PATCH 2/3] libqmi: update version to 1.26.6 https://lists.freedesktop.org/archives/libqmi-devel/2020-October/003416.html Signed-off-by: Aleksander Morgado --- libs/libqmi/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libqmi/Makefile b/libs/libqmi/Makefile index 758e57ffb..b9020b398 100644 --- a/libs/libqmi/Makefile +++ b/libs/libqmi/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libqmi -PKG_VERSION:=1.26.4 +PKG_VERSION:=1.26.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/libqmi -PKG_HASH:=c0adcb84ba452e3e13edeb3f94f7b003ea927b354bc187629e05efb333ce270b +PKG_HASH:=a71963bb1097a42665287e40a9a36f95b8f9d6d6a4b7a5de22d660328af97cb9 PKG_MAINTAINER:=Nicholas Smith From 540c8f63a399349c39bced7dddaf93a76e942499 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Mon, 12 Oct 2020 13:54:54 +0200 Subject: [PATCH 3/3] libqmi: make QMI-over-MBIM support optional There is no need to force every user of libqmi to require libmbim and build with QMI-over-MBIM support, if they know they're not going to use it. Just make it optional and enabled by default. Signed-off-by: Aleksander Morgado --- libs/libqmi/Config.in | 9 +++++++++ libs/libqmi/Makefile | 12 +++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 libs/libqmi/Config.in diff --git a/libs/libqmi/Config.in b/libs/libqmi/Config.in new file mode 100644 index 000000000..1c3ad0cb5 --- /dev/null +++ b/libs/libqmi/Config.in @@ -0,0 +1,9 @@ +menu "Configuration" +depends on PACKAGE_libqmi + + config LIBQMI_WITH_MBIM_QMUX + bool "Include MBIM QMUX service support" + default y + help + Compile libqmi with QMI-over-MBIM support +endmenu diff --git a/libs/libqmi/Makefile b/libs/libqmi/Makefile index b9020b398..4be3f9e0e 100644 --- a/libs/libqmi/Makefile +++ b/libs/libqmi/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libqmi PKG_VERSION:=1.26.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/libqmi @@ -23,10 +23,16 @@ PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk +define Package/libqmi/config + source "$(SOURCE)/Config.in" +endef + define Package/libqmi SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libmbim + DEPENDS:= \ + +glib2 \ + +LIBQMI_WITH_MBIM_QMUX:libmbim TITLE:=Helper library to talk to QMI enabled modems URL:=https://www.freedesktop.org/wiki/Software/libqmi LICENSE:=LGPL-2.0-or-later @@ -59,7 +65,7 @@ CONFIGURE_ARGS += \ --disable-gtk-doc-pdf \ --disable-silent-rules \ --enable-firmware-update \ - --enable-mbim-qmux \ + --$(if $(LIBQMI_WITH_MBIM_QMUX),en,dis)able-mbim-qmux \ --enable-more-warnings=yes \ --without-udev \ --without-udev-base-dir