Hello everyone,
Here is v2 of the autotoo papercuts.
Changes in this revision:
- dropped already merged patches - thanks o/
- drop "build: remove dummy {conf,state}{dir,_DATA}" patch
The latter patch was causing some unexpected and unrelated issues with
the CI. At a glance I couldn't quite track down why, it removes some
dead code and reproducing the CI is a time sink ... So I caved in :-P
Link to the original v1 cover letter and patches can be found below.
Thanks
Emil
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Emil Velikov (6):
build: remove unused variable builtin_nodist
build: remove .service files from DEPENDENCIES lists
build: remove explicit DEPENDENCIES handling
build: manage .service.in files via configure.ac
build: enable gc/dead code removal
build: install dbus-org.bluez.obex.service symlink
Makefile.am | 25 +++----------------------
Makefile.mesh | 7 +------
Makefile.obexd | 10 ++++++++--
Makefile.tools | 6 ------
acinclude.m4 | 2 ++
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 +-
10 files changed, 28 insertions(+), 41 deletions(-)
---
base-commit: a9d1f6f6a625607de6c3f5b7a40a3aac5f36c02b
change-id: 20240116-autofoo-db2fe2c70951
Best regards,
--
Emil Velikov <[email protected]>
From: Emil Velikov <[email protected]>
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
--
2.43.0
Hello:
This series was applied to bluetooth/bluez.git (master)
by Luiz Augusto von Dentz <[email protected]>:
On Wed, 24 Jan 2024 16:20:05 +0000 you wrote:
> Hello everyone,
>
> Here is v2 of the autotoo papercuts.
>
> Changes in this revision:
> - dropped already merged patches - thanks o/
> - drop "build: remove dummy {conf,state}{dir,_DATA}" patch
>
> [...]
Here is the summary with links:
- [BlueZ,v2,1/6] build: remove unused variable builtin_nodist
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=215e6c7083da
- [BlueZ,v2,2/6] build: remove .service files from DEPENDENCIES lists
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=14c7f21292b1
- [BlueZ,v2,3/6] build: remove explicit DEPENDENCIES handling
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=808d008aace3
- [BlueZ,v2,4/6] build: manage .service.in files via configure.ac
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=116524c01de4
- [BlueZ,v2,5/6] build: enable gc/dead code removal
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=10d6d908b5fe
- [BlueZ,v2,6/6] build: install dbus-org.bluez.obex.service symlink
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=1cd6c874c271
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html