From 4bb4288dd08c688072a25bf60c3a60e0047c1668 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 31 Dec 2022 10:49:35 +0100 Subject: [PATCH] package/modem-manager: qrtr needs qmi Fix the following build failure raised since bump to version 1.20.2 in commit b95334b71fbdde0f7621b58ed35fa98df9e0966d: ../output-1/build/modem-manager-1.20.2/meson.build:262:2: ERROR: Assert failed: QRTR support requires QMI enabled Fixes: - http://autobuild.buildroot.org/results/04b9a41c5edbc492ef640b27d4d3d896d230cf34 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/modem-manager/Config.in | 12 ++++++++++++ package/modem-manager/modem-manager.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index d211d68ee1..8489e6fc86 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -25,6 +25,18 @@ config BR2_PACKAGE_MODEM_MANAGER_LIBQMI select BR2_PACKAGE_LIBQMI help This option enables support for QMI protocol + +config BR2_PACKAGE_MODEM_MANAGER_LIBQRTR + bool "QRTR support" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 # libqrtr-glib + select BR2_PACKAGE_LIBQRTR_GLIB + select BR2_PACKAGE_MODEM_MANAGER_LIBQMI + help + This option enables support for QRTR protocol + +comment "QRTR support needs a toolchain w/ headers >= 4.15" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 + endif comment "modemmanager needs a toolchain w/ wchar, threads" diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 8a0dbba3a4..8ef85b9b1d 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -37,7 +37,7 @@ else MODEM_MANAGER_CONF_OPTS += -Dmbim=false endif -ifeq ($(BR2_PACKAGE_LIBQRTR_GLIB),y) +ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQRTR),y) MODEM_MANAGER_DEPENDENCIES += libqrtr-glib MODEM_MANAGER_CONF_OPTS += -Dqrtr=true else