summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrigory Kletsko <grigory.kletsko@cogentembedded.com>2017-06-04 00:55:53 +0300
committerGrigory Kletsko <grigory.kletsko@cogentembedded.com>2017-06-04 00:55:53 +0300
commit2003c197a2b89fc96bfd5cdbeb15d04de8c3fd1d (patch)
tree9c424fa8e5b4cee21044c31181fa9cc54e1ed2e5
parentbafd9ba4cb83195338075a76306aaecfc1ddd1e3 (diff)
[weston] Update weston-init script, add profile.d script
-rw-r--r--meta-rcar-gen3-adas/recipes-graphics/wayland/weston-init.bbappend24
-rw-r--r--meta-rcar-gen3-adas/recipes-graphics/wayland/weston-init/weston.service12
2 files changed, 8 insertions, 28 deletions
diff --git a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-init.bbappend b/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-init.bbappend
index 708990e..95299da 100644
--- a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-init.bbappend
@@ -1,21 +1,13 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_append = " \
- file://weston.service \
+SRC_URI = " \
+ file://weston_exp.sh \
"
+# Add Weston configuration script
do_install_append() {
- 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
+ install -d ${D}/etc/profile.d
+ install -m 0755 ${WORKDIR}/weston_exp.sh ${D}/etc/profile.d
}
+FILES_${PN} += " /etc/profile.d/weston_exp.sh \
+"
diff --git a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-init/weston.service b/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-init/weston.service
deleted file mode 100644
index af27f33..0000000
--- a/meta-rcar-gen3-adas/recipes-graphics/wayland/weston-init/weston.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Weston Wayland compositor
-After=dbus.service rc.pvr.service
-
-[Service]
-ExecStart=/usr/bin/weston-launch -u root -- $OPTARGS
-ExecStop=/usr/bin/killall -s KILL weston
-Type=simple
-Restart=always
-
-[Install]
-WantedBy=multi-user.target