[ptxdist] [PATCH v2 4/4] weston: make weston-launch configurable

[Michael Tretter <m.tretter@pengutronix.de>]

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/weston.in   | 9 +++++++++
 rules/weston.make | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/rules/weston.in b/rules/weston.in
index 56b85d26a..79512bc2a 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -57,6 +57,15 @@ config WESTON_FBDEV_COMPOSITOR
 	bool
 	prompt "fbdev compositor"
 
+config WESTON_LAUNCH
+	bool
+	prompt "weston-launch support"
+	# needs pam
+	depends on BROKEN
+	help
+	  weston-launch is a setuid-root program which does privileged
+	  operations on Weston's behalf
+
 config WESTON_SYSTEMD
 	bool
 	default INITMETHOD_SYSTEMD
diff --git a/rules/weston.make b/rules/weston.make
index 61cb6b072..dd942b0bb 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -59,7 +59,7 @@ WESTON_CONF_OPT		:= \
 	--disable-simple-dmabuf-v4l-client \
 	--enable-clients \
 	--enable-resize-optimization \
-	--disable-weston-launch \
+	--$(call ptx/endis, PTXCONF_WESTON_LAUNCH)-weston-launch \
 	--enable-fullscreen-shell \
 	--disable-colord \
 	--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-dbus \
@@ -90,6 +90,9 @@ $(STATEDIR)/weston.targetinstall:
 
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston)
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-info)
+ifdef PTXCONF_WESTON_LAUNCH
+	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-launch)
+endif
 	@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-terminal)
 
 ifdef PTXCONF_WESTON_WCAP_TOOLS
-- 
2.16.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de