From patchwork Mon Nov 4 12:48:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1188924 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aywZsXhk"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 476CKf5qGpz9sP3 for ; Mon, 4 Nov 2019 23:49:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B3A032155C; Mon, 4 Nov 2019 12:49:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hiVfYtfsbvkC; Mon, 4 Nov 2019 12:48:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 1ABDE2052F; Mon, 4 Nov 2019 12:48:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 46A9F1BF239 for ; Mon, 4 Nov 2019 12:48:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4181B88E24 for ; Mon, 4 Nov 2019 12:48:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id u17VOoKebKHc for ; Mon, 4 Nov 2019 12:48:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 6C46588E1C for ; Mon, 4 Nov 2019 12:48:57 +0000 (UTC) Received: by mail-qk1-f175.google.com with SMTP id h15so7724227qka.13 for ; Mon, 04 Nov 2019 04:48:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=afgGjs2WvCSC8EbLSrEtkiv5iDwbm+hsKVpJcXSMmkU=; b=aywZsXhkA0mQBokGUqp6kz4UuJYQOqj/qJ7279E1S6y+wKFkGGMWFPjReBQRy6do4T DwdYys0eQvJk2tS2BTlqjbN/36CR3Oesiui+1GV1ehDGm9Hdc3feDmJy6cmzYsKmDcbg G9V+/GR2sb5qQb5P/0r8qCrvHKKIpdnVQ8jgdgRNqc/lYM8840GaRdCD359FcfUdMVWu +i7OhCW/4RvmNJZp5R254Y+hjedP8EmQ8Tl+0M6twh97b7B07vlokRjETMIdTDx+KVOe Nltmi1a8go3BiSYFT3BgRZYLGJ5T2ML4B2KodfV/gFOqdCsZ9ArDKFjE7Xlkb35MDgEL Su9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=afgGjs2WvCSC8EbLSrEtkiv5iDwbm+hsKVpJcXSMmkU=; b=Pbr0Y1Im0JlS+ZxKDgkZmeM880IN0bFGUHfaPWU8TXUOpxm0wWh9Z0pKUSaF1Gl+KZ 1HSSqKTilJT9Oy/UJRybwawIUTZL53XRJ07ngWTJORRD6v3iI8+f03eN+0aAAUTnePQ0 34U4TrBXxbb2fK+ktC1PSrTNUad8JcXYvbLtaPOYR0vUVOvFHUP8WOrobwJITw4xukO9 vv9iZT5zNdDMoXz/Qz05+gXws7gaB2YMD8HQJ9zPodhKayTKXbQWQ4nRuk5cu+k1ECV0 NL5QZjg1hf6P0Yn1VGoxGWNVhLvKHchxlFad1xMq6wNsKvSLy3NHr6SrkGcuKdcMQziA 9DZw== X-Gm-Message-State: APjAAAW0o2cz/24TmZEXXkG/vNu9+QPiAE0/Frwa5sdUSN6fPz0YonHO d8laVRjeuxPVtMIrSLM7PVV8eVj+uCk= X-Google-Smtp-Source: APXvYqyLiniP/X82WP5PbfcggaJcng5mO6WZHrKcKcPQNdeZLZ4bWtFMFagpkZk3hZhg+s28UzFJcw== X-Received: by 2002:ae9:ef0b:: with SMTP id d11mr16618926qkg.68.1572871736132; Mon, 04 Nov 2019 04:48:56 -0800 (PST) Received: from casantos.remote.csb (179.187.68.169.dynamic.adsl.gvt.net.br. [179.187.68.169]) by smtp.gmail.com with ESMTPSA id t26sm582027qta.75.2019.11.04.04.48.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2019 04:48:55 -0800 (PST) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Mon, 4 Nov 2019 09:48:44 -0300 Message-Id: <20191104124844.8112-1-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 Subject: [Buildroot] [PATCH] package/modem-manager: use libqmi and libmbim if they are selected X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Aleksander Morgado MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos If we have a cnfiguration like this BR2_PACKAGE_MODEM_MANAGER=y # BR2_PACKAGE_MODEM_MANAGER_LIBMBIM is not set BR2_PACKAGE_MODEM_MANAGER_LIBQMI=y [...] BR2_PACKAGE_LIBMBIM=y then libqmi is configured with --enable-mbim-qmux and requires libmbim so ModemManager must be configured --with-mbim otherwise it fails to link due to missing libmbim symbols required by libqmi: qmi-endpoint-mbim.c:(.text+0x158): undefined reference to `mbim_device_close_finish' Prevent this kind of error by using a simpler approach: - Always enable MBIM support if libmbim is selected - Drop BR2_PACKAGE_MODEM_MANAGER_LIBMBIM and add a legacy option that selects BR2_PACKAGE_LIBMBIM - Always enable QMI support if libqmi is selected - Drop BR2_PACKAGE_MODEM_MANAGER_LIBQMI and add a legacy option that selects BR2_PACKAGE_LIBQMI - Update the help text explaining how to enable MBIM and QMI Fixes: http://autobuild.buildroot.net/results/9c6b8ec2b9cc31f1ab460532c378731ab455210c/ Signed-off-by: Carlos Santos --- Config.in.legacy | 16 ++++++++++++++++ package/modem-manager/Config.in | 17 +++-------------- package/modem-manager/modem-manager.mk | 4 ++-- package/network-manager/Config.in | 7 ++++--- 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index fcb10b1291..3336ef85d1 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,22 @@ endif comment "Legacy options removed in 2019.11" +config BR2_PACKAGE_MODEM_MANAGER_LIBMBIM + bool "BR2_PACKAGE_MODEM_MANAGER_LIBMBIM has been removed" + select BR2_LEGACY + select BR2_PACKAGE_LIBMBIM + help + Select BR2_PACKAGE_LIBMBIM to enable support for MBIM protocol + in ModemManager + +config BR2_PACKAGE_MODEM_MANAGER_LIBQMI + bool "BR2_PACKAGE_MODEM_MANAGER_LIBQMI has been removed" + select BR2_LEGACY + select BR2_PACKAGE_LIBQMI + help + Select BR2_PACKAGE_LIBQMI to enable support for QMI protocol + in ModemManager + config BR2_PACKAGE_ALLJOYN bool "alljoyn was removed" select BR2_LEGACY diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in index c4c723776d..e7987ad1e6 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -10,22 +10,11 @@ config BR2_PACKAGE_MODEM_MANAGER 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 + Select BR2_PACKAGE_LIBMBIM to enable support for MBIM protocol -config BR2_PACKAGE_MODEM_MANAGER_LIBMBIM - bool "MBIM support" - select BR2_PACKAGE_LIBMBIM - help - This option enables support for MBIM protocol + Select BR2_PACKAGE_LIBQMI to enable support for QMI protocol -config BR2_PACKAGE_MODEM_MANAGER_LIBQMI - bool "QMI support" - select BR2_PACKAGE_LIBQMI - help - This option enables support for QMI protocol -endif + http://www.freedesktop.org/wiki/Software/ModemManager/ comment "modemmanager needs a toolchain w/ wchar, threads" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index dde841b80a..554d1a235e 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -13,7 +13,7 @@ MODEM_MANAGER_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) MODEM_MANAGER_INSTALL_STAGING = YES MODEM_MANAGER_CONF_OPTS = --disable-more-warnings -ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y) +ifeq ($(BR2_PACKAGE_LIBQMI),y) MODEM_MANAGER_DEPENDENCIES += libqmi MODEM_MANAGER_CONF_OPTS += --with-qmi else @@ -27,7 +27,7 @@ else MODEM_MANAGER_CONF_OPTS += --without-udev endif -ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBMBIM),y) +ifeq ($(BR2_PACKAGE_LIBMBIM),y) MODEM_MANAGER_DEPENDENCIES += libmbim MODEM_MANAGER_CONF_OPTS += --with-mbim else diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index 1257e08e6f..79ad161f31 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -37,10 +37,11 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER bool "modem-manager support" select BR2_PACKAGE_MODEM_MANAGER - select BR2_PACKAGE_MODEM_MANAGER_LIBMBIM - select BR2_PACKAGE_MODEM_MANAGER_LIBQMI + select BR2_PACKAGE_LIBMBIM + select BR2_PACKAGE_LIBQMI help - This option enables support for ModemManager + This option enables support for ModemManager with support for + MBIM and QMI protocols config BR2_PACKAGE_NETWORK_MANAGER_PPPD bool "pppd support"