From patchwork Tue Mar 21 16:02:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 741645 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vnczZ3d65z9s7b for ; Wed, 22 Mar 2017 03:03:06 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="I9DCd/Y7"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 694F425C52; Tue, 21 Mar 2017 16:03:03 +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 u-1sHlmryj0W; Tue, 21 Mar 2017 16:03:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 989E02D414; Tue, 21 Mar 2017 16:03: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 C54701BFE84 for ; Tue, 21 Mar 2017 16:03:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C028989422 for ; Tue, 21 Mar 2017 16:03: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 dfnXVmSHR+Dq for ; Tue, 21 Mar 2017 16:03:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by whitealder.osuosl.org (Postfix) with ESMTPS id 19A6B814C0 for ; Tue, 21 Mar 2017 16:03:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1490112179; x=1521648179; h=from:to:cc:subject:date:message-id; bh=T4iK2GbBWcZv1f0xMssgRxmrSye5qaU8eXiMZXVx2iY=; b=I9DCd/Y71qfQ0B2W56WDjNh0u0S65VoxJ4hkQFBCsKG9VuAJsQ2544hN w7NRBDHpBSDteW0LpKW2s3oBLSa4rw==; Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Mar 2017 09:02:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.36,200,1486454400"; d="scan'208"; a="1110747183" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 21 Mar 2017 09:02:39 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 7DF32209; Tue, 21 Mar 2017 18:02:38 +0200 (EET) From: Andy Shevchenko To: Marcin Bis , Waldemar Brodkorb , buildroot@buildroot.org Date: Tue, 21 Mar 2017 18:02:35 +0200 Message-Id: <20170321160237.31058-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.11.0 Cc: Bernd Kuhls , Andy Shevchenko Subject: [Buildroot] [PATCH v2] package/bluez5_utils: Allow user to enable disabled plugins 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" Disregard to increase just minor version BlueZ 5.44 is drastically different in a way what tools and plugins are enabled and installed by default. Extend Buildroot package to cover these changes. Cc: Bernd Kuhls Signed-off-by: Andy Shevchenko --- package/bluez5_utils/Config.in | 28 +++++++++++++++++++++++++++- package/bluez5_utils/bluez5_utils.mk | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in index a7c0ee4ba..e99f0f69f 100644 --- a/package/bluez5_utils/Config.in +++ b/package/bluez5_utils/Config.in @@ -48,6 +48,11 @@ config BR2_PACKAGE_BLUEZ5_UTILS_CLIENT comment "bluez5-utils client needs a glibc or musl toolchain" depends on BR2_TOOLCHAIN_USES_UCLIBC +config BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED + bool "build deprecated tools" + help + Build BlueZ 5.x deprecated tools (hciattach, gatttool, ...). + config BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL bool "install GATT tool" depends on BR2_PACKAGE_BLUEZ5_UTILS_CLIENT @@ -62,7 +67,28 @@ config BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL config BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL bool "build experimental plugins" help - Build BlueZ 5.x experimental plugins (SAP, NFC, ...). + Build BlueZ 5.x experimental plugins (PCSuite, ...). + +config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH + bool "build health plugin" + help + Build BlueZ 5.x health plugin + +config BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI + bool "build midi plugin" + select BR2_PACKAGE_ALSA_LIB + help + Build BlueZ 5.x midi plugin + +config BR2_PACKAGE_BLUEZ5_PLUGINS_NFC + bool "build nfc plugin" + help + Build BlueZ 5.x nfc plugin + +config BR2_PACKAGE_BLUEZ5_PLUGINS_SAP + bool "build sap plugin" + help + Build BlueZ 5.x sap plugin config BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS bool "build sixaxis plugin" diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 4d31a187b..4eae3d01d 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -38,6 +38,35 @@ else BLUEZ5_UTILS_CONF_OPTS += --disable-experimental endif +# enable health plugin +ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH),y) +BLUEZ5_UTILS_CONF_OPTS += --enable-health +else +BLUEZ5_UTILS_CONF_OPTS += --disable-health +endif + +# enable midi plugin +ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI),y) +BLUEZ5_UTILS_CONF_OPTS += --enable-midi +BLUEZ5_UTILS_DEPENDENCIES += alsa-lib +else +BLUEZ5_UTILS_CONF_OPTS += --disable-midi +endif + +# enable nfc plugin +ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_NFC),y) +BLUEZ5_UTILS_CONF_OPTS += --enable-nfc +else +BLUEZ5_UTILS_CONF_OPTS += --disable-nfc +endif + +# enable sap plugin +ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_SAP),y) +BLUEZ5_UTILS_CONF_OPTS += --enable-sap +else +BLUEZ5_UTILS_CONF_OPTS += --disable-sap +endif + # enable sixaxis plugin ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS),y) BLUEZ5_UTILS_CONF_OPTS += --enable-sixaxis @@ -45,6 +74,13 @@ else BLUEZ5_UTILS_CONF_OPTS += --disable-sixaxis endif +# build deprecated tools +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED),y) +BLUEZ5_UTILS_CONF_OPTS += --enable-deprecated +else +BLUEZ5_UTILS_CONF_OPTS += --disable-deprecated +endif + # install gatttool (For some reason upstream choose not to do it by default) ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL),y) define BLUEZ5_UTILS_INSTALL_GATTTOOL