* [PATCH 1/4] Replace @exec_prefix@ with @libexecdir@ in .service files.
@ 2024-02-15 22:52 tjernlund
2024-02-15 22:52 ` [PATCH 2/4] bluez.pc.in: Add definition of libexecdir tjernlund
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: tjernlund @ 2024-02-15 22:52 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Joakim Tjernlund
The programs are installed with libexecdir prefix, make .service files
match that.
Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
---
mesh/bluetooth-mesh.service.in | 2 +-
obexd/src/obex.service.in | 2 +-
obexd/src/org.bluez.obex.service.in | 2 +-
src/bluetooth.service.in | 2 +-
tools/bluetooth-logger.service.in | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mesh/bluetooth-mesh.service.in b/mesh/bluetooth-mesh.service.in
index 9c3ff01a3..d82043020 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=@exec_prefix@/bluetooth/bluetooth-meshd
+ExecStart=@libexecdir@/bluetooth/bluetooth-meshd
NotifyAccess=main
LimitNPROC=1
ProtectHome=true
diff --git a/obexd/src/obex.service.in b/obexd/src/obex.service.in
index 03d09a679..614ac090e 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=@exec_prefix@/bluetooth/obexd
+ExecStart=@libexecdir@/bluetooth/obexd
[Install]
Alias=dbus-org.bluez.obex.service
diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
index 14c16d3e3..e53e3f7fa 100644
--- a/obexd/src/org.bluez.obex.service.in
+++ b/obexd/src/org.bluez.obex.service.in
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=org.bluez.obex
-Exec=@exec_prefix@/bluetooth/obexd
+Exec=@libexecdir@/bluetooth/obexd
SystemdService=dbus-org.bluez.obex.service
diff --git a/src/bluetooth.service.in b/src/bluetooth.service.in
index 63e157587..356b85056 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=@exec_prefix@/bluetooth/bluetoothd
+ExecStart=@libexecdir@/bluetooth/bluetoothd
NotifyAccess=main
#WatchdogSec=10
#Restart=on-failure
diff --git a/tools/bluetooth-logger.service.in b/tools/bluetooth-logger.service.in
index 5657c8d84..31fabe8d3 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=@exec_prefix@/bluetooth/btmon-logger -p -b /var/log/bluetooth/hci.log
+ExecStart=@libexecdir@/bluetooth/btmon-logger -p -b /var/log/bluetooth/hci.log
NotifyAccess=main
CapabilityBoundingSet=CAP_NET_RAW
LimitNPROC=1
--
2.43.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/4] bluez.pc.in: Add definition of libexecdir
2024-02-15 22:52 [PATCH 1/4] Replace @exec_prefix@ with @libexecdir@ in .service files tjernlund
@ 2024-02-15 22:52 ` tjernlund
2024-02-15 22:52 ` [PATCH 3/4] bootstrap-configure: specfiy exec-prefix and libexecdir tjernlund
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: tjernlund @ 2024-02-15 22:52 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Joakim Tjernlund
Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
---
lib/bluez.pc.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/bluez.pc.in b/lib/bluez.pc.in
index 3d6e59616..1c2f30b33 100644
--- a/lib/bluez.pc.in
+++ b/lib/bluez.pc.in
@@ -1,6 +1,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
+libexecdir=@libexecdir@
includedir=@includedir@
Name: BlueZ
--
2.43.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/4] bootstrap-configure: specfiy exec-prefix and libexecdir
2024-02-15 22:52 [PATCH 1/4] Replace @exec_prefix@ with @libexecdir@ in .service files tjernlund
2024-02-15 22:52 ` [PATCH 2/4] bluez.pc.in: Add definition of libexecdir tjernlund
@ 2024-02-15 22:52 ` tjernlund
2024-02-15 22:52 ` [PATCH 4/4] CUPS lives in libexecdir tjernlund
2024-02-16 0:41 ` [1/4] Replace @exec_prefix@ with @libexecdir@ in .service files bluez.test.bot
3 siblings, 0 replies; 5+ messages in thread
From: tjernlund @ 2024-02-15 22:52 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Joakim Tjernlund
Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
---
bootstrap-configure | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bootstrap-configure b/bootstrap-configure
index 1c26909b9..d927ff9c6 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -8,6 +8,8 @@ fi
./configure --enable-maintainer-mode \
--enable-debug \
--prefix=/usr \
+ --exec-prefix=/usr \
+ --libexecdir=/usr/libexec \
--mandir=/usr/share/man \
--sysconfdir=/etc \
--localstatedir=/var \
--
2.43.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 4/4] CUPS lives in libexecdir
2024-02-15 22:52 [PATCH 1/4] Replace @exec_prefix@ with @libexecdir@ in .service files tjernlund
2024-02-15 22:52 ` [PATCH 2/4] bluez.pc.in: Add definition of libexecdir tjernlund
2024-02-15 22:52 ` [PATCH 3/4] bootstrap-configure: specfiy exec-prefix and libexecdir tjernlund
@ 2024-02-15 22:52 ` tjernlund
2024-02-16 0:41 ` [1/4] Replace @exec_prefix@ with @libexecdir@ in .service files bluez.test.bot
3 siblings, 0 replies; 5+ messages in thread
From: tjernlund @ 2024-02-15 22:52 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Joakim Tjernlund
Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
---
Makefile.tools | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.tools b/Makefile.tools
index 044342e29..b785ebea8 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -538,7 +538,7 @@ endif
endif
if CUPS
-cupsdir = $(libdir)/cups/backend
+cupsdir = $(libexecdir)/cups/backend
cups_PROGRAMS = profiles/cups/bluetooth
--
2.43.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* RE: [1/4] Replace @exec_prefix@ with @libexecdir@ in .service files.
2024-02-15 22:52 [PATCH 1/4] Replace @exec_prefix@ with @libexecdir@ in .service files tjernlund
` (2 preceding siblings ...)
2024-02-15 22:52 ` [PATCH 4/4] CUPS lives in libexecdir tjernlund
@ 2024-02-16 0:41 ` bluez.test.bot
3 siblings, 0 replies; 5+ messages in thread
From: bluez.test.bot @ 2024-02-16 0:41 UTC (permalink / raw)
To: linux-bluetooth, tjernlund
[-- Attachment #1: Type: text/plain, Size: 1568 bytes --]
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=826608
---Test result---
Test Summary:
CheckPatch PASS 0.93 seconds
GitLint FAIL 1.02 seconds
BuildEll PASS 24.14 seconds
BluezMake PASS 731.18 seconds
MakeCheck PASS 11.45 seconds
MakeDistcheck PASS 163.57 seconds
CheckValgrind PASS 227.16 seconds
CheckSmatch PASS 332.01 seconds
bluezmakeextell PASS 107.61 seconds
IncrementalBuild PASS 2701.27 seconds
ScanBuild PASS 970.94 seconds
Details
##############################
Test: GitLint - FAIL
Desc: Run gitlint
Output:
[1/4] Replace @exec_prefix@ with @libexecdir@ in .service files.
WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search
1: T3 Title has trailing punctuation (.): "[1/4] Replace @exec_prefix@ with @libexecdir@ in .service files."
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-02-16 0:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-15 22:52 [PATCH 1/4] Replace @exec_prefix@ with @libexecdir@ in .service files tjernlund
2024-02-15 22:52 ` [PATCH 2/4] bluez.pc.in: Add definition of libexecdir tjernlund
2024-02-15 22:52 ` [PATCH 3/4] bootstrap-configure: specfiy exec-prefix and libexecdir tjernlund
2024-02-15 22:52 ` [PATCH 4/4] CUPS lives in libexecdir tjernlund
2024-02-16 0:41 ` [1/4] Replace @exec_prefix@ with @libexecdir@ in .service files bluez.test.bot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.