diff mbox series

[BlueZ,v2,01/10] build: rework {install-data,uninstall}-hook

Message ID 20240216-hook-fixup-v2-1-a6b192d1a6ad@gmail.com
State New
Headers show
Series Handful of build fixes and cleanups | expand

Commit Message

Emil Velikov via B4 Relay Feb. 16, 2024, 11:11 p.m. UTC
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(-)

Comments

bluez.test.bot@gmail.com Feb. 17, 2024, 12:31 a.m. UTC | #1
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=826966

---Test result---

Test Summary:
CheckPatch                    PASS      4.37 seconds
GitLint                       PASS      4.58 seconds
BuildEll                      PASS      24.34 seconds
BluezMake                     FAIL      12.09 seconds
MakeCheck                     FAIL      6.42 seconds
MakeDistcheck                 FAIL      34.23 seconds
CheckValgrind                 FAIL      11.26 seconds
CheckSmatch                   FAIL      12.22 seconds
bluezmakeextell               FAIL      11.08 seconds
IncrementalBuild              FAIL      2081.36 seconds
ScanBuild                     PASS      999.98 seconds

Details
##############################
Test: BluezMake - FAIL
Desc: Build BlueZ
Output:

In file included from ./src/eir.h:14,
                 from src/shared/ad.c:24:
./lib/bluetooth/sdp.h:22:10: fatal error: bluetooth/bluetooth.h: No such file or directory
   22 | #include <bluetooth/bluetooth.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[1]: *** [Makefile:8511: src/shared/libshared_mainloop_la-ad.lo] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4647: all] Error 2
##############################
Test: MakeCheck - FAIL
Desc: Run Bluez Make Check
Output:

In file included from client/mgmt.c:34:
./lib/bluetooth/sdp.h:22:10: fatal error: bluetooth/bluetooth.h: No such file or directory
   22 | #include <bluetooth/bluetooth.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[1]: *** [Makefile:7801: client/mgmt.o] Error 1
make: *** [Makefile:12164: check] Error 2
##############################
Test: MakeDistcheck - FAIL
Desc: Run Bluez Make Distcheck
Output:

In file included from ../../src/eir.h:14,
                 from ../../src/shared/ad.c:24:
../../lib/bluetooth/sdp.h:22:10: fatal error: bluetooth/bluetooth.h: No such file or directory
   22 | #include <bluetooth/bluetooth.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[2]: *** [Makefile:8511: src/shared/libshared_mainloop_la-ad.lo] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [Makefile:4647: all] Error 2
make: *** [Makefile:12085: distcheck] Error 1
##############################
Test: CheckValgrind - FAIL
Desc: Run Bluez Make Check with Valgrind
Output:

In file included from ./src/eir.h:14,
                 from src/shared/ad.c:24:
./lib/bluetooth/sdp.h:22:10: fatal error: bluetooth/bluetooth.h: No such file or directory
   22 | #include <bluetooth/bluetooth.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[1]: *** [Makefile:8511: src/shared/libshared_mainloop_la-ad.lo] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:12164: check] Error 2
##############################
Test: CheckSmatch - FAIL
Desc: Run smatch tool with source
Output:

src/shared/crypto.c:271:21: warning: Variable length array is used.
src/shared/crypto.c:272:23: warning: Variable length array is used.
src/shared/ad.c: note: in included file (through src/eir.h):
./lib/bluetooth/sdp.h:22:11: error: unable to open 'bluetooth/bluetooth.h'
./lib/bluetooth/sdp.h:22:11: error: using '/github/workspace/src/src/lib/bluetooth/bluetooth.h'
In file included from ./src/eir.h:14,
                 from src/shared/ad.c:24:
./lib/bluetooth/sdp.h:22:10: fatal error: bluetooth/bluetooth.h: No such file or directory
   22 | #include <bluetooth/bluetooth.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[1]: *** [Makefile:8511: src/shared/libshared_mainloop_la-ad.lo] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4647: all] Error 2
##############################
Test: bluezmakeextell - FAIL
Desc: Build Bluez with External ELL
Output:

In file included from ./src/eir.h:14,
                 from src/shared/ad.c:24:
./lib/bluetooth/sdp.h:22:10: fatal error: bluetooth/bluetooth.h: No such file or directory
   22 | #include <bluetooth/bluetooth.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[1]: *** [Makefile:8511: src/shared/libshared_mainloop_la-ad.lo] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4647: all] Error 2
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series
Output:

error: tools/97-hid2hci.rules: already exists in working directory
hint: Use 'git am --show-current-patch' to see the failed patch


---
Regards,
Linux Bluetooth
diff mbox series

Patch

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