浏览代码

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 <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Fabrice Fontaine 2 年之前
父节点
当前提交
4bb4288dd0
共有 2 个文件被更改,包括 13 次插入1 次删除
  1. 12 0
      package/modem-manager/Config.in
  2. 1 1
      package/modem-manager/modem-manager.mk

+ 12 - 0
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"

+ 1 - 1
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