From patchwork Wed Jan 24 16:20:06 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: 765678 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 98A627C09A for ; Wed, 24 Jan 2024 16:20:09 +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=1706113209; cv=none; b=A8oybKFns/OspNPyRHMLr3DLX0I49Pi4L/kveE7hvneVY0mLBq9Qj0vwDVworHIawlX30XVjlUDewPBSHxhSDeVbH8TbVRovPSitT8uTCkYgBrOflPTh9HDkrXptPFp7Jz9vKFUBdEHuGuNoh7sszVxQ63dRtmW7ZCgJRPUc6+0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706113209; c=relaxed/simple; bh=vO/p/EGIY19QllT/8hNfL/Q7T8irm3JK1ATqVxlrByo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=J36MZ6D3higX1rkEML1EWSMmazj2qNKR+iBvi0BVGN1t3PBwDAkDGAwOjisX7rKVk8DH+/Vyc1elHGnFasCy06qYOaxSBCnA30lMgvZHcTcplOKyzy7XYQFn97bLh8xQDUzHf9qr7k6fo8NeZTAwviT/bE0NZdmv+6egIUJxhaw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CYDlPnlu; 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="CYDlPnlu" Received: by smtp.kernel.org (Postfix) with ESMTPS id 6ED97C43390; Wed, 24 Jan 2024 16:20:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706113209; bh=vO/p/EGIY19QllT/8hNfL/Q7T8irm3JK1ATqVxlrByo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=CYDlPnlubzeRmSDa90My8S22HOLm6UVVUnxL0Cb0VFwwgYvF9hhVF4n/5YLFhl4Ei fXoNysxu6aQkvFP04bIN5vrLoZhcpzuDND17SxTos/UhD50XqJoeYZghmhm5awDITr QG9pfMj6BdQMlhz5VPqC8K/D7hJPrpVDZ+v0dN9tIJNsEIIY2RslTDpMnCFttHvBFG vUBiJ5+DeuN0LjK/xI95c51tBpTAzJ7SSqqNQrycR80SLbjdkwHaMsQiCsg2E/Qc3t PYmNYSzxdTRYjBUoj64MMkE13sog3RWpiw62FexaPl23Cbcl3wrZPZgsPtuehaDUB7 kCBxCHO+unGKw== 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 56E16C46CD2; Wed, 24 Jan 2024 16:20:09 +0000 (UTC) From: Emil Velikov via B4 Relay Date: Wed, 24 Jan 2024 16:20:06 +0000 Subject: [PATCH BlueZ v2 1/6] build: remove unused variable builtin_nodist Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240124-autofoo-v2-1-a210f20aa2f7@gmail.com> References: <20240124-autofoo-v2-0-a210f20aa2f7@gmail.com> In-Reply-To: <20240124-autofoo-v2-0-a210f20aa2f7@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=1706113208; l=721; i=emil.l.velikov@gmail.com; s=20230301; h=from:subject:message-id; bh=mRorcTTMdiR12GxUJR7RTE8pAyiDxz8fyZaYph6MM1Q=; b=zYqpeqpBTSvsRBWWKT221IWpEpNM0P32h51uAVI9lHUQ/oF01kAMS/Ek8I1BJbR7dUYmkNext cxrAAo1co8WCNEQCZpgzylVKkIf1lqit+gfpmomnaMPIQvohS9vswNk 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 --- Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index e738eb3a5..a470e40cf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -288,7 +288,6 @@ gobex_sources = gobex/gobex.h gobex/gobex.c \ builtin_modules = builtin_sources = builtin_cppflags = -builtin_nodist = builtin_ldadd = include Makefile.plugins @@ -350,7 +349,7 @@ src_bluetoothd_CPPFLAGS = $(AM_CPPFLAGS) -DBLUETOOTH_PLUGIN_BUILTIN \ $(BACKTRACE_CFLAGS) $(builtin_cppflags) src_bluetoothd_SHORTNAME = bluetoothd -builtin_files = src/builtin.h $(builtin_nodist) +builtin_files = src/builtin.h nodist_src_bluetoothd_SOURCES = $(builtin_files) From patchwork Wed Jan 24 16:20:07 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: 765676 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 CF9537CF23 for ; Wed, 24 Jan 2024 16:20:09 +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=1706113209; cv=none; b=Sxf7SrzpHStzbYodtH1pvtcsTecrK5R64bKxuwI6Hny18XE0T871y2swVSycCv8K8ze0bAM1C7xdGUmm9T99u0vdyWxx4tQ9FRj0E1FPARtvb7glNYbxvFhLiUgZAHtFoObowORf897GySl1ydmaXHU/DTPgMayN195GMe5NPRo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706113209; c=relaxed/simple; bh=dVTUZQkYwPKvUuWPXkou9GBGhKLkuj2YH5CkA7Rt2fM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=smG4+YqGswEQdUUpvRKveVfi4/5FcykFWw4WAQnxQDZkcJz1YzSWpzBMrLylWGWB6fJIkxjAf4FFUORAisfyNtgWrS+HI3jRU8HKwSITxM67xWdpvijRvW1gFQ5osZ3Tgm7we9uGtqhcbq7e5xE27TrQkhh3kIx9tJu1e0qTeYc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LsShKkQO; 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="LsShKkQO" Received: by smtp.kernel.org (Postfix) with ESMTPS id 7C6A9C43394; Wed, 24 Jan 2024 16:20:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706113209; bh=dVTUZQkYwPKvUuWPXkou9GBGhKLkuj2YH5CkA7Rt2fM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=LsShKkQOnijGCGgh2DIhEuVk1WSWxnUF4ygMEVE0xn7WPtPXaMjJcTcYd7GZD7u/g McHfQp7nJu2Kd7qcMGrY9e7G7xrJfUFeCrCk1PvuC+6hXeOrB5QEC1mlPmVjY2wX2P zExynbC7UViI9T3OqhizdHMSVxy2du5wqAIotrmXRbyEsCirQk3UBuZKXNFcV2VWOr iVOitVzXFZ4QaDCdxxYOmjZnc3W3xsnFtIBLjva2S4WGZZwrHuPMFOdXjkimVJkLqy BZCgZJT8NL6p+E3jZIME2/ftMMJ4vLzzL8PKG2azK6YRpE6KHGLbuBVYyKlCMfA689 nI3tpMuaLoM5Q== 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 602B4C48260; Wed, 24 Jan 2024 16:20:09 +0000 (UTC) From: Emil Velikov via B4 Relay Date: Wed, 24 Jan 2024 16:20:07 +0000 Subject: [PATCH BlueZ v2 2/6] build: remove .service files from DEPENDENCIES lists Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240124-autofoo-v2-2-a210f20aa2f7@gmail.com> References: <20240124-autofoo-v2-0-a210f20aa2f7@gmail.com> In-Reply-To: <20240124-autofoo-v2-0-a210f20aa2f7@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=1706113208; l=2006; i=emil.l.velikov@gmail.com; s=20230301; h=from:subject:message-id; bh=762dq8m5AI+SZ17OHCwzsFezHIwdX+iiIO34RX2fr1g=; b=QbQo9uv7Uea+Clh7WUkyIBen1bVqzha3q0ywR4wKCHPMWufsnwXG+5yG7ByVS6r36eyWk96nH zMvaoRzSukFASyXiM2dluABIG3MVG+yinOESxQhex/5T7yY2wPKhCs8 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 The DEPENDENCES lists are for binary objects, while the service files are required by systemd (et al) after the install stage. The services files are referenced by _DATA, so the service.in -> service conversion can happen then. --- Makefile.am | 3 +-- Makefile.mesh | 3 +-- Makefile.tools | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index a470e40cf..be8f74f13 100644 --- a/Makefile.am +++ b/Makefile.am @@ -341,8 +341,7 @@ src_bluetoothd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic \ src_bluetoothd_DEPENDENCIES = lib/libbluetooth-internal.la \ gdbus/libgdbus-internal.la \ - src/libshared-glib.la \ - src/bluetooth.service + src/libshared-glib.la src_bluetoothd_CPPFLAGS = $(AM_CPPFLAGS) -DBLUETOOTH_PLUGIN_BUILTIN \ -DPLUGINDIR=\""$(build_plugindir)"\" \ diff --git a/Makefile.mesh b/Makefile.mesh index 63f085de1..a66e47442 100644 --- a/Makefile.mesh +++ b/Makefile.mesh @@ -45,8 +45,7 @@ mesh/main.$(OBJEXT): src/builtin.h lib/bluetooth/bluetooth.h mesh_bluetooth_meshd_SOURCES = $(mesh_sources) mesh/main.c mesh_bluetooth_meshd_LDADD = src/libshared-ell.la $(ell_ldadd) -ljson-c -mesh_bluetooth_meshd_DEPENDENCIES = $(ell_dependencies) src/libshared-ell.la \ - mesh/bluetooth-mesh.service +mesh_bluetooth_meshd_DEPENDENCIES = $(ell_dependencies) src/libshared-ell.la if MANPAGES man_MANS += mesh/bluetooth-meshd.8 diff --git a/Makefile.tools b/Makefile.tools index e541084e9..6fda3f51d 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -71,8 +71,7 @@ pkglibexec_PROGRAMS += tools/btmon-logger tools_btmon_logger_SOURCES = tools/btmon-logger.c tools_btmon_logger_LDADD = src/libshared-mainloop.la -tools_btmon_logger_DEPENDENCIES = src/libshared-mainloop.la \ - tools/bluetooth-logger.service +tools_btmon_logger_DEPENDENCIES = src/libshared-mainloop.la if SYSTEMD systemdsystemunit_DATA += tools/bluetooth-logger.service From patchwork Wed Jan 24 16:20:08 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: 766922 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 CF8647CF13 for ; Wed, 24 Jan 2024 16:20:09 +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=1706113209; cv=none; b=aTZoU1x2WlWe0e8YO996Zvu/dVzFnTIRemRHRYC6IEWG0+4rl4z13xQ6lA/1jSTw4W44dX7ia2ySb8/+CwdG+m2EH4Fx0ZE0/YWTzM8Hd8yAiztSc6wfYOvMPKcfqavPxDqKjwnm+3dXF+r0m/lwzR/LWbScfMNkhdi3zQqEM0g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706113209; c=relaxed/simple; bh=nYjIj9mFg0XPO6eD8avdS6ju051Y+btg3OIofHJnQJI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dfv8NO6lVtxXTGn66hEGaD2Tcb8INKT5Y6ki0iB961fZ0iIiuzqzA+il55FlfWN7xSqaRA0kChLeUjCxt8dFQ4DVyQf+RBCfQCg6sVwqgWcIbDnfkroMn/jGr8XxAFCpTmx+DugAN+II6IkeplwAd09xWF1jragmKAQmsjMIwxQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QaKjSaeV; 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="QaKjSaeV" Received: by smtp.kernel.org (Postfix) with ESMTPS id 83F64C43399; Wed, 24 Jan 2024 16:20:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706113209; bh=nYjIj9mFg0XPO6eD8avdS6ju051Y+btg3OIofHJnQJI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=QaKjSaeVYFkDw30EwDphXIHWD0wWtcO8EZiVxHR7OEQ7jM0cuEc0ptwz8XKAijjGn 6Aoob+yh8l9Y5hoGcBLlW9tq2G1W+8abxFcZX20br7frOZXNz5PQhQ5oQGTtX3zJCD KmmYCNSk3RG46dS53XL7T6g1R9dwL+rdtRmnzjNKeVPZwXFxTT0Ujveu8C4Gi/8TRr V3SRUJgf5geHBliZQJoKW7aOM4jo8SP7fBR7Q4UbuUyeB/+nr7CdDV9IOw0AJzPl/u pm6POKDzd5xJtNj0jT4nbLf1syUt2QCiaR87O4dRcg/s/xTzDgiULXo4xWM5882IJZ lccJCZpzmnO9g== 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 69AA1C47E49; Wed, 24 Jan 2024 16:20:09 +0000 (UTC) From: Emil Velikov via B4 Relay Date: Wed, 24 Jan 2024 16:20:08 +0000 Subject: [PATCH BlueZ v2 3/6] build: remove explicit DEPENDENCIES handling Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240124-autofoo-v2-3-a210f20aa2f7@gmail.com> References: <20240124-autofoo-v2-0-a210f20aa2f7@gmail.com> In-Reply-To: <20240124-autofoo-v2-0-a210f20aa2f7@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=1706113208; l=3025; i=emil.l.velikov@gmail.com; s=20230301; h=from:subject:message-id; bh=JrsU9g6AXb7Bhq8yPPPYd9jsTdmPlc07IpOnB/yJWMM=; b=IrtjBrbiSLux8sKZ6n/4nwBPQXbLVvgZC+a4beFdcHcoKUAR2CQGVgayJXZ6OdbosaQa2zCso bN904k8oZ7KCbuOLpFpPwgqEjOyYLNEXXmzO5qc0KGEYf4yvQUKpxHJ 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 We currently duplicate the DEPENDENCIES handling that autotools does for us. We have two types of objects - libraries or generated headers. Former are part of the LDADD, the latter in BUILT_SOURCES. --- Makefile.am | 7 ------- Makefile.mesh | 1 - Makefile.tools | 2 -- 3 files changed, 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index be8f74f13..b913402b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -83,7 +83,6 @@ lib_LTLIBRARIES += lib/libbluetooth.la lib_libbluetooth_la_SOURCES = $(lib_headers) $(lib_sources) lib_libbluetooth_la_LDFLAGS = $(AM_LDFLAGS) -version-info 22:12:19 -lib_libbluetooth_la_DEPENDENCIES = $(local_headers) endif noinst_LTLIBRARIES += lib/libbluetooth-internal.la @@ -100,12 +99,10 @@ gdbus_libgdbus_internal_la_SOURCES = gdbus/gdbus.h \ if EXTERNAL_ELL ell_cflags = @ELL_CFLAGS@ ell_ldadd = @ELL_LIBS@ -ell_dependencies = ell_built_sources = ell/shared else ell_cflags = ell_ldadd = ell/libell-internal.la -ell_dependencies = $(ell_ldadd) ell_built_sources = ell/shared ell/internal ell/ell.h noinst_LTLIBRARIES += ell/libell-internal.la @@ -339,10 +336,6 @@ src_bluetoothd_LDADD = lib/libbluetooth-internal.la \ src_bluetoothd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic \ -Wl,--version-script=$(srcdir)/src/bluetooth.ver -src_bluetoothd_DEPENDENCIES = lib/libbluetooth-internal.la \ - gdbus/libgdbus-internal.la \ - src/libshared-glib.la - src_bluetoothd_CPPFLAGS = $(AM_CPPFLAGS) -DBLUETOOTH_PLUGIN_BUILTIN \ -DPLUGINDIR=\""$(build_plugindir)"\" \ $(BACKTRACE_CFLAGS) $(builtin_cppflags) diff --git a/Makefile.mesh b/Makefile.mesh index a66e47442..45fa90339 100644 --- a/Makefile.mesh +++ b/Makefile.mesh @@ -45,7 +45,6 @@ mesh/main.$(OBJEXT): src/builtin.h lib/bluetooth/bluetooth.h mesh_bluetooth_meshd_SOURCES = $(mesh_sources) mesh/main.c mesh_bluetooth_meshd_LDADD = src/libshared-ell.la $(ell_ldadd) -ljson-c -mesh_bluetooth_meshd_DEPENDENCIES = $(ell_dependencies) src/libshared-ell.la if MANPAGES man_MANS += mesh/bluetooth-meshd.8 diff --git a/Makefile.tools b/Makefile.tools index 6fda3f51d..1cde39f94 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -71,7 +71,6 @@ pkglibexec_PROGRAMS += tools/btmon-logger tools_btmon_logger_SOURCES = tools/btmon-logger.c tools_btmon_logger_LDADD = src/libshared-mainloop.la -tools_btmon_logger_DEPENDENCIES = src/libshared-mainloop.la if SYSTEMD systemdsystemunit_DATA += tools/bluetooth-logger.service @@ -577,7 +576,6 @@ noinst_PROGRAMS += tools/btpclient tools/btpclientctl tools_btpclient_SOURCES = tools/btpclient.c src/shared/btp.c src/shared/btp.h tools_btpclient_LDADD = lib/libbluetooth-internal.la \ src/libshared-ell.la $(ell_ldadd) -tools_btpclient_DEPENDENCIES = lib/libbluetooth-internal.la $(ell_dependencies) tools/btpclient.$(OBJEXT): src/libshared-ell.la ell/internal tools_btpclientctl_SOURCES = tools/btpclientctl.c client/display.c From patchwork Wed Jan 24 16:20:09 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: 766921 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 CF8B87CF1D for ; Wed, 24 Jan 2024 16:20:09 +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=1706113209; cv=none; b=NrrnZZ1q7/vquyf+nvsjX9Zg9eOZDwGEjNNTmKVdd6S2vleLHWqy7C14ZtK1XK43ZgVCboMCc2tOIQVOjoVP5prGx6z5NWhW0nPFV0Ghl34Qnicx4AtxfHSeCA1LqshPG8vb8u5n3tuUb97qHflzV4p9f2CmdMrwxmcOq6C7fcg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706113209; c=relaxed/simple; bh=toyJ4GrY7o8KYOgecH7/KThdc2ubpDqyQCXsnPn9xww=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=f4DpSyBZKfP7XE+CA3C4tA/i6WNItyD4WzUEde+ZjoGQ0GgmR8EU/pgIALb91RxHwAaUaeqmx+7asHzvyG5xKCilVaUf2ddAr65L82roJEhW0f9VfK8xJHlwHGds7QmAe7uVD6vfO9xX5MP/WUfLp+0oS8QdwPSbMci1XeVcQfw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dbhevjPv; 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="dbhevjPv" Received: by smtp.kernel.org (Postfix) with ESMTPS id 8A7A3C433A6; Wed, 24 Jan 2024 16:20:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706113209; bh=toyJ4GrY7o8KYOgecH7/KThdc2ubpDqyQCXsnPn9xww=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=dbhevjPvbaHTAI36gnb4ni4niUalicdGm/1fhVq/XxSZLX///85HxN0nUIYCwyXuP gG7oeQEMLaRshpSdGdgi2D8SG7MD1tmVwWOVJML7f9/038IYodjFEEDPGFWxlTevzW DN0XBNNH+EcHqZlhyDeeKz+Czc1WZvnrKJn5IdeAniPgk97ffeMPrfXxZPBaNXrlnl Ak8U+W8WvTq9kh5GhBkZRScPUMfV8ckzUWiN2QfV4GYx7cXCj+YF50UVwEa3y6HN5a Ez+xMcLZajvjSAvBDQj5rwc8/Eb2ACifYPKWRyz6Dz6ydcca3qxG/0oyRWVcmO7jxz L632P0JipYhtQ== 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 73DE5C48285; Wed, 24 Jan 2024 16:20:09 +0000 (UTC) From: Emil Velikov via B4 Relay Date: Wed, 24 Jan 2024 16:20:09 +0000 Subject: [PATCH BlueZ v2 4/6] build: manage .service.in files via configure.ac Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240124-autofoo-v2-4-a210f20aa2f7@gmail.com> References: <20240124-autofoo-v2-0-a210f20aa2f7@gmail.com> In-Reply-To: <20240124-autofoo-v2-0-a210f20aa2f7@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=1706113208; l=6157; i=emil.l.velikov@gmail.com; s=20230301; h=from:subject:message-id; bh=rLzrk85DeqngNt6mdM8WnH+vWX4MHWwZz3Hi/NGeDbQ=; b=3rTe4Zch6HHf5+ZFmVrpiqEU/hPEQU5uLWuqtcYbRRMk6s04dk1v8aHWPwPabGPCHSOBkay5M QJirzQvAJ3SCYP9Cdz+R2mGH1SdEM6L8NWQGSQh2uWCb0gCfLeoPLXd 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 Considering we do basic substitution, we don't need to manually sed, track dependencies, dist nor clean. Just add the files to AC_CONFIG_FILES() call it a day - it does everything for us. --- Makefile.am | 14 ++------------ Makefile.mesh | 5 +---- Makefile.obexd | 4 ++-- Makefile.tools | 3 --- configure.ac | 11 ++++++++++- mesh/bluetooth-mesh.service.in | 2 +- obexd/src/obex.service.in | 2 +- src/bluetooth.service.in | 2 +- tools/bluetooth-logger.service.in | 2 +- 9 files changed, 19 insertions(+), 26 deletions(-) diff --git a/Makefile.am b/Makefile.am index b913402b3..59603a0b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,7 +47,7 @@ dbussystembusdir = $(DBUS_SYSTEMBUSDIR) dbussystembus_DATA = src/org.bluez.service endif -EXTRA_DIST += src/bluetooth.service.in src/org.bluez.service +EXTRA_DIST += src/org.bluez.service plugindir = $(libdir)/bluetooth/plugins @@ -345,7 +345,7 @@ builtin_files = src/builtin.h nodist_src_bluetoothd_SOURCES = $(builtin_files) -CLEANFILES += $(builtin_files) src/bluetooth.service +CLEANFILES += $(builtin_files) if MANPAGES man_MANS += src/bluetoothd.8 @@ -736,13 +736,6 @@ MAINTAINERCLEANFILES = Makefile.in \ aclocal.m4 configure config.h.in config.sub config.guess \ ltmain.sh depcomp compile missing install-sh mkinstalldirs test-driver -SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(SED) -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \ - -e 's,@libexecdir\@,$(libexecdir),g' \ - -e 's,@statedir\@,$(statedir),g' \ - -e 's,@confdir\@,$(confdir),g' \ - < $< > $@ - if RUN_RST2MAN RST2MAN_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(RST2MAN) --strict --no-raw \ @@ -752,9 +745,6 @@ RST2MAN_PROCESS = $(AM_V_GEN)test -f $@ || \ { echo "Generated manual page $@ does not exist"; false; } endif -%.service: %.service.in Makefile - $(SED_PROCESS) - %.1: %.rst Makefile $(RST2MAN_PROCESS) diff --git a/Makefile.mesh b/Makefile.mesh index 45fa90339..ea50383d2 100644 --- a/Makefile.mesh +++ b/Makefile.mesh @@ -51,9 +51,6 @@ man_MANS += mesh/bluetooth-meshd.8 endif manual_pages += mesh/bluetooth-meshd.8 -CLEANFILES += mesh/bluetooth-mesh.service - endif -EXTRA_DIST += mesh/bluetooth-mesh.conf mesh/bluetooth-mesh.service.in \ - mesh/org.bluez.mesh.service mesh/mesh-main.conf +EXTRA_DIST += mesh/bluetooth-mesh.conf mesh/org.bluez.mesh.service mesh/mesh-main.conf diff --git a/Makefile.obexd b/Makefile.obexd index 5d1a4ff65..c2b5c6d7a 100644 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -7,7 +7,7 @@ dbussessionbusdir = $(DBUS_SESSIONBUSDIR) dbussessionbus_DATA = obexd/src/org.bluez.obex.service endif -EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service +EXTRA_DIST += obexd/src/org.bluez.obex.service if OBEX @@ -112,6 +112,6 @@ obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources) $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(srcdir)/obexd/src/genbuiltin $(obexd_builtin_modules) > $@ -CLEANFILES += obexd/src/builtin.h $(builtin_files) obexd/src/obex.service +CLEANFILES += obexd/src/builtin.h EXTRA_DIST += obexd/src/genbuiltin diff --git a/Makefile.tools b/Makefile.tools index 1cde39f94..044342e29 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -77,9 +77,6 @@ systemdsystemunit_DATA += tools/bluetooth-logger.service endif endif -CLEANFILES += tools/bluetooth-logger.service -EXTRA_DIST += tools/bluetooth-logger.service.in - if TESTING noinst_PROGRAMS += emulator/btvirt emulator/b1ee emulator/hfp \ peripheral/btsensor tools/3dsp \ diff --git a/configure.ac b/configure.ac index cab5da581..b4d362494 100644 --- a/configure.ac +++ b/configure.ac @@ -441,5 +441,14 @@ if (test "${plugin_phonebook}" = "ebook"); then fi AC_SUBST(PLUGIN_PHONEBOOK, [${plugin_phonebook}]) -AC_CONFIG_FILES(Makefile src/bluetoothd.rst lib/bluez.pc mesh/bluetooth-meshd.rst) +AC_CONFIG_FILES( + lib/bluez.pc + Makefile + mesh/bluetooth-meshd.rst + mesh/bluetooth-mesh.service + obexd/src/obex.service + src/bluetoothd.rst + src/bluetooth.service + tools/bluetooth-logger.service +) AC_OUTPUT diff --git a/mesh/bluetooth-mesh.service.in b/mesh/bluetooth-mesh.service.in index c8afbf53e..9c3ff01a3 100644 --- a/mesh/bluetooth-mesh.service.in +++ b/mesh/bluetooth-mesh.service.in @@ -5,7 +5,7 @@ ConditionPathIsDirectory=/sys/class/bluetooth [Service] Type=dbus BusName=org.bluez.mesh -ExecStart=@pkglibexecdir@/bluetooth-meshd +ExecStart=@exec_prefix@/bluetooth/bluetooth-meshd NotifyAccess=main LimitNPROC=1 ProtectHome=true diff --git a/obexd/src/obex.service.in b/obexd/src/obex.service.in index fc0dce993..03d09a679 100644 --- a/obexd/src/obex.service.in +++ b/obexd/src/obex.service.in @@ -4,7 +4,7 @@ Description=Bluetooth OBEX service [Service] Type=dbus BusName=org.bluez.obex -ExecStart=@pkglibexecdir@/obexd +ExecStart=@exec_prefix@/bluetooth/obexd [Install] Alias=dbus-org.bluez.obex.service diff --git a/src/bluetooth.service.in b/src/bluetooth.service.in index beb98ce0c..63e157587 100644 --- a/src/bluetooth.service.in +++ b/src/bluetooth.service.in @@ -6,7 +6,7 @@ ConditionPathIsDirectory=/sys/class/bluetooth [Service] Type=dbus BusName=org.bluez -ExecStart=@pkglibexecdir@/bluetoothd +ExecStart=@exec_prefix@/bluetooth/bluetoothd NotifyAccess=main #WatchdogSec=10 #Restart=on-failure diff --git a/tools/bluetooth-logger.service.in b/tools/bluetooth-logger.service.in index 009002731..5657c8d84 100644 --- a/tools/bluetooth-logger.service.in +++ b/tools/bluetooth-logger.service.in @@ -4,7 +4,7 @@ ConditionPathIsDirectory=/sys/class/bluetooth [Service] Type=simple -ExecStart=@pkglibexecdir@/btmon-logger -p -b /var/log/bluetooth/hci.log +ExecStart=@exec_prefix@/bluetooth/btmon-logger -p -b /var/log/bluetooth/hci.log NotifyAccess=main CapabilityBoundingSet=CAP_NET_RAW LimitNPROC=1 From patchwork Wed Jan 24 16:20:10 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: 765675 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 DFA1A7CF25 for ; Wed, 24 Jan 2024 16:20:09 +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=1706113210; cv=none; b=kqSDHxObnykYkRbkNQkbnmvTAu6sLKYis4Qy8GcB9MwbT1kh4KJIU5DtelgaYAetz+jCgCAu7q+o0uYBRtgykWOi9ivpt76UFM2re8hOYXg92YdaMcHysbRTFwhrPZVBJ4jqhc+omkXzdb2qUNEB9BS5VKCp0OuQPCdqMTb0O9w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706113210; c=relaxed/simple; bh=LY6HxNa1Rb7kL6kWsoMm88OVVfL0zYKMiI+DT18wXSc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BQTxgoDKeBN+wb+S4QOmLD8ZlGwoLta2+gAnKOeI75LO89cq9mqX6HCh0oCBze6JDV/6Oi6S1dbZXUxJ5hyYCbg7jt/puju8Ol8JvW5AyDAqAudi6owQ6dtwLOk+EdykzXdGHQH1E77meKQXrTwZFpC6aTGB5iHY/X0wYVr+ZAw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WHzs9UK6; 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="WHzs9UK6" Received: by smtp.kernel.org (Postfix) with ESMTPS id 9153BC433B1; Wed, 24 Jan 2024 16:20:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706113209; bh=LY6HxNa1Rb7kL6kWsoMm88OVVfL0zYKMiI+DT18wXSc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=WHzs9UK6xWwA/88i7xd4tQhIOw/MhuwysJRRTF45/i2r5yrj3qYIP/SO2WkuFfiw0 k/cteV8MJg26XFfX8YJdmhzLGM0ojRdwfSsfvNqe1T8CR3hRTi2kMl+sfl/R536zpa 9ypnEobghKYUWJoDgm3MtFPr6pm3P6Fqh0lBFYWFDjHZ5DXAdkua1jhNukFgxCyZZz RTa1lw88GhnvhAWE6tBjDbqITQsmPQwjmOUxPWiFArTX1QpyjnFdIGjTsqWWGlJlCy csunMpxmY9jdT3Qj9P+Hgrj8zWf93XWmTr20KzZSQlE0fG7V8GA4+YAQJc9d30CXBd bFeU4b+mx5H6A== 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 7E067C48277; Wed, 24 Jan 2024 16:20:09 +0000 (UTC) From: Emil Velikov via B4 Relay Date: Wed, 24 Jan 2024 16:20:10 +0000 Subject: [PATCH BlueZ v2 5/6] build: enable gc/dead code removal Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240124-autofoo-v2-5-a210f20aa2f7@gmail.com> References: <20240124-autofoo-v2-0-a210f20aa2f7@gmail.com> In-Reply-To: <20240124-autofoo-v2-0-a210f20aa2f7@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=1706113208; l=776; i=emil.l.velikov@gmail.com; s=20230301; h=from:subject:message-id; bh=tXVcdUfXETqQpcM+wIkv5sahEbGpnPS14+ukiFkfzcc=; b=O47pFB1MpHutfgeP+aMWlBF+ARi5rE1aUctgbZlF5tjqT3JInSAszK8MFhNauFUT3ImJQdtfk RYCwnpcXebACBvbPeTzkFwXt9S7YToicJ6vi3y5hWFNMVSbRkUKCo/3 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, there's plenty of unused code in most binaries. Enable -fdata/function-sections, which allows the linker garbage collection to do its job. On a maintainer build, this reduces the (unstriped) binaries from 117 to 114MiB. --- acinclude.m4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index c5d6de7b3..4b73a5bfc 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -134,6 +134,8 @@ AC_DEFUN([MISC_FLAGS], [ misc_cflags="$misc_cflags --coverage" misc_ldflags="$misc_ldflags --coverage" fi + misc_cflags="$misc_cflags -ffunction-sections -fdata-sections" + misc_ldflags="$misc_ldflags -Wl,--gc-sections" AC_SUBST([MISC_CFLAGS], $misc_cflags) AC_SUBST([MISC_LDFLAGS], $misc_ldflags) ]) From patchwork Wed Jan 24 16:20:11 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: 766920 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 DF9C17CF24 for ; Wed, 24 Jan 2024 16:20:09 +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=1706113210; cv=none; b=b29l7WwGO8czTCiYy0G9jioJp7JSjdoBE9MVvztlUDQ9YWfx6rynuU41nvSOTAnwFKmi+/1On7Rxj2Ta1QRtep23mDIA9TOwwL8mT64LYTKE7yMLTJpsRm+1bQuKaUzYueRKmvGReLBR7ug1+GjpopRxiqFhVs0cVvzM8VNzvJw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706113210; c=relaxed/simple; bh=mt/cAQdRVMGpUk5mi/AqEYZMGwI2MZPm2Ce6zyWCPO4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Td8WaJKeUk8BdniSTlv/kIag4r2p8uzJR5Yus+T4ZKH4pdCOxigPM15+9egsXKYxIjqCdj/hKRMdoNq0FOBMTBm2303BP/4ltKxzaX8AakuboCGtklpxQYzO2Gt1EghwzciDAGhHoVIY3TQJWPz/nQL4GUwkeP1NwFdbnKhgP6I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YCaLWdeb; 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="YCaLWdeb" Received: by smtp.kernel.org (Postfix) with ESMTPS id 93931C433F1; Wed, 24 Jan 2024 16:20:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706113209; bh=mt/cAQdRVMGpUk5mi/AqEYZMGwI2MZPm2Ce6zyWCPO4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=YCaLWdebPrOv3Uhavx1VE8hNdF8fjD7XOccpYU9Zsdr4DmK2U6cMkq12grBwBe/95 ptp1OClbV0q9xK16sV0JPk1qOBahB+lKq/8OJzUKq7kxCcKzRn29zaswLdfFTcyXk8 LepisMT/urcV+3WHUOTFVWGOQASDdW2+LjHSHphpoO5CPrS61te92wysNNpH/LJnpd 9AkxuDLMKiXwtY3J07hMbTxILIg07joW+wl5lSE6aldOsaerWVVXbtkohGd4F5l7p0 BWhUhXvrKUM98rVxRXexUuxYsP4xX5J7Q+Uk+4HaKdrDBzknQbn2Ng7bm/lQTxDNye G+Pe3sAmnCn4Q== 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 86121C48286; Wed, 24 Jan 2024 16:20:09 +0000 (UTC) From: Emil Velikov via B4 Relay Date: Wed, 24 Jan 2024 16:20:11 +0000 Subject: [PATCH BlueZ v2 6/6] build: install dbus-org.bluez.obex.service symlink Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240124-autofoo-v2-6-a210f20aa2f7@gmail.com> References: <20240124-autofoo-v2-0-a210f20aa2f7@gmail.com> In-Reply-To: <20240124-autofoo-v2-0-a210f20aa2f7@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=1706113208; l=1158; i=emil.l.velikov@gmail.com; s=20230301; h=from:subject:message-id; bh=fbR9nv2+W1T7EdTJDnrPWv8eu5ZYYznbyAyGjdmqMMc=; b=7+IjkrXQNVb3h8u9JdTKomQWY65njHFNRhxiSfCXMEb9MH4lByR/ro5trZ7/qXHQNwobV8mgv whH7cqBNPwDD61XkF7Qbyi0W0r02hhgD0AdniwJZRExIP8P87EIhhZI 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 obex.service has an alias(dbus-org.bluez.obex.service) which is created as it's enabled. At the same time, the dbus service references the alias itself. Thus the dbus socket activation can happen, only when the service is already enabled/running... Which defeats the whole purpose. Create/install the respective symlink/alias, so that any user looking for the dbus will start it. Note: we need a hook here instead of LN_S to create the in-tree file, since `install' aggressively dereferences it. --- Makefile.obexd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile.obexd b/Makefile.obexd index c2b5c6d7a..363295d0e 100644 --- a/Makefile.obexd +++ b/Makefile.obexd @@ -3,6 +3,12 @@ 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 + dbussessionbusdir = $(DBUS_SESSIONBUSDIR) dbussessionbus_DATA = obexd/src/org.bluez.obex.service endif