From patchwork Sun Feb 18 21:50:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre X-Patchwork-Id: 874919 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@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" (1024-bit key; secure) header.d=pinaraf.info header.i=@pinaraf.info header.b="h684uoH+"; 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 3zl0v12JQrz9s0b for ; Mon, 19 Feb 2018 08:51:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E009E86F76; Sun, 18 Feb 2018 21:51:03 +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 4tyN2-d3g_hj; Sun, 18 Feb 2018 21:51:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 88D0186F44; Sun, 18 Feb 2018 21:51:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7C9141C3F92 for ; Sun, 18 Feb 2018 21:51:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 789BD86D8A for ; Sun, 18 Feb 2018 21:51:00 +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 qIjFFy3cn4qx for ; Sun, 18 Feb 2018 21:50:59 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mx2.pinaraf.info (host.pinaraf.info [37.187.77.179]) by whitealder.osuosl.org (Postfix) with ESMTP id E668A86D82 for ; Sun, 18 Feb 2018 21:50:58 +0000 (UTC) Received: from localhost.localdomain (unknown [IPv6:2001:41d0:fc04:5400:428d:5cff:fee6:7805]) by mx2.pinaraf.info (Postfix) with ESMTPSA id 3zl0tm5LgDzV6tx; Sun, 18 Feb 2018 22:50:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=pinaraf.info; s=mx2; t=1518990656; bh=Pd5xzyIiPfPdQLWIYzBkhFGMn8SwXZYH/JSw4j8y4CY=; h=From:To:Cc:Subject:Date:From; b=h684uoH+HGIHpYMJCHhxvlIZq3/pqg0pg5oYaoJxN8WOu93DP3e4c7X1AMJzjAPtw 1O2tr6AXh4HWq1fFHXTly7Gz12D4AqaMFrIYW5r+tnjHkgJURxMJ0fMeJAfuvC2Myx ASRiBwnvP0sjj5pvMxXQDVsgTQO8orRxbYRSwSq8= From: Pierre Ducroquet To: buildroot@buildroot.org Date: Sun, 18 Feb 2018 22:50:39 +0100 Message-Id: <20180218215039.4811-1-pinaraf@pinaraf.info> X-Mailer: git-send-email 2.16.1 Subject: [Buildroot] [PATCH 1/1] wpa_supplicant - Specify that old and new dbus are incompatible X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pierre Ducroquet MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Building wpa-supplicant with support for both DBus interfaces generates broken .service files. Marking old and new DBus incompatible in Config.in makes this conflict clear. Signed-off-by: Pierre Ducroquet --- package/wpa_supplicant/Config.in | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index 58a074fae8..500df354a2 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -100,20 +100,33 @@ config BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE help Install wpa_passphrase command line utility. +config BR2_PACKAGE_WPA_SUPPLICANT_DBUS + bool "Enable support for DBus control interface" + depends on BR2_PACKAGE_DBUS + help + Enable support for DBus control interface + +if BR2_PACKAGE_WPA_SUPPLICANT_DBUS + +choice + prompt "DBus interface" + config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD - bool "Enable support for old DBus control interface" + bool "Use old DBus control interface" depends on BR2_PACKAGE_DBUS help Enable support for old DBus control interface (fi.epitest.hostap.WPASupplicant). config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW - bool "Enable support for new DBus control interface" + bool "Use new DBus control interface" depends on BR2_PACKAGE_DBUS help Enable support for new DBus control interface (fi.w1.wpa_supplicant1). +endchoice + config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION bool "Introspection support" depends on BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW @@ -121,3 +134,5 @@ config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION Add introspection support for new DBus control interface. endif + +endif