summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Jorns <ejo@pengutronix.de>2019-01-11 09:58:23 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-01-12 10:17:07 +0100
commit12494a99800eb757354b68b7a8e54c8a6aa92d60 (patch)
treeaed52108a46d985d0d350358c54dedda32a1def4
parent2a411b726899fd2f64ce2fdc686d3a65e612b750 (diff)
downloadptxdist-12494a99800eb757354b68b7a8e54c8a6aa92d60.tar.gz
ptxdist-12494a99800eb757354b68b7a8e54c8a6aa92d60.tar.xz
rauc: allow to optionally disable SERVICE mode
Signed-off-by: Enrico Jorns <ejo@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/rauc.in10
-rw-r--r--rules/rauc.make4
2 files changed, 13 insertions, 1 deletions
diff --git a/rules/rauc.in b/rules/rauc.in
index 96afc9092..653939a8b 100644
--- a/rules/rauc.in
+++ b/rules/rauc.in
@@ -15,6 +15,16 @@ menuconfig RAUC
if RAUC
+config RAUC_SERVICE
+ bool
+ prompt "Enable service (D-Bus) support"
+ depends on DBUS
+ default y
+ help
+ Compiles RAUC to act as a separate daemon and comand line interface
+ that communicate with each other via D-Bus interface.
+ Only deactivate this if you have a system that does not provide D-Bus!
+
config RAUC_NETWORK
bool
prompt "Enable network support"
diff --git a/rules/rauc.make b/rules/rauc.make
index 116fd512b..772cc0082 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -41,7 +41,7 @@ RAUC_CONF_OPT := \
$(GLOBAL_LARGE_FILE_OPTION) \
--disable-code-coverage \
--disable-valgrind \
- --enable-service \
+ --$(call ptx/endis,PTXCONF_RAUC_SERVICE)-service \
--$(call ptx/endis,PTXCONF_RAUC_NETWORK)-network \
--$(call ptx/endis,PTXCONF_RAUC_JSON)-json \
--with-systemdunitdir=/usr/lib/systemd/system \
@@ -71,10 +71,12 @@ ifdef PTXCONF_RAUC_CONFIGURATION
@$(call install_alternative, rauc, 0, 0, 0644, /etc/rauc/ca.cert.pem)
endif
+ifdef PTXCONF_RAUC_SERVICE
@$(call install_copy, rauc, 0, 0, 0644, -, \
/usr/share/dbus-1/system-services/de.pengutronix.rauc.service)
@$(call install_copy, rauc, 0, 0, 0644, -, \
/usr/share/dbus-1/system.d/de.pengutronix.rauc.conf)
+endif
ifdef PTXCONF_INITMETHOD_SYSTEMD
@$(call install_alternative, rauc, 0, 0, 0644, \