summaryrefslogtreecommitdiffstats
path: root/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend
diff options
context:
space:
mode:
authorRonan Le Martret <ronan.lemartret@iot.bzh>2017-04-12 14:08:35 +0200
committerRonan Le Martret <ronan.lemartret@iot.bzh>2017-05-03 11:10:04 +0200
commite935761b9d53675ca9d6adc68f185d0f400efab4 (patch)
tree52020aeadf1c081e5993c3d0c58795ef517fc689 /meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend
parentcf4f58f3792ad17538f8ee93fdf34c4fb7f29bd2 (diff)
[COMMUNITY] remove fix on weston-init
* remove backport of init, weston-start, weston.service and use upstream recipes file instead. * it will be easier to maintain and integrate the BSP. Bug-AGL: SPEC-452 Change-Id: I2bec631391c7f70916f50553fa33550f09cbf921 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Diffstat (limited to 'meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend')
-rw-r--r--meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend18
1 files changed, 5 insertions, 13 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..99cc3ac 100644
--- a/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend
@@ -1,23 +1,15 @@
require include/gles-control.inc
require include/multimedia-control.inc
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI = " \
- file://init \
- file://weston.service \
- file://weston-start \
-"
+WESTONARGS ??= "--idle-time=0"
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
+ sed -e 's,launcher="weston-launch.*--",launcher="weston-launch -u root --",g' \
+ -e 's,exec openvt $openvt_args --,exec ,g' \
+ -i ${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/" \
+ sed -e "s/\$OPTARGS/${WESTONARGS} \$OPTARGS/" \
-i ${D}/${systemd_system_unitdir}/weston.service
fi