diff options
| author |   Stephen Lawrence <stephen.lawrence@renesas.com> | 2017-07-31 18:25:14 +0100 |
|---|---|---|
| committer |   Ronan Le Martret <ronan.lemartret@iot.bzh> | 2017-09-15 10:20:15 +0200 |
| commit | 219789c77e05477bc75c0c6de1d019fd6787b2d4 (patch) | |
| tree | 83267fede9fbd69594c896873396c3eb109bc147 | |
| parent | c936e8b2f6f8f4b8feb2ada11a272a6dce7b29f2 (diff) | |
weston-init: adapt to poky meta weston-init.
For pyro we are using the poky meta weston. Adapt the bbappend accordingly.
Merge poky meta weston.service.
Signed-off-by: Stephen Lawrence <stephen.lawrence@renesas.com>
| -rw-r--r-- | meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend | 18 | ||||
| -rw-r--r-- | meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston.service | 7 |
2 files changed, 6 insertions, 19 deletions
diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend b/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend index 07dab05..2886bae 100644 --- a/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend @@ -1,30 +1,16 @@ require include/gles-control.inc -require include/multimedia-control.inc FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI = " \ - file://init \ + +SRC_URI += " \ file://weston.service \ - file://weston-start \ " do_install_append() { - # Install weston-start script - install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start - sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start - sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start - if [ "X${USE_GLES}" = "X1" ]; then sed -e "/RequiresMountsFor=\/run/a Wants=rc.pvr.service" \ -e "/RequiresMountsFor=\/run/a After=rc.pvr.service" \ -e "s/\$OPTARGS/--idle-time=0 \$OPTARGS/" \ -i ${D}/${systemd_system_unitdir}/weston.service fi - - if [ "X${USE_MULTIMEDIA}" = "X1" ]; then - if [ "X${USE_V4L2_RENDERER}" = "X1" ]; then - sed -e "s/\$OPTARGS/--use-v4l2 \$OPTARGS/" \ - -i ${D}/${systemd_system_unitdir}/weston.service - fi - fi } diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston.service b/meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston.service index 295ffd7..79afa67 100644 --- a/meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston.service +++ b/meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston.service @@ -1,11 +1,12 @@ [Unit] -Description=Weston Wayland compositor +Description=Weston Wayland Compositor +RequiresMountsFor=/run After=dbus.service rc.pvr.service [Service] +User=root +EnvironmentFile=-/etc/default/weston ExecStart=/usr/bin/weston-launch -u root -- $OPTARGS -ExecStop=/usr/bin/killall -s KILL weston -Type=simple [Install] WantedBy=multi-user.target |