Fix wayland socket name

The default socket name was changed to wayland-1 in weston 10.0.
Each wayland client is using wayland-0 that is previous default name.

This patch change wayland socket name using environment variable.

Bug-AGL : SPEC-4394

Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Change-Id: Ia6c8dff50e7979c0f3b809e6df76a57be6dca7df

7 files changed, 14 insertions, 1 deletions

diff --git a/meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui/cluster b/meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui/cluster
new file mode 100644
index 00000000..ff5166d0
--- /dev/null
+++ b/meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui/cluster
@@ -0,0 +1,5 @@
+XDG_RUNTIME_DIR=/run/user/0
+QT_QPA_PLATFORM=wayland-egl
+QT_WAYLAND_DISABLE_WINDOWDECORATION=1
+QT_QPA_FONTDIR=/usr/share/fonts/truetype
+WAYLAND_DISPLAY=wayland-1
diff --git a/meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui/cluster.service b/meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui/cluster.service
index b43c475b..a82c4127 100644
--- a/meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui/cluster.service
+++ b/meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui/cluster.service
@@ -4,7 +4,7 @@ After=multi-user.target weston.service
 Requires=multi-user.target weston.service
 
 [Service]
-Environment=XDG_RUNTIME_DIR=/run/user/0
+EnvironmentFile=/etc/default/cluster
 ExecStart=/opt/apps/cluster
 
 [Install]
diff --git a/meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui_git.bb b/meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui_git.bb
index 7a5b8a78..4327c8de 100644
--- a/meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui_git.bb
+++ b/meta-agl-lxc/recipes-demo/cluster-refgui/cluster-refgui_git.bb
@@ -10,6 +10,7 @@ DEPENDS = " \
 BRANCH = "master"
 SRC_URI = "git://git.automotivelinux.org/src/cluster-refgui;protocol=https;branch=${BRANCH} \
            file://cluster.service \
+           file://cluster \
 "
 SRCREV = "a16c6201be94a57eb8151a91699084d99694877c"
 
@@ -29,6 +30,9 @@ SYSTEMD_SERVICE:${PN} = "cluster.service"
 do_install:append() {
     install -d ${D}${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/cluster.service ${D}${systemd_unitdir}/system/
+    
+    install -m 0755 -d ${D}${sysconfdir}/default/
+    install -m 0755 ${WORKDIR}/cluster ${D}${sysconfdir}/default/
 }
 
 FILES:${PN} += "${APP_DIR}/"
diff --git a/meta-agl-lxc/recipes-demo/mominavi/mominavi/mominavi b/meta-agl-lxc/recipes-demo/mominavi/mominavi/mominavi
index 06d55f3a..bd017dc9 100644
--- a/meta-agl-lxc/recipes-demo/mominavi/mominavi/mominavi
+++ b/meta-agl-lxc/recipes-demo/mominavi/mominavi/mominavi
@@ -4,3 +4,4 @@ QT_WAYLAND_DISABLE_WINDOWDECORATION=1
 QT_QPA_FONTDIR=/usr/share/fonts/truetype
 QT_IVI_SURFACE_ID=2010
 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell
+WAYLAND_DISPLAY=wayland-1
diff --git a/meta-agl-lxc/recipes-demo/momiplay/momiplay/momiplay b/meta-agl-lxc/recipes-demo/momiplay/momiplay/momiplay
index 097ceb73..be5a97a1 100644
--- a/meta-agl-lxc/recipes-demo/momiplay/momiplay/momiplay
+++ b/meta-agl-lxc/recipes-demo/momiplay/momiplay/momiplay
@@ -4,4 +4,5 @@ QT_WAYLAND_DISABLE_WINDOWDECORATION=1
 QT_QPA_FONTDIR=/usr/share/fonts/truetype
 QT_IVI_SURFACE_ID=2011
 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell
+WAYLAND_DISPLAY=wayland-1
 HOME=/home/root
diff --git a/meta-agl-lxc/recipes-demo/momiscreen/momiscreen/momiscreen b/meta-agl-lxc/recipes-demo/momiscreen/momiscreen/momiscreen
index 4af77b8c..2c0e461c 100644
--- a/meta-agl-lxc/recipes-demo/momiscreen/momiscreen/momiscreen
+++ b/meta-agl-lxc/recipes-demo/momiscreen/momiscreen/momiscreen
@@ -4,4 +4,5 @@ QT_WAYLAND_DISABLE_WINDOWDECORATION=1
 QT_QPA_FONTDIR=/usr/share/fonts/truetype
 QT_IVI_SURFACE_ID=2000
 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell
+WAYLAND_DISPLAY=wayland-1
 HOME=/home/root
diff --git a/meta-agl-lxc/recipes-graphics/wayland/weston-init-guest/weston.env b/meta-agl-lxc/recipes-graphics/wayland/weston-init-guest/weston.env
index 9ff1be5e..ed5f2621 100644
--- a/meta-agl-lxc/recipes-graphics/wayland/weston-init-guest/weston.env
+++ b/meta-agl-lxc/recipes-graphics/wayland/weston-init-guest/weston.env
@@ -1,3 +1,4 @@
 XDG_RUNTIME_DIR=/run/user/0
 DLM_RUNTIME_PATH=/var/display/drm-lease-manager
 DRM_LEASE_DEVICE=lease
+WAYLAND_DISPLAY=wayland-1