build: Fix distcheck while installing org.bluez.obex.service with --disable-system
Subsystems (2)
v2 cover build: Fix distcheck while installing org.bluez.obex.service with --disable-system
From: Alfred Wingate <[email protected]>
Pkg-config variables give absolute paths with system prefixes, causing problems for distcheck which wants to install everything in its own prefix. To cope with this lets give distcheck its own configure arguments with its own prefix variable already included.
https://www.gnu.org/software/automake/manual/html_node/DISTCHECK_005fCONFIGURE_005fFLAGS.html
This allows reverting the previous workaround that stopped installing the obex dbus service on non systemd targets.
https://github.com/bluez/bluez/issues/806
---
Changed in v2:
- Use AM_DISTCHECK_CONFIGURE_FLAGS as instructed in automake documentation.
- Simplify fix to only set dbus variables and explicitly disable cups as well.
---
Alfred Wingate (3):
build: use AM_DISTCHECK_CONFIGURE_FLAGS
build: Fix distcheck by hardcoding non absolute paths
build: obexd: Revert "Fix make distcheck"
Makefile.am | 11 +++++++++-- Makefile.obexd | 7 ++++--- 2 files changed, 13 insertions(+), 5 deletions(-)
base-commit: 5e41d1e1d361e7288964e4c2c5ed90736025662f
Signature · 1 line
2.51.2
PATCH v2 1/3 build: use AM_DISTCHECK_CONFIGURE_FLAGS
From: Alfred Wingate <[email protected]>
DISTCHECK_CONFIGURE_FLAGS is meant for users to be set on the command line.
https://www.gnu.org/software//automake/manual/html_node/DISTCHECK_005fCONFIGURE_005fFLAGS.html
--- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile.am +1 -1
@@ -744,7 +744,7 @@ endif EXTRA_DIST += $(manual_pages) $(patsubst %.1,%.rst, \ $(patsubst %.8,%.rst,$(manual_pages))) -DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles --enable-library \ +AM_DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles --enable-library \ --enable-health \ --enable-midi \ --enable-manpages \
Signature · 1 line
2.51.2
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=1022135
---Test result---
Test Summary:
CheckPatch PENDING 0.38 seconds GitLint PENDING 0.38 seconds BuildEll PASS 20.22 seconds BluezMake PASS 2950.57 seconds MakeCheck PASS 20.34 seconds MakeDistcheck PASS 188.98 seconds CheckValgrind PASS 241.26 seconds CheckSmatch PASS 316.65 seconds bluezmakeextell PASS 130.91 seconds IncrementalBuild PENDING 0.35 seconds ScanBuild PASS 949.34 seconds
Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:
##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series Output:
---
Regards,
Linux Bluetooth
PATCH v2 2/3 build: Fix distcheck by hardcoding non absolute paths
In reply to Alfred WingateFrom: Alfred Wingate <[email protected]>
Pkg-config gives out absolute paths that don't fare well with distcheck that needs to install files into its own prefix.
Disable cups for distcheck as well so that only dbus needs this handling.
You can learn more about this type of issue here.
https://bugzilla.redhat.com/show_bug.cgi?id=1123963
See-Also: 9cc8b97b8 ("build: obexd: Fix make distcheck")
--- Makefile.am | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
Makefile.am +8 -1
@@ -744,6 +744,7 @@ endif EXTRA_DIST += $(manual_pages) $(patsubst %.1,%.rst, \ $(patsubst %.8,%.rst,$(manual_pages))) +# pkg-config gives absolute paths that do not work with distcheck that wants to use its own $(prefix) AM_DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles --enable-library \ --enable-health \ --enable-midi \
@@ -751,7 +752,13 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles --enable-library \ --enable-mesh \ --enable-btpclient \ --disable-systemd \ - --disable-udev + --disable-udev \ + --disable-cups \ + --with-dbusconfdir=$${dc_install_base}/$(DBUS_CONFDIR) \ + --with-dbussystembusdir=$${dc_install_base}/$(DBUS_SYSTEMBUSDIR) \ + --with-dbussessionbusdir=$${dc_install_base}/$(DBUS_SESSIONBUSDIR) + + DISTCLEANFILES = $(pkgconfig_DATA) $(unit_tests) $(manual_pages)
Signature · 1 line
2.51.2
PATCH v2 3/3 build: obexd: Revert "Fix make distcheck"
In reply to Alfred WingateFrom: Alfred Wingate <[email protected]>
Reverts: 9cc8b97b8 ("build: obexd: Fix make distcheck")
--- Makefile.obexd | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
Makefile.obexd +4 -3
@@ -4,9 +4,6 @@ if OBEX if SYSTEMD systemduserunit_DATA += obexd/src/obex.service -dbussessionbusdir = $(DBUS_SESSIONBUSDIR) -dbussessionbus_DATA = obexd/src/org.bluez.obex.service - obexd-add-service-symlink: $(LN_S) -f obex.service $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service
@@ -17,6 +14,10 @@ obexd-add-service-symlink: obexd-remove-service-symlink: endif +dbussessionbusdir = $(DBUS_SESSIONBUSDIR) +dbussessionbus_DATA = obexd/src/org.bluez.obex.service + + obex_plugindir = $(libdir)/obex/plugins obexd_builtin_modules =
Signature · 1 line
2.51.2
This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 8 lines · On Tue, 11 Nov 2025 15:57:32 +0000 you wrote:
From: Alfred Wingate <[email protected]>
Pkg-config variables give absolute paths with system prefixes, causing problems for distcheck which wants to install everything in its own prefix. To cope with this lets give distcheck its own configure arguments with its own prefix variable already included.
[...]
Here is the summary with links:
- [v2,BlueZ,1/3] build: use AM_DISTCHECK_CONFIGURE_FLAGS
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=708bf7d11056 - [v2,BlueZ,2/3] build: Fix distcheck by hardcoding non absolute paths https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=057da54566f6 - [v2,BlueZ,3/3] build: obexd: Revert "Fix make distcheck" https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=ebd6f9fefa26
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html