Hello list,
The very first patch in this series fixes a regression I've introduced
recently - sorry about that.
Namely: two separate patch series introduced an `install-data-hook` and
I didn't properly test with both combined. The former is unconditionally
set while the latter is not.
So if obex is enabled, we fail to create the config files :facepalm:
The second patch is a log pre-existing issue - we install dbus/systemd
service files, for obexd even when building with --disable-obex
The last two are trivial cleanups, so feel free to drop them if they
don't strike your interest.
---
Emil Velikov (4):
build: fold separate install-data-hooks
build: install obexd (dbus,systemd} services as needed
build: drop %.rules make rule
build: simplify coverage handling
Makefile.am | 27 ++++++++++++---------------
Makefile.obexd | 9 ++-------
tools/{hid2hci.rules => 97-hid2hci.rules} | 0
3 files changed, 14 insertions(+), 22 deletions(-)
---
base-commit: b55d98e5cc97e4ff8c3980b84f46c84f3b1c1ee3
change-id: 20240214-hook-fixup-f26304b71366
Best regards,
--
Emil Velikov <[email protected]>
From: Emil Velikov <[email protected]>
There's a single file, so we can drop the makefile rule and rename it
accordingly.
Signed-off-by: Emil Velikov <[email protected]>
---
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
--
2.43.1