1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Tue, 10 Oct 2023 12:05:10 +0200
Subject: [PATCH] Install dbus wrapper script to /usr/share/rauc instead of /usr/libexec
Origin: vendor, Debian
Forwarded: not-needed, Debian-specific
According to the FHS /usr/libexec is for binaries only, so /usr/share/rauc
seems to be better suited for a shell script.
---
data/de.pengutronix.rauc.service.in | 2 +-
meson.build | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/de.pengutronix.rauc.service.in b/data/de.pengutronix.rauc.service.in
index 9d93946ff820..d6e0b5348313 100644
--- a/data/de.pengutronix.rauc.service.in
+++ b/data/de.pengutronix.rauc.service.in
@@ -1,5 +1,5 @@
[D-BUS Service]
Name=de.pengutronix.rauc
-Exec=@libexecdir@/rauc-service.sh
+Exec=@pkgdatadir@/rauc-service.sh
User=root
SystemdService=rauc.service
diff --git a/meson.build b/meson.build
index 8291c215f886..fad26fc057f5 100644
--- a/meson.build
+++ b/meson.build
@@ -23,8 +23,8 @@ if not prefixdir.startswith('/')
endif
bindir = join_paths(prefixdir, get_option('bindir'))
conf.set('bindir', bindir)
-libexecdir = join_paths(prefixdir, get_option('libexecdir'))
-conf.set('libexecdir', libexecdir)
+pkgdatadir = join_paths(prefixdir, get_option('datadir'), 'rauc')
+conf.set('pkgdatadir', pkgdatadir)
glibdep = dependency('glib-2.0', version : '>=2.64')
@@ -256,7 +256,7 @@ if dbusinterfacesdir == ''
endif
endif
-dbuswrapperdir = get_option('libexecdir')
+dbuswrapperdir = conf.get('pkgdatadir')
install_data('src/de.pengutronix.rauc.Installer.xml', install_dir : dbusinterfacesdir)
|
