From 8791f78b8c990e53704b013117f6c53570119ce5 Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Sun, 17 Nov 2019 09:25:11 -0600
Subject: [PATCH] weston: Move xwayland config to weston.ini

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-graphics/wayland/weston-init.bbappend | 19 +++++++++----------
 .../wayland/weston-init/imxdrm/weston.config  |  2 --
 .../wayland/weston-init/mx6sl/weston.config   |  2 --
 .../wayland/weston-init/mx8mm/weston.config   |  2 --
 .../wayland/weston-init/weston.config         |  2 --
 5 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 recipes-graphics/wayland/weston-init/imxdrm/weston.config
 delete mode 100644 recipes-graphics/wayland/weston-init/mx8mm/weston.config
 delete mode 100644 recipes-graphics/wayland/weston-init/weston.config

diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend
index ce6c4c7c..e5b90a57 100644
--- a/recipes-graphics/wayland/weston-init.bbappend
+++ b/recipes-graphics/wayland/weston-init.bbappend
@@ -6,14 +6,15 @@ IMX_REQUIRED_DISTRO_FEATURES_REMOVE_imxgpu2d = "opengl"
 IMX_REQUIRED_DISTRO_FEATURES_REMOVE_imxgpu3d = ""
 REQUIRED_DISTRO_FEATURES_remove = "${IMX_REQUIRED_DISTRO_FEATURES_REMOVE}"
 
-SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd wayland x11', 'file://weston.config', '', d)}"
-
-HAS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"
-HAS_XWAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland x11', 'true', 'false', d)}"
+SRC_URI_append_mx6sl = "file://weston.config"
 
 # To customize weston.ini, start by setting the desired assignment in weston.ini,
-# commented out. Then add the assignment to INI_UNCOMMENT_ASSIGNMENTS.
-INI_UNCOMMENT_ASSIGNMENTS = ""
+# commented out. For example:
+#     #xwayland=true
+# Then add the assignment to INI_UNCOMMENT_ASSIGNMENTS.
+INI_UNCOMMENT_ASSIGNMENTS = " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland=true', '', d)} \
+"
 INI_UNCOMMENT_ASSIGNMENTS_append_mx7ulp = " \
     use-g2d=1 \
 "
@@ -34,10 +35,8 @@ uncomment() {
 }
 
 do_install_append() {
-    if ${HAS_SYSTEMD}; then
-        if ${HAS_XWAYLAND}; then
-            install -Dm0755 ${WORKDIR}/weston.config ${D}${sysconfdir}/default/weston
-        fi
+    if [ -f "${WORKDIR}/weston.config" ]; then
+        install -Dm0755 ${WORKDIR}/weston.config ${D}${sysconfdir}/default/weston
     fi
     for assignment in ${INI_UNCOMMENT_ASSIGNMENTS}; do
         uncomment "$assignment" ${D}${sysconfdir}/xdg/weston/weston.ini
diff --git a/recipes-graphics/wayland/weston-init/imxdrm/weston.config b/recipes-graphics/wayland/weston-init/imxdrm/weston.config
deleted file mode 100644
index 7c92cf11..00000000
--- a/recipes-graphics/wayland/weston-init/imxdrm/weston.config
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-OPTARGS="--xwayland"
diff --git a/recipes-graphics/wayland/weston-init/mx6sl/weston.config b/recipes-graphics/wayland/weston-init/mx6sl/weston.config
index 89269d79..6456cd24 100755
--- a/recipes-graphics/wayland/weston-init/mx6sl/weston.config
+++ b/recipes-graphics/wayland/weston-init/mx6sl/weston.config
@@ -1,3 +1 @@
-#!/bin/sh
-OPTARGS="--xwayland"
 FB_MULTI_BUFFER=1
diff --git a/recipes-graphics/wayland/weston-init/mx8mm/weston.config b/recipes-graphics/wayland/weston-init/mx8mm/weston.config
deleted file mode 100644
index 7c92cf11..00000000
--- a/recipes-graphics/wayland/weston-init/mx8mm/weston.config
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-OPTARGS="--xwayland"
diff --git a/recipes-graphics/wayland/weston-init/weston.config b/recipes-graphics/wayland/weston-init/weston.config
deleted file mode 100644
index 7c92cf11..00000000
--- a/recipes-graphics/wayland/weston-init/weston.config
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-OPTARGS="--xwayland"
-- 
2.40.1