From fc08a8dd9e5d622de25393cc6ef4205a8d22719e Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 30 Nov 2022 10:38:03 +0100 Subject: [PATCH 1/5] Revert "libqmi: bump to 1.30.8" The libqmi version 1.30.8 uses meson. In order to cherry-pick the last changes cleanly, this commit must first be reverted. This reverts commit 0cccbcb0c76f2d2fe74fc0acae02c69aee0d8c52. Signed-off-by: Florian Eckert --- libs/libqmi/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libqmi/Makefile b/libs/libqmi/Makefile index 9843965bcd..e7ef205e6a 100644 --- a/libs/libqmi/Makefile +++ b/libs/libqmi/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libqmi -PKG_VERSION:=1.30.8 +PKG_VERSION:=1.30.4 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/libqmi -PKG_HASH:=862482ce9e3ad0bd65d264334ee311cdb94b9df2863b5b7136309b41b8ac1990 +PKG_HASH:=00d7da30a4f8d1185f37cba289cfaf1dfcd04a58f2f76d6acfdf5b85312d6ed6 PKG_MAINTAINER:=Nicholas Smith From 1b61e53162896a6ee1c20dfa547d4a0a50bca647 Mon Sep 17 00:00:00 2001 From: Maxim Anisimov Date: Sat, 26 Mar 2022 12:04:26 +0300 Subject: [PATCH 2/5] libqmi: switch to meson build tools Using https://gitlab.freedesktop.org/mobile-broadband/libqmi.git to download the source code. Enabled lto and additional gcc flags for perfomance and less size. Added support for selecting qmi message collection. Selected basic qmi message collection by default (modemmanager requires it). Modified to use meson as upstream has abandoned autotools. Removed BUILD_PARALLEL options. These are default with ninja/meson. Signed-off-by: Maxim Anisimov (cherry picked from commit f7cbd445408756b7a44764080063a9a4158988ed) (cherry picked from commit 1683d7c96373948d4c25266f9aaedcf85f13695e) Signed-off-by: Florian Eckert Update meson include dir for branch openwrt-21.02. --- libs/libqmi/Config.in | 15 +++++++++++++ libs/libqmi/Makefile | 51 +++++++++++++++++++++++++++---------------- 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/libs/libqmi/Config.in b/libs/libqmi/Config.in index 6f35b74539..7dfa7ca524 100644 --- a/libs/libqmi/Config.in +++ b/libs/libqmi/Config.in @@ -13,4 +13,19 @@ config LIBQMI_WITH_QRTR_GLIB help Compile libqmi with QRTR support +choice + prompt "Select QMI message collection to build" + default LIBQMI_COLLECTION_BASIC + + config LIBQMI_COLLECTION_MINIMAL + depends on !MODEMMANAGER_WITH_QMI + bool "minimal" + + config LIBQMI_COLLECTION_BASIC + bool "basic (default)" + + config LIBQMI_COLLECTION_FULL + bool "full" +endchoice + endmenu diff --git a/libs/libqmi/Makefile b/libs/libqmi/Makefile index e7ef205e6a..341363c908 100644 --- a/libs/libqmi/Makefile +++ b/libs/libqmi/Makefile @@ -11,17 +11,22 @@ PKG_NAME:=libqmi PKG_VERSION:=1.30.4 PKG_RELEASE:=$(AUTORELEASE) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=https://www.freedesktop.org/software/libqmi -PKG_HASH:=00d7da30a4f8d1185f37cba289cfaf1dfcd04a58f2f76d6acfdf5b85312d6ed6 +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libqmi.git +PKG_SOURCE_VERSION:=$(PKG_VERSION) +PKG_MIRROR_HASH:=537eae29c36aba9757afd86e48b91c37c3fe3232037ad11fdd426297f6040a6b PKG_MAINTAINER:=Nicholas Smith PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 +PKG_BUILD_DEPENDS:=python3/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk +include ../../devel/meson/meson.mk + +TARGET_CFLAGS += -ffunction-sections -fdata-sections -fno-merge-all-constants -fmerge-constants +TARGET_LDFLAGS += -Wl,--gc-sections define Package/libqmi/config source "$(SOURCE)/Config.in" @@ -59,26 +64,31 @@ define Package/libqmi-utils/description Utils to talk to QMI enabled modems endef -CONFIGURE_ARGS += \ - --disable-static \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --disable-silent-rules \ - --enable-firmware-update \ - --without-udev \ - --without-udev-base-dir +MESON_ARGS += \ + -Dudev=false \ + -Dintrospection=false \ + -Dman=false \ + -Dbash_completion=false \ + -Db_lto=true ifeq ($(CONFIG_LIBQMI_WITH_MBIM_QMUX),y) - CONFIGURE_ARGS += --enable-mbim-qmux + MESON_ARGS += -Dmbim_qmux=true else - CONFIGURE_ARGS += --disable-mbim-qmux + MESON_ARGS += -Dmbim_qmux=false endif ifeq ($(CONFIG_LIBQMI_WITH_QRTR_GLIB),y) - CONFIGURE_ARGS += --enable-qrtr + MESON_ARGS += -Dqrtr=true else - CONFIGURE_ARGS += --disable-qrtr + MESON_ARGS += -Dqrtr=false +endif + +ifeq ($(CONFIG_LIBQMI_COLLECTION_MINIMAL),y) + MESON_ARGS += -Dcollection=minimal +else ifeq ($(CONFIG_LIBQMI_COLLECTION_BASIC),y) + MESON_ARGS += -Dcollection=basic +else + MESON_ARGS += -Dcollection=full endif define Build/InstallDev @@ -99,12 +109,15 @@ define Build/InstallDev endef define Package/libqmi/install - $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_DIR) \ + $(1)/usr/lib \ + $(1)/usr/libexec + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libqmi*.so.* \ $(1)/usr/lib/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/qmi-proxy $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/qmi-proxy $(1)/usr/libexec/ endef define Package/qmi-utils/install From 7508755357e80e02c38819a5bc287ee0cbf18951 Mon Sep 17 00:00:00 2001 From: Maxim Anisimov Date: Tue, 29 Mar 2022 11:38:57 +0300 Subject: [PATCH 3/5] libqmi: polish Makefile PKG_VERSION replaced by PKG_SOURCE_VERSION. Simplify for collection selection. Removed unneeded python3/host dep. Signed-off-by: Maxim Anisimov (cherry picked from commit ff5837ee8f483bb425d33b18c1185586507d495c) (cherry picked from commit 94b824423bc0f668a2f607497d26cc00f47e521e) --- libs/libqmi/Makefile | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/libs/libqmi/Makefile b/libs/libqmi/Makefile index 341363c908..94dffb8adc 100644 --- a/libs/libqmi/Makefile +++ b/libs/libqmi/Makefile @@ -8,18 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libqmi -PKG_VERSION:=1.30.4 +PKG_SOURCE_VERSION:=1.30.4 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libqmi.git -PKG_SOURCE_VERSION:=$(PKG_VERSION) PKG_MIRROR_HASH:=537eae29c36aba9757afd86e48b91c37c3fe3232037ad11fdd426297f6040a6b PKG_MAINTAINER:=Nicholas Smith PKG_INSTALL:=1 -PKG_BUILD_DEPENDS:=python3/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -69,27 +67,11 @@ MESON_ARGS += \ -Dintrospection=false \ -Dman=false \ -Dbash_completion=false \ - -Db_lto=true - -ifeq ($(CONFIG_LIBQMI_WITH_MBIM_QMUX),y) - MESON_ARGS += -Dmbim_qmux=true -else - MESON_ARGS += -Dmbim_qmux=false -endif - -ifeq ($(CONFIG_LIBQMI_WITH_QRTR_GLIB),y) - MESON_ARGS += -Dqrtr=true -else - MESON_ARGS += -Dqrtr=false -endif - -ifeq ($(CONFIG_LIBQMI_COLLECTION_MINIMAL),y) - MESON_ARGS += -Dcollection=minimal -else ifeq ($(CONFIG_LIBQMI_COLLECTION_BASIC),y) - MESON_ARGS += -Dcollection=basic -else - MESON_ARGS += -Dcollection=full -endif + -Db_lto=true \ + -Dmbim_qmux=$(if $(CONFIG_LIBQMI_WITH_MBIM_QMUX),true,false) \ + -Dqrtr=$(if $(CONFIG_LIBQMI_WITH_QRTR_GLIB),true,false) \ + -Dcollection=$(if $(CONFIG_LIBQMI_COLLECTION_MINIMAL),minimal\ + ,$(if $(CONFIG_LIBQMI_COLLECTION_BASIC),basic,full)) define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include From aa97efc4532436a83ead72fd26c9bbd669865dfd Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 4 May 2022 13:36:28 +0200 Subject: [PATCH 4/5] libqmi: bump to 1.30.6 Signed-off-by: Aleksander Morgado (cherry picked from commit 45e8d072ee2d52b5d8f0b053d706ce6a2ae06aae) (cherry picked from commit b8a8dd53c7996f289aefbcd4fb0d4747f7f8bb48) --- libs/libqmi/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libqmi/Makefile b/libs/libqmi/Makefile index 94dffb8adc..76b5e6714c 100644 --- a/libs/libqmi/Makefile +++ b/libs/libqmi/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libqmi -PKG_SOURCE_VERSION:=1.30.4 +PKG_SOURCE_VERSION:=1.30.6 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libqmi.git -PKG_MIRROR_HASH:=537eae29c36aba9757afd86e48b91c37c3fe3232037ad11fdd426297f6040a6b +PKG_MIRROR_HASH:=034dc3b9e5ddb1acd9bb8c2a07f3f8a576d47b7f70942b61b82c4dfc8f805186 PKG_MAINTAINER:=Nicholas Smith From 6b711dfe670a278fc1e39713a0ce336e154102ec Mon Sep 17 00:00:00 2001 From: Maxim Anisimov Date: Mon, 12 Sep 2022 10:16:37 +0300 Subject: [PATCH 5/5] libqmi: bump to 1.30.8 Signed-off-by: Maxim Anisimov (cherry picked from commit 0b0d8163d53efdfd6abd7d9cbb57a770273c5319) --- libs/libqmi/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libqmi/Makefile b/libs/libqmi/Makefile index 76b5e6714c..a725461eb8 100644 --- a/libs/libqmi/Makefile +++ b/libs/libqmi/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libqmi -PKG_SOURCE_VERSION:=1.30.6 +PKG_SOURCE_VERSION:=1.30.8 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libqmi.git -PKG_MIRROR_HASH:=034dc3b9e5ddb1acd9bb8c2a07f3f8a576d47b7f70942b61b82c4dfc8f805186 +PKG_MIRROR_HASH:=a0fa33a89011bdb593f66fd0b674f2a7c31f87e43ffd7f3e9a515b00864c4a91 PKG_MAINTAINER:=Nicholas Smith