From 55ac7d9d4689e7400c855c9b580c1705c2af7be8 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 7 May 2022 13:42:04 +0200 Subject: weston-init: import weston.sh from meta-freescale-distro Import the file `profile` and rename it directly to its final name `weston.sh` from meta-freescale-distro. This allows to use it in a Toradex Easy Installer setup and it simplifies the bbappend which does not add the freescale-distro layer. Signed-off-by: Max Krummenacher --- recipes-graphics/wayland/weston-init.bbappend | 8 +++++--- recipes-graphics/wayland/weston-init/weston.sh | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 recipes-graphics/wayland/weston-init/weston.sh (limited to 'recipes-graphics/wayland') diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend index 494db7c..43bc86a 100644 --- a/recipes-graphics/wayland/weston-init.bbappend +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -1,3 +1,7 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://weston.sh" + PACKAGECONFIG:append:upstream:tdx = " no-idle-timeout" PACKAGECONFIG:append:upstream:colibri-imx6ull = " use-pixman" PACKAGECONFIG:append:upstream:colibri-imx6ull-emmc = " use-pixman" @@ -5,9 +9,7 @@ PACKAGECONFIG:append:upstream:colibri-imx7 = " use-pixman" PACKAGECONFIG:append:upstream:colibri-imx7-emmc = " use-pixman" do_install:append:tdx() { - # profile is from meta-freescale-distro layer but only being installed for fsl,fslc distros - # we need install it for Toradex distros here. - install -Dm0755 ${WORKDIR}/profile ${D}${sysconfdir}/profile.d/weston.sh + install -Dm0755 ${WORKDIR}/weston.sh ${D}${sysconfdir}/profile.d/weston.sh # We need run weston systemd service with root user, or else it could not # access input devices and GPU acceleration hardwares diff --git a/recipes-graphics/wayland/weston-init/weston.sh b/recipes-graphics/wayland/weston-init/weston.sh new file mode 100644 index 0000000..89b04ec --- /dev/null +++ b/recipes-graphics/wayland/weston-init/weston.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +# Set WAYLAND_DISPLAY manually. +# It will cause app failures if this variable is not set for ssh login. +if test -z "$WAYLAND_DISPLAY"; then + export WAYLAND_DISPLAY="/run/wayland-0" +fi -- cgit v1.2.3