summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend18
-rw-r--r--meta-rcar-gen3/recipes-graphics/wayland/weston-init/init53
-rwxr-xr-xmeta-rcar-gen3/recipes-graphics/wayland/weston-init/weston-start74
-rw-r--r--meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston.service11
4 files changed, 5 insertions, 151 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
diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston-init/init b/meta-rcar-gen3/recipes-graphics/wayland/weston-init/init
deleted file mode 100644
index d3e87c6..0000000
--- a/meta-rcar-gen3/recipes-graphics/wayland/weston-init/init
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-#
-### BEGIN INIT INFO
-# Provides: weston
-# Required-Start: $local_fs $remote_fs
-# Required-Stop: $local_fs $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-### END INIT INFO
-
-if test -e /etc/default/weston ; then
- . /etc/default/weston
-fi
-
-killproc() {
- pid=`/bin/pidof $1`
- [ "$pid" != "" ] && kill $pid
-}
-
-read CMDLINE < /proc/cmdline
-for x in $CMDLINE; do
- case $x in
- weston=false)
- echo "Weston disabled"
- exit 0;
- ;;
- esac
-done
-
-case "$1" in
- start)
- . /etc/profile
-
- weston-start -- $OPTARGS
- ;;
-
- stop)
- echo "Stopping Weston"
- killproc weston
- ;;
-
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
-
- *)
- echo "usage: $0 { start | stop | restart }"
- ;;
-esac
-
-exit 0
diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston-start b/meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston-start
deleted file mode 100755
index 4657513..0000000
--- a/meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston-start
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2016 O.S. Systems Software LTDA.
-# Copyright (C) 2016 Freescale Semiconductor
-
-export PATH="/sbin:/usr/sbin:/bin:/usr/bin"
-
-usage() {
- cat <<EOF
- $0 <openvt arguments> -- <weston options>
-EOF
-}
-
-## Module support
-modules_dir=@DATADIR@/weston-start
-
-# Add weston extra argument
-add_weston_argument() {
- weston_args="$weston_args $1"
-}
-
-# Add openvt extra argument
-add_openvt_argument() {
- openvt_args="$openvt_args $1"
-}
-
-if test $# -lt 2; then
- usage
- exit 1
-fi
-
-if [ -n "$WAYLAND_DISPLAY" ]; then
- echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet."
- exit 1
-fi
-if [ -n "$DISPLAY" ]; then
- launcher="weston"
-else
- launcher="weston-launch -u root --"
-fi
-
-openvt_args="-s"
-while [ -n "$1" ]; do
- if [ "$1" = "--" ]; then
- shift
- break
- fi
- openvt_args="$openvt_args $1"
- shift
-done
-
-weston_args=$*
-
-# Load and run modules
-if [ -d "$modules_dir" ]; then
- for m in "$modules_dir"/*; do
- # Skip backup files
- if [ "`echo $m | sed -e 's/\~$//'`" != "$m" ]; then
- continue
- fi
-
- # process module
- . $m
- done
-fi
-
-if test -z "$XDG_RUNTIME_DIR"; then
- export XDG_RUNTIME_DIR=/run/user/`id -u`
- if ! test -d "$XDG_RUNTIME_DIR"; then
- mkdir --parents $XDG_RUNTIME_DIR
- chmod 0700 $XDG_RUNTIME_DIR
- fi
-fi
-
-exec openvt $openvt_args -- $launcher $weston_args --log=@LOCALSTATEDIR@/log/weston.log
diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston.service b/meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston.service
deleted file mode 100644
index 37b1816..0000000
--- a/meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Weston Wayland compositor
-After=dbus.service
-
-[Service]
-ExecStart=/usr/bin/weston-launch -u root -- $OPTARGS
-ExecStop=/usr/bin/killall -s KILL weston
-Type=simple
-
-[Install]
-WantedBy=multi-user.target