From patchwork Tue Sep 5 10:03:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksander Morgado X-Patchwork-Id: 810064 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=aleksander-es.20150623.gappssmtp.com header.i=@aleksander-es.20150623.gappssmtp.com header.b="FzeWzKqw"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xmj3T32R9z9sNq for ; Tue, 5 Sep 2017 20:03:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8A46485B58; Tue, 5 Sep 2017 10:03:46 +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 YatAiG30M0yd; Tue, 5 Sep 2017 10:03:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C119E85B2F; Tue, 5 Sep 2017 10:03:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 8F06C1C1650 for ; Tue, 5 Sep 2017 10:03:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8784986CF0 for ; Tue, 5 Sep 2017 10:03:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oUpL-9RHVnLr for ; Tue, 5 Sep 2017 10:03:42 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by hemlock.osuosl.org (Postfix) with ESMTPS id C2E8D86CE8 for ; Tue, 5 Sep 2017 10:03:41 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id b9so1470959wra.0 for ; Tue, 05 Sep 2017 03:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aleksander-es.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=EUnOUY7oc0ZZzRu//EjK/WFvkpCc2GcTHF9p2tsAvTQ=; b=FzeWzKqw+DqBJGsOfbjbZU24EDsXhERYWYVGgTs6y4XAIlV9vSb97pj4nwd0/1t48E 7rbfjaf56WzDlFkLJ9cF8O5HoxS2+WXsKhOnrzsusQdtTEu0K/0B/sqpXLuxF6Gyuv3K mEHIHUQNjG8Yd0SJwNDDzjd2Cin3bbX71x95Uznszp9SSFGuOSFR4WIoQGrIjNBwnWzc PE6B4mjCIPIMgiFkdROH8vgfBYT83v6vTch1ZrRRi8tvSt+e6RsJak1X2Dx0ilMD7Z9T nf6+Ahs84NbzV86l30PdTcQf1YDK5EH/2rIs/R70iCfsHjCIFzWgvqhzC4di59538yIm A2vg== 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=EUnOUY7oc0ZZzRu//EjK/WFvkpCc2GcTHF9p2tsAvTQ=; b=UdMmexJndBtHpRtW2gevSPonQVkYxyBvP3us7IFfgpN6Zm6lvspyHx7+YX9mx4b3/y KoZ3MdKFH+3ctN/++MRRaRsvnn6ImUqslpzPCsEjHBPjFiz4Z0DMfcqHghOMfUY5EHv0 tbsC3lOV9/T+ehOBPINHNkABWdAx3RqhVQITjaJsAvw7vukEPltDiUKXNqt1/TNVFVfl FxW2zsJ989b35alRcVrA7yqkqnMXaE1Rll4FgYH55CYoIQNYO9sMrB6vMNStPDjSp7Zk sfnyLrXuqPocL4CtPsxLg7TH5ubwHEqap0Alk15/d5HZDDuuBcy52Oe0EQE65d9MfQCJ sFTA== X-Gm-Message-State: AHPjjUjy4uAO1wsbXwWAIJni4exAe4dc5A25oR0Wn+Nr0UACr/Q2ymAW bBpyHvdjJcMRq2efFSMEEA== X-Google-Smtp-Source: ADKCNb61Si1wWYDuz+m0L+8D1ktfVAUPk5rNvkh4vcpExAOMlsTsqnip/YV2O6Y0HaiwMP/AcdWmQg== X-Received: by 10.223.149.35 with SMTP id 32mr2217170wrs.289.1504605819923; Tue, 05 Sep 2017 03:03:39 -0700 (PDT) Received: from localhost.localdomain (116.red-83-40-186.dynamicip.rima-tde.net. [83.40.186.116]) by smtp.gmail.com with ESMTPSA id y99sm327942wmh.1.2017.09.05.03.03.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Sep 2017 03:03:39 -0700 (PDT) From: Aleksander Morgado To: buildroot@buildroot.org Date: Tue, 5 Sep 2017 12:03:27 +0200 Message-Id: <20170905100327.21421-1-aleksander@aleksander.es> X-Mailer: git-send-email 2.13.1 Cc: thomas.petazzoni@free-electrons.com, Aleksander Morgado Subject: [Buildroot] [PATCH] libqmi: udev and qmi-over-mbim are optional X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Don't always build without udev, as qmi-firmware-update would be very very limited in that case. Instead, make it optional: if there is udev support in the setup, require libgudev and configure using --with-udev explicitly; otherwise just --without-udev. Also, add the qmi-over-mbim feature as optional, and require libmbim if we're building with it enabled. Signed-off-by: Aleksander Morgado --- package/libqmi/Config.in | 18 ++++++++++++++++++ package/libqmi/libqmi.mk | 18 ++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/package/libqmi/Config.in b/package/libqmi/Config.in index f1d111b7c..a536650b5 100644 --- a/package/libqmi/Config.in +++ b/package/libqmi/Config.in @@ -10,6 +10,24 @@ config BR2_PACKAGE_LIBQMI http://www.freedesktop.org/wiki/Software/libqmi/ +if BR2_PACKAGE_LIBQMI + +config BR2_PACKAGE_LIBQMI_UDEV + bool "qmi-firmware-update udev support" + depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_LIBGUDEV + help + This option enables udev support in the qmi-firmware-update tool + +config BR2_PACKAGE_LIBQMI_MBIM_QMUX + bool "QMI-over-MBIM support" + select BR2_PACKAGE_LIBMBIM + help + This option enables support to use the QMI protocol over MBIM + for modems with MBIM_SERVICE_QMI capabilities + +endif + comment "libqmi needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index 917265f4b..129fd0fb6 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -15,7 +15,21 @@ LIBQMI_AUTORECONF = YES LIBQMI_DEPENDENCIES = libglib2 -# we don't want -Werror and disable gudev Gobject bindings -LIBQMI_CONF_OPTS = --enable-more-warnings=no --without-udev +# we don't want -Werror +LIBQMI_CONF_OPTS = --enable-more-warnings=no + +ifeq ($(BR2_PACKAGE_LIBQMI_UDEV),y) +LIBQMI_DEPENDENCIES += libgudev +LIBQMI_CONF_OPTS += --with-udev +else +LIBQMI_CONF_OPTS += --without-udev +endif + +ifeq ($(BR2_PACKAGE_LIBQMI_MBIM_QMUX),y) +LIBQMI_DEPENDENCIES += libmbim +LIBQMI_CONF_OPTS += --enable-mbim-qmux +else +LIBQMI_CONF_OPTS += --disable-mbim-qmux +endif $(eval $(autotools-package))