From patchwork Tue May 5 12:07:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksander Morgado X-Patchwork-Id: 1283514 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=aleksander.es 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.a=rsa-sha256 header.s=20150623 header.b=r0RPZyOu; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49GdtP5HHRz9sRf for ; Tue, 5 May 2020 22:13:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9C1D88733E; Tue, 5 May 2020 12:13:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rYJ1B+XEF1G1; Tue, 5 May 2020 12:13:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A68CC8748A; Tue, 5 May 2020 12:13:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id AE0E91BF3BC for ; Tue, 5 May 2020 12:13:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9C6F32274E for ; Tue, 5 May 2020 12:13:45 +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 dX6oddPsW9Y4 for ; Tue, 5 May 2020 12:13:44 +0000 (UTC) X-Greylist: delayed 00:07:18 by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by silver.osuosl.org (Postfix) with ESMTPS id BAC732042A for ; Tue, 5 May 2020 12:13:43 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id u127so2075439wmg.1 for ; Tue, 05 May 2020 05:13:43 -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:mime-version :content-transfer-encoding; bh=DfVR610toiziW0XiH2bAC5zbf/6OivpZEQxk35lpYpU=; b=r0RPZyOu2H3jvx8i5DTD+ebTY1ykYIWO9oIGljTMZGdJvtsq0dlrDRGNze7MAGluA1 fxlYHpnUllYBcN8O16H5zxX5ZKSpcDUVlgUhWXM+djVDRSpzZonBp1ml0mdJcmXF+FDW GYsQeowkQxODDAjcOqEx+V3eroBWPkS4lvCVjzNW45cqbv3s2DI3rdYe8wmbJ+2COwTI VTIKQwXOmEwOVVIjk6wgTru4OlZSZ9uG14qf2I14h7ZPBxq5ZONFlrvsLxe9CcXMzGCL NsXWeJZURNyp37F7ofQCcBENAqBHzHQWpAHhZbzZHxVuQbwozqPwa5JlEE+gxD3Hr1Q5 +Gwg== 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:mime-version :content-transfer-encoding; bh=DfVR610toiziW0XiH2bAC5zbf/6OivpZEQxk35lpYpU=; b=mqmM6XPdWHmTTHZNw9mAJqVRwdQdFK1Ch8aqsai7Xc+h2B+OCKVQlsPY2RjYDgNFuF LtULYkCAhyCVw0Us0/qcaOTH0d4D1LPe1XDD3HtXBqjEDhGV+kPHOgVdo+2+AQhKh5Ny T4N/q3AWBya9UI/UAYCzU+2WgYEWMGydxn9+MsLDXGCISv0UEdv7GLjHjcgnyXabYDt/ e73lwZhFxCx1QvWS0Rmq4YU0Ei9ryQRuNR7+JXnUigL6Xv5/EfQU7+5L/XlxGqLGRE2N MHRb8BpAbsJhWeqHZYMbQ3EO7pNburZMB9qU9DLVbmfLZ182jLOVdHsNr6w5vt6GfaMc Cx+w== X-Gm-Message-State: AGi0Pua6syH7CmDf+rA05Xcu5XbbbE6HQ/qn+a/FzQZfKHHz05fEzb3T FsI51CxoxPHJCA27gLv1rZGAFgJjbBitvKME X-Google-Smtp-Source: APiQypKFyACmQfnD7mP0eZiEPRQmx14fpXvDs0yqnkGct7wKwmpFGu6MYvU9yXb3faxrTzJpKzmvEw== X-Received: by 2002:a7b:cdf7:: with SMTP id p23mr3247247wmj.33.1588680451475; Tue, 05 May 2020 05:07:31 -0700 (PDT) Received: from localhost.localdomain (26.red-88-3-21.dynamicip.rima-tde.net. [88.3.21.26]) by smtp.gmail.com with ESMTPSA id i25sm3361537wml.43.2020.05.05.05.07.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 May 2020 05:07:30 -0700 (PDT) From: Aleksander Morgado To: thomas.petazzoni@bootlin.com, buildroot@buildroot.org, unixmania@gmail.com, yegorslists@googlemail.com Date: Tue, 5 May 2020 14:07:20 +0200 Message-Id: <20200505120720.258993-1-aleksander@aleksander.es> X-Mailer: git-send-email 2.26.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/modem-manager: test for the used packages, not for the MM option 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: Aleksander Morgado Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This allows user to either explicitly select the libraries it needs (e.g. libqmi and/or libmbim) and otherwise explicitly configure to request the QMI/MBIM features in ModemManager. This simplifies the build logic, and we avoid possible issues where a user that did select the library forgot to select the MM feature. Signed-off-by: Aleksander Morgado --- package/modem-manager/modem-manager.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 75fc5811db..6b4e9b6250 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