From: Emil Velikov via B4 Relay <devnull+emil.l.velikov.gmail.com@kernel.org>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ v2 01/10] build: rework {install-data,uninstall}-hook
Date: Fri, 16 Feb 2024 23:11:05 +0000 [thread overview]
Message-ID: <20240216-hook-fixup-v2-1-a6b192d1a6ad@gmail.com> (raw)
In-Reply-To: <20240216-hook-fixup-v2-0-a6b192d1a6ad@gmail.com>
From: Emil Velikov <emil.l.velikov@gmail.com>
Currently autoconfigure throws a useful error, about a duplicate
install-data-hook.
Address that by making the two target specific and pulling them as
dependencies.
We have to create empty ones otherwise dependency tracking and
resolution will fail.
---
Makefile.am | 5 ++++-
Makefile.obexd | 10 ++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5207c172b..450e931c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ AM_LDFLAGS = $(MISC_LDFLAGS)
confdir = $(sysconfdir)/bluetooth
statedir = $(localstatedir)/lib/bluetooth
-install-data-hook:
+bluetoothd-fix-permissions:
install -dm555 $(DESTDIR)$(confdir)
install -dm700 $(DESTDIR)$(statedir)
@@ -422,6 +422,9 @@ include Makefile.obexd
include android/Makefile.am
include Makefile.mesh
+install-data-hook: bluetoothd-fix-permissions obexd-add-service-symlink
+uninstall-hook: obexd-remove-service-symlink
+
if HID2HCI
rulesdir = $(UDEV_DIR)/rules.d
diff --git a/Makefile.obexd b/Makefile.obexd
index 81456544d..0e8bc6de7 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -3,11 +3,14 @@ if SYSTEMD
systemduserunitdir = $(SYSTEMD_USERUNITDIR)
systemduserunit_DATA = obexd/src/obex.service
-install-data-hook:
+obexd-add-service-symlink:
$(LN_S) -f obex.service $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service
-uninstall-hook:
+obexd-remove-service-symlink:
rm -f $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service
+else
+obexd-add-service-symlink:
+obexd-remove-service-symlink:
endif
dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
@@ -102,6 +105,9 @@ obexd_src_obexd_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
obexd_src_obexd_CFLAGS = $(AM_CFLAGS) -fPIC
+else
+obexd-add-service-symlink:
+obexd-remove-service-symlink:
endif
obexd_src_obexd_SHORTNAME = obexd
--
2.43.1
next prev parent reply other threads:[~2024-02-16 23:11 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-16 23:11 [PATCH BlueZ v2 00/10] Handful of build fixes and cleanups Emil Velikov via B4 Relay
2024-02-16 23:11 ` Emil Velikov via B4 Relay [this message]
2024-02-17 0:31 ` bluez.test.bot
2024-02-16 23:11 ` [PATCH BlueZ v2 02/10] build: install obexd (dbus,systemd} services as needed Emil Velikov via B4 Relay
2024-02-16 23:11 ` [PATCH BlueZ v2 03/10] build: handle relative libexecdir instances Emil Velikov via B4 Relay
2024-02-16 23:11 ` [PATCH BlueZ v2 04/10] build: drop %.rules make rule Emil Velikov via B4 Relay
2024-02-16 23:11 ` [PATCH BlueZ v2 05/10] build: simplify coverage handling Emil Velikov via B4 Relay
2024-02-16 23:11 ` [PATCH BlueZ v2 06/10] build: drop explicit -fPIC from obexd CFLAGS Emil Velikov via B4 Relay
2024-02-16 23:11 ` [PATCH BlueZ v2 07/10] gitignore: add org.bluez.obex.service Emil Velikov via B4 Relay
2024-02-16 23:11 ` [PATCH BlueZ v2 08/10] build: obexd: remove duplicate include -I$(builddir)/lib Emil Velikov via B4 Relay
2024-02-16 23:11 ` [PATCH BlueZ v2 09/10] gitignore: ignore all manual pages Emil Velikov via B4 Relay
2024-02-16 23:11 ` [PATCH BlueZ v2 10/10] build: move public headers to sub-folder Emil Velikov via B4 Relay
2024-02-17 16:09 ` [PATCH BlueZ v2 00/10] Handful of build fixes and cleanups Emil Velikov
2024-02-20 15:00 ` patchwork-bot+bluetooth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240216-hook-fixup-v2-1-a6b192d1a6ad@gmail.com \
--to=devnull+emil.l.velikov.gmail.com@kernel.org \
--cc=emil.l.velikov@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).