Change weston setting to connect to the drm-lease-manager.

Previously, weston.service is using environment specific setting,
it propagated from bind mounted host side config file.
.
This patch remove this propagation.  After this patch,
these setting bring to lxc config files.

Bug-AGL: SPEC-4370

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

diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in
index 1a5b78e..523b527 100644 (file)
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in
+++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in
@@ -8,7 +8,7 @@ lxc.mount.entry = /sys/kernel/security sys/kernel/security none ro,bind,optional
 lxc.cgroup.devices.allow = c 226:* rwm
 lxc.mount.entry = /dev/dri dev/dri none bind,optional,create=dir
 
-lxc.mount.entry = /run/drm-lease-manager/@DRM_LEASE_DEVICE@ var/display/drm-lease-manager/@DRM_LEASE_DEVICE@ none bind,create=file
+lxc.mount.entry = /run/drm-lease-manager/lease-cluster var/display/drm-lease-manager/lease none bind,create=file
 
 lxc.cgroup.devices.allow = c 10:* rwm
 lxc.mount.entry = /dev/pvr_sync dev/pvr_sync none bind,optional,create=file

diff --git a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in
index 13216a9..536f24d 100644 (file)
--- a/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in
+++ b/meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in
@@ -10,7 +10,7 @@ lxc.mount.entry = /run/udev/data run/udev/data none ro,bind,optional,create=dir
 lxc.cgroup.devices.allow = c 226:* rwm
 lxc.mount.entry = /dev/dri dev/dri none bind,optional,create=dir
 
-lxc.mount.entry = /run/drm-lease-manager/@DRM_LEASE_DEVICE@ var/display/drm-lease-manager/@DRM_LEASE_DEVICE@ none bind,create=file
+lxc.mount.entry = /run/drm-lease-manager/lease-ivi var/display/drm-lease-manager/lease none bind,create=file
 
 lxc.cgroup.devices.allow = c 13:* rwm
 lxc.mount.entry = /dev/input dev/input none bind,optional,create=dir

diff --git a/meta-agl-lxc/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in
index c2bf91b..a87322b 100644 (file)
--- a/meta-agl-lxc/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in
+++ b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-cluster-demo/mount.in
@@ -8,7 +8,7 @@ lxc.mount.entry = /sys/kernel/security sys/kernel/security none ro,bind,optional
 lxc.cgroup.devices.allow = c 226:* rwm
 lxc.mount.entry = /dev/dri dev/dri none bind,optional,create=dir
 
-lxc.mount.entry = /run/drm-lease-manager/@DRM_LEASE_DEVICE@ var/display/drm-lease-manager/@DRM_LEASE_DEVICE@ none bind,create=file
+lxc.mount.entry = /run/drm-lease-manager/lease-cluster var/display/drm-lease-manager/lease none bind,create=file
 
 lxc.mount.entry = /run/pipewire/icipc-0 var/icipc-0 none bind,optional,create=file
 

diff --git a/meta-agl-lxc/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in
index 7ae9c45..83362dd 100644 (file)
--- a/meta-agl-lxc/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in
+++ b/meta-agl-lxc/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in
@@ -10,7 +10,7 @@ lxc.mount.entry = /run/udev/data run/udev/data none ro,bind,optional,create=dir
 lxc.cgroup.devices.allow = c 226:* rwm
 lxc.mount.entry = /dev/dri dev/dri none bind,optional,create=dir
 
-lxc.mount.entry = /run/drm-lease-manager/@DRM_LEASE_DEVICE@ var/display/drm-lease-manager/@DRM_LEASE_DEVICE@ none bind,create=file
+lxc.mount.entry = /run/drm-lease-manager/lease-ivi var/display/drm-lease-manager/lease none bind,create=file
 
 lxc.cgroup.devices.allow = c 13:* rwm
 lxc.mount.entry = /dev/input dev/input none bind,optional,create=dir

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 d6b1a19..9ff1be5 100644 (file)
--- 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 +1,3 @@
-XDG_RUNTIME_DIR=/run/user/0\r
+XDG_RUNTIME_DIR=/run/user/0
+DLM_RUNTIME_PATH=/var/display/drm-lease-manager
+DRM_LEASE_DEVICE=lease