From patchwork Wed Feb 14 22:01:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov via B4 Relay X-Patchwork-Id: 13557101 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 292ED13F018 for ; Wed, 14 Feb 2024 22:01:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707948095; cv=none; b=IB0U0UM6Sc5UvS7ZM+YAMDBx0IZNjnqL6mi9iz399dpyGns9X5mVY6QQWCSOGE9dXYwHBuT6MXHt1UpFaB2XZd2S8Y/w7XQmCATb2k8Z2GNedUSf6aoV2wlR7WVDpaKP56ycBcghBuKKmPx9ShqcUCHKRspBDycwOWhGXGiqVow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707948095; c=relaxed/simple; bh=QJnN6/Q0YpDS2ZB48KtZY9zuzZ9BzMPOx38uuHOHJkA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JoKBjtzpS+5lmrSPMpYUTGfbr711XJfDDkLVJonJYKwVXB2pxv5C+6He1K31J7nP3LyhKx0e89oTQ19DGeyWxYXQ81JITf5Os3Q5V6n7FpVrqtT24REgbuXMsKf6YcyQ2+ahU+XhTGOuoSsA7eUS6xKtVn/PAlSwWoq0/Ir85JU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YYYO10rq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YYYO10rq" Received: by smtp.kernel.org (Postfix) with ESMTPS id CB83BC433F1; Wed, 14 Feb 2024 22:01:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707948094; bh=QJnN6/Q0YpDS2ZB48KtZY9zuzZ9BzMPOx38uuHOHJkA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=YYYO10rq0hAJvFbMIpP+2Lp1VV83v5mtjURhybodG2G82jdg6VumOvoc7hN01YCI2 nR48a2GpzdiVrveNQhju1ru7ZUnGry+MdrNvREzK/CCRhuaj26bBZDLG1FZWvx16Xa fUrjVf1hg6n+lxHkO9mSAlrfuI7T/JoppGWajOjwL/PsAqaoSr5nePFjpa3NvXoDH7 q1wybs8ydthinkyjOulogO7eB26WH1gnPf347CAYWnodO+V6tM1lRyzL0Hue7G+Dkc 5QrdkmeeufL/BUFtE97HXIeeGyvvoHc6HO+x/IhCmHCns/UsW2XsAHfdKGH0KSS2pc MHjlHw2bphkjA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A18A1C48BC3; Wed, 14 Feb 2024 22:01:34 +0000 (UTC) From: Emil Velikov via B4 Relay Date: Wed, 14 Feb 2024 22:01:24 +0000 Subject: [PATCH BlueZ 1/4] build: fold separate install-data-hooks Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240214-hook-fixup-v1-1-0e158ffea140@gmail.com> References: <20240214-hook-fixup-v1-0-0e158ffea140@gmail.com> In-Reply-To: <20240214-hook-fixup-v1-0-0e158ffea140@gmail.com> To: linux-bluetooth@vger.kernel.org Cc: Emil Velikov X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1707948093; l=1454; i=emil.l.velikov@gmail.com; s=20230301; h=from:subject:message-id; bh=dtWLnKx4leNFwGkNegEX6jHOWak1uw7hhMJRp7odx88=; b=a15wcEhZlDXS2x+YnXiC6jYEavgqJFnrZQDLJJZaNx2A1aQgVDE21B6mzOsaAxBBERGk/zRTF xr2E1X5IsRQBzrWABWapgjToDBoLNY6FqtzU8AfQidxy0sFSnqhULTX X-Developer-Key: i=emil.l.velikov@gmail.com; a=ed25519; pk=qeUTVTNyI3rcR2CfNNWsloTihgzmtbZo98GdxwZKCkY= X-Endpoint-Received: by B4 Relay for emil.l.velikov@gmail.com/20230301 with auth_id=35 X-Original-From: Emil Velikov Reply-To: From: Emil Velikov Autoconfigure throws a useful error, that I've missed previously. As-is with two identical hooks `make install` will fail. Just fold them into single place - not particularly pretty but works. Signed-off-by: Emil Velikov --- Makefile.am | 9 +++++++++ Makefile.obexd | 6 ------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5207c172b..e67551761 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,6 +34,15 @@ statedir = $(localstatedir)/lib/bluetooth install-data-hook: install -dm555 $(DESTDIR)$(confdir) install -dm700 $(DESTDIR)$(statedir) +if OBEX +if SYSTEMD + $(LN_S) -f obex.service $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service + +uninstall-hook: + rm -f $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service +endif +endif + if DATAFILES dbusdir = $(DBUS_CONFDIR)/dbus-1/system.d diff --git a/Makefile.obexd b/Makefile.obexd index 81456544d..b91ca6644 100644 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -2,12 +2,6 @@ if SYSTEMD systemduserunitdir = $(SYSTEMD_USERUNITDIR) systemduserunit_DATA = obexd/src/obex.service - -install-data-hook: - $(LN_S) -f obex.service $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service - -uninstall-hook: - rm -f $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service endif dbussessionbusdir = $(DBUS_SESSIONBUSDIR) From patchwork Wed Feb 14 22:01:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov via B4 Relay X-Patchwork-Id: 13557103 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2932E13F01C for ; Wed, 14 Feb 2024 22:01:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707948095; cv=none; b=Y8fvsQhZMCBmdSbllLPgcijikz4sRDLqMZSqztk7l2QFGyLFPuDAWlhk4+huS8nrfWEtdqZO8WL6QBgid6h0BoT71i+qL5ps8S7tzDQp3Una2qMuN6Rd2UemTtIjZnwoaUfFq40VQmGRPtzWFebrMFg5YIpk67aW4FNhAm4mfG0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707948095; c=relaxed/simple; bh=qAFztN0HCZ3qg5GKsjanZvr4yrxmBNXRqF4CcsED0iI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mxrvW1Gp4XEIqm3o8wByCKSAo7Dj2JfDVUDhKu4pfc+ii7YAaFTugpHFm1Yp50FDeQDwgQG875S7cFrxW9irmnF6KoYdAYY3+W8QOokGPTnodK4keOZdk/QKEWkimB4QSBmOnntZAoXYtk3N2gUkVzgX3hN8uC15+HyHe45DOJk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AnD5wo4B; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="AnD5wo4B" Received: by smtp.kernel.org (Postfix) with ESMTPS id CEDABC43399; Wed, 14 Feb 2024 22:01:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707948094; bh=qAFztN0HCZ3qg5GKsjanZvr4yrxmBNXRqF4CcsED0iI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=AnD5wo4BnUwC6Cpc7S8wEaFnBtooFvGEpeo1vjPq+8s8NmR4hga0joq+EARUdWkfi fbROPccFTXyxWb35LFAP9cH1iRIxh15iK0/tIhLhnMSezR72R6IxGT2tViMWQZe0EX ufqlUFMOGer/lppWa8sWA1Y2yhijSMpCdbgJ7TMZdgpA0XAzTlC+eHjdfy4Uv9cPtL eQgG4caq/A8wgJj5nLnPQtLFRFhUIQi4gDxpmBcPFsAVFrFgK7+O0qR+Ye8eq5EV48 72aljg+Z3jMpMaQhOXT0sKdwXcldgOIqfAFDh39BaHi4DOEDarujypcopYPZp8s4ab b0ZqQSEYlSW3Q== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2F0CC48BEF; Wed, 14 Feb 2024 22:01:34 +0000 (UTC) From: Emil Velikov via B4 Relay Date: Wed, 14 Feb 2024 22:01:25 +0000 Subject: [PATCH BlueZ 2/4] build: install obexd (dbus,systemd} services as needed Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240214-hook-fixup-v1-2-0e158ffea140@gmail.com> References: <20240214-hook-fixup-v1-0-0e158ffea140@gmail.com> In-Reply-To: <20240214-hook-fixup-v1-0-0e158ffea140@gmail.com> To: linux-bluetooth@vger.kernel.org Cc: Emil Velikov X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1707948093; l=762; i=emil.l.velikov@gmail.com; s=20230301; h=from:subject:message-id; bh=jk17tdzYCWPHANqvkVpH7To2uT5/ZyxPCpp1GyD4nKY=; b=pZTvANMpFnLl1VDWjSpTeH29E7c+oRJXeKsTUg4BsrVrOag1TFNLZQKHQ3vQIm6r4q+AKWa/R BKVMx4PZN1pDNpibQgtGNV9PuDjWHgzWbVazPO1YXc7sCYlFNeykiE7 X-Developer-Key: i=emil.l.velikov@gmail.com; a=ed25519; pk=qeUTVTNyI3rcR2CfNNWsloTihgzmtbZo98GdxwZKCkY= X-Endpoint-Received: by B4 Relay for emil.l.velikov@gmail.com/20230301 with auth_id=35 X-Original-From: Emil Velikov Reply-To: From: Emil Velikov Currently we ship the service files, even when built with --disable-obex. Move the if OBEX guard few lines further up. Signed-off-by: Emil Velikov --- Makefile.obexd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.obexd b/Makefile.obexd index b91ca6644..4a89e0335 100644 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -1,4 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 +if OBEX + if SYSTEMD systemduserunitdir = $(SYSTEMD_USERUNITDIR) systemduserunit_DATA = obexd/src/obex.service @@ -7,7 +9,6 @@ endif dbussessionbusdir = $(DBUS_SESSIONBUSDIR) dbussessionbus_DATA = obexd/src/org.bluez.obex.service -if OBEX obex_plugindir = $(libdir)/obex/plugins From patchwork Wed Feb 14 22:01:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov via B4 Relay X-Patchwork-Id: 13557104 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3A84A13F00D for ; Wed, 14 Feb 2024 22:01:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707948095; cv=none; b=gr6hpVVhKxV4s28UwLH2tAUlGHaQW9HOb00mfS7d1B/8UoXgcE54nl70TiAHApCYT2M+TkSj7s3loole8AH0ewZMcBmNNiWHRq0vgTXzNv29lrhiw1qwEVwDG+OLDWoYYfAiEbFtjdIIG9dVSO207cY4XaG9tnQXHhWabn9slEA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707948095; c=relaxed/simple; bh=NhV9bTJvPRubuJkD/cHqg6ghROXUU3yqJ8TYiAFxD94=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=B6FVFsLEmcWU6a2+7hkOFL9lMGn/zG3l/9/i3T8hn55un131xxjt9TBSsSm72RsszJSrJ5bXZOWNEc43eJApLXQUpAnuBnBtHLVUDdonEXSIPj1KVgdLQay6C0U8ci5rcp1Oi0PU2s7SgFNISToyrwJS5mkjoJoj032Y23iT6FU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OttFP6Y0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OttFP6Y0" Received: by smtp.kernel.org (Postfix) with ESMTPS id E3A88C433A6; Wed, 14 Feb 2024 22:01:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707948094; bh=NhV9bTJvPRubuJkD/cHqg6ghROXUU3yqJ8TYiAFxD94=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=OttFP6Y04UaNV918FWQz8CmFarAjSwnLvEooEApGKQF1f7N89hyMOLRfC8k7i6V33 x3D02hE9I+uIMeytLAO7lQBTxQwVirPYFUJg7t2HxR8jCryqQyrb0q4XeTX1zMRr8D N8HA1ILfXsK6dFRNBaG/v9orPFb82EZn4yAgbxnyPBYsVSdwlyg25eZ5CKi1FFdUjG jWqW28SKGPsDrH8hmKHz9N6i3UjYBHzV3DnnVPvvaKiQIsu7uvS2a5xFtMf61IQacY 0j9zRsLh2ecZqGAmc8woVHil96Dv5Hg/68zn/yIjMM9iHr6JisLOGbDwupuUMplzTr bP6H/YTIVq3QQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8374C48BEB; Wed, 14 Feb 2024 22:01:34 +0000 (UTC) From: Emil Velikov via B4 Relay Date: Wed, 14 Feb 2024 22:01:26 +0000 Subject: [PATCH BlueZ 3/4] build: drop %.rules make rule Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240214-hook-fixup-v1-3-0e158ffea140@gmail.com> References: <20240214-hook-fixup-v1-0-0e158ffea140@gmail.com> In-Reply-To: <20240214-hook-fixup-v1-0-0e158ffea140@gmail.com> To: linux-bluetooth@vger.kernel.org Cc: Emil Velikov X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1707948093; l=1176; i=emil.l.velikov@gmail.com; s=20230301; h=from:subject:message-id; bh=IVYTUizQHoCmhehLtiA9Zi1WMPZ5FTKhQFWT9gvpdBU=; b=461SVuM4K0438sRUXtx6E81zgpURXT7OCxk7ZdNSzOd1QiFwNhLfdVra27u3wtgTctzs5vXpn qTg2Hpru26ZB1W/+BYmCa10tnA7BH/vsCW+udLIvGwkB70RCzr2dkoh X-Developer-Key: i=emil.l.velikov@gmail.com; a=ed25519; pk=qeUTVTNyI3rcR2CfNNWsloTihgzmtbZo98GdxwZKCkY= X-Endpoint-Received: by B4 Relay for emil.l.velikov@gmail.com/20230301 with auth_id=35 X-Original-From: Emil Velikov Reply-To: From: Emil Velikov There's a single file, so we can drop the makefile rule and rename it accordingly. Signed-off-by: Emil Velikov --- Makefile.am | 8 +------- tools/{hid2hci.rules => 97-hid2hci.rules} | 0 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index e67551761..b0845e707 100644 --- a/Makefile.am +++ b/Makefile.am @@ -435,11 +435,9 @@ if HID2HCI rulesdir = $(UDEV_DIR)/rules.d rules_DATA = tools/97-hid2hci.rules - -CLEANFILES += $(rules_DATA) endif -EXTRA_DIST += tools/hid2hci.rules +EXTRA_DIST += tools/97-hid2hci.rules if TEST testdir = $(pkglibdir)/test @@ -764,10 +762,6 @@ endif src/builtin.h: src/genbuiltin $(builtin_sources) $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@ -tools/%.rules: - $(AM_V_at)$(MKDIR_P) tools - $(AM_V_GEN)cp $(srcdir)/$(subst 97-,,$@) $@ - $(lib_libbluetooth_la_OBJECTS): $(local_headers) lib/bluetooth/%.h: lib/%.h diff --git a/tools/hid2hci.rules b/tools/97-hid2hci.rules similarity index 100% rename from tools/hid2hci.rules rename to tools/97-hid2hci.rules From patchwork Wed Feb 14 22:01:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov via B4 Relay X-Patchwork-Id: 13557105 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 62060141986 for ; Wed, 14 Feb 2024 22:01:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707948095; cv=none; b=G0LsDPjNgHVd+9Vp4N9DECiwa1FylkLuLVOoMRulrEULDrUdLtS/psdEdhxb/MTcNrpHBBuURKmePBX6D36VvUTbf+Sr979vd54hIl1EJpY+OsF8WbnKlAX7hfvsRB6bA0qdclL2twIqbf2mJuaxdztR0pKGQwHIgNhCs8/oSmQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707948095; c=relaxed/simple; bh=nMbEmDtu+nbz7C+PG/VK6/9mg55pKxG/RHldlP9WHq0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=G4oS4kfNG8kOQHVfjRo50gVVBw8BTHGzumgPa0M6guGWuNaHRTJLF0V9wV/EcaZsQkn0+7C3Vm53sguSVK+u0nBpNCcmNsA/UHLd8oTfoBSUGzsxIINoRg7xC1NLIGKpQ91F5lKaxQWDf05pV7YZlDcx2CdTi7r/ZAocQ9YUhVY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bF3SLao1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bF3SLao1" Received: by smtp.kernel.org (Postfix) with ESMTPS id F30A5C43394; Wed, 14 Feb 2024 22:01:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707948095; bh=nMbEmDtu+nbz7C+PG/VK6/9mg55pKxG/RHldlP9WHq0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=bF3SLao1XU0GYdWHIRyxD/Kbq6YgStBjUc4055ZXtYvLiZGCCEiCz60m3hPt8NtaK gDogMG3Qyhjw4uHWX68aPTbMKQffOMO9J3Onne32Z53pNGgwxervBqTmB8cIon+zk4 7pp6UT4r9uwOHxgmcxxaVtBeqrtqQsq9+/AljbDtwzk0UZ+2xFqr4rmbZO73eH9M/4 5spxozFtCGh+PBTfLhfO0xfwQAphwEIyH5/UvaEd1NyoGAXLvU+fajihEVlR6l/p/S P/QvgEVNFayItxXbSnb+7IMKMI1AEQz5b6OMvNdgKTHRkwGpW6wiAB3ByXx/ZSzgp+ fyHjTfWSvuFwA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDC6AC48BF1; Wed, 14 Feb 2024 22:01:34 +0000 (UTC) From: Emil Velikov via B4 Relay Date: Wed, 14 Feb 2024 22:01:27 +0000 Subject: [PATCH BlueZ 4/4] build: simplify coverage handling Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240214-hook-fixup-v1-4-0e158ffea140@gmail.com> References: <20240214-hook-fixup-v1-0-0e158ffea140@gmail.com> In-Reply-To: <20240214-hook-fixup-v1-0-0e158ffea140@gmail.com> To: linux-bluetooth@vger.kernel.org Cc: Emil Velikov X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1707948093; l=1002; i=emil.l.velikov@gmail.com; s=20230301; h=from:subject:message-id; bh=ESy0gP0YuVBpkapzmcgkbeJQ/DjxQ37O4UDqJ+8xAZc=; b=dEsw1YM+JtmX/r12Xky6gnaUXB/m7NAH4937n9pxQnTOdfDoLV+C1KBKOVldEbbazABA5Y6kO oyz8+2Mm9MTDwlHe0WJ8743GiO+12pPDboqvHlkR2wtO0hpUl2c25lX X-Developer-Key: i=emil.l.velikov@gmail.com; a=ed25519; pk=qeUTVTNyI3rcR2CfNNWsloTihgzmtbZo98GdxwZKCkY= X-Endpoint-Received: by B4 Relay for emil.l.velikov@gmail.com/20230301 with auth_id=35 X-Original-From: Emil Velikov Reply-To: From: Emil Velikov Signed-off-by: Emil Velikov --- Makefile.am | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index b0845e707..08eb32852 100644 --- a/Makefile.am +++ b/Makefile.am @@ -793,8 +793,8 @@ ell/ell.h: Makefile maintainer-clean-local: -rm -rf ell -if COVERAGE clean-coverage: +if COVERAGE @lcov --directory $(top_builddir) --zerocounters $(RM) -r coverage $(top_builddir)/coverage.info @@ -803,15 +803,9 @@ coverage: check --output-file $(top_builddir)/coverage.info $(AM_V_at)$(MKDIR_P) coverage @genhtml -o coverage/ $(top_builddir)/coverage.info +endif clean-local: clean-coverage -find $(top_builddir) -name "*.gcno" -delete -find $(top_builddir) -name "*.gcda" -delete $(RM) -r lib/bluetooth - -else -clean-local: - -find $(top_builddir) -name "*.gcno" -delete - -find $(top_builddir) -name "*.gcda" -delete - $(RM) -r lib/bluetooth -endif