From e493fb8edc4d3acb1d3ff7822ef5af3f0ca794df Mon Sep 17 00:00:00 2001
From: Stephen Lawrence <stephen.lawrence@renesas.com>
Date: Mon, 24 Jul 2017 17:54:57 +0100
Subject: wayland: use poky meta wayland/weston

Support for Weston 2.0 will appear in the Renesas Weston
implementation in an upcoming Yocto BSP release. Until it
appears use the upstream reference implementation in Poky
Meta, with "GPU only" h/w acceleration.

Signed-off-by: Stephen Lawrence <stephen.lawrence@renesas.com>
---
 .../recipes-graphics/wayland/weston-init/init      | 53 ----------------
 .../wayland/weston-init/weston-start               | 74 ----------------------
 2 files changed, 127 deletions(-)
 delete mode 100644 meta-rcar-gen3/recipes-graphics/wayland/weston-init/init
 delete mode 100755 meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston-start

(limited to 'meta-rcar-gen3/recipes-graphics/wayland/weston-init')

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
-- 
cgit 1.2.3-korg