On Tue, 10 Apr 2018 16:31:53 +0200, Michael Olbrich wrote: > On Tue, Apr 10, 2018 at 11:06:47AM +0200, Michael Tretter wrote: > > Signed-off-by: Michael Tretter <m.tret...@pengutronix.de> > > --- > > rules/weston.in | 13 +++++++++++++ > > rules/weston.make | 7 +++++-- > > 2 files changed, 18 insertions(+), 2 deletions(-) > > > > diff --git a/rules/weston.in b/rules/weston.in > > index a1755f510..49fc90e55 100644 > > --- a/rules/weston.in > > +++ b/rules/weston.in > > @@ -27,6 +27,7 @@ menuconfig WESTON > > select XORG_LIB_XCURSOR if WESTON_XWAYLAND > > select XORG_SERVER if WESTON_XWAYLAND && RUNTIME > > select XORG_SERVER_XWAYLAND if WESTON_XWAYLAND && RUNTIME > > + select DBUS if WESTON_DBUS > > select SYSTEMD if WESTON_SYSTEMD > > select SYSTEMD_LOGIND if WESTON_SYSTEMD_LOGIND > > prompt "weston " > > @@ -56,6 +57,17 @@ config WESTON_FBDEV_COMPOSITOR > > bool > > prompt "fbdev compositor" > > > > +config WESTON_LAUNCH > > + bool > > + prompt "weston-launch support" > > + help > > + weston-launch is a setuid-root program which does privileged > > + operations on Weston's behalf > > + > > +config WESTON_DBUS > > + bool > > + prompt "dbus support" > > Is this useful without logind? If not, then just use that option to enable > D-Bus.
Only logind uses D-Bus. > > > + > > config WESTON_SYSTEMD > > bool > > depends on INITMETHOD_SYSTEMD > > @@ -65,6 +77,7 @@ config WESTON_SYSTEMD > > config WESTON_SYSTEMD_LOGIND > > bool > > depends on WESTON_SYSTEMD > > + depends on WESTON_DBUS > > Is this dependency new in 4.0? If yes, then it should be part of the > version bump. The logind backend depends on D-Bus support since its addition in 1.4.0, but since 4.0 configure actually fails if the dependency is not fulfilled. Should be part of the version bump anyway. Michael > > Michael > > > prompt "logind support" > > > > config WESTON_WCAP_TOOLS > > diff --git a/rules/weston.make b/rules/weston.make > > index 06175a304..30249e9f1 100644 > > --- a/rules/weston.make > > +++ b/rules/weston.make > > @@ -61,10 +61,10 @@ 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 \ > > - --disable-dbus \ > > + --$(call ptx/endis, PTXCONF_WESTON_DBUS)-dbus \ > > --$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-systemd-login \ > > --disable-junit-xml \ > > --disable-ivi-shell \ > > @@ -92,6 +92,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 > _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de
