diff options
| author |   Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp> | 2022-05-12 08:16:40 +0900 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2022-06-09 11:02:47 +0000 |
| commit | 3c5de139ba4df2bb06a5ea7573460711cc334b66 (patch) | |
| tree | e37689bdaae49dc0bed4171fdd7222c65cc86a7b /meta-agl-lxc | |
| parent | 9aa6af7aa4ff5761277fd04fa90be5d5962415e5 (diff) | |
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
Diffstat (limited to 'meta-agl-lxc')
5 files changed, 7 insertions, 5 deletions
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 1a5b78e6..523b5272 100644 --- 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 13216a9e..536f24db 100644 --- 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 c2bf91b4..a87322ba 100644 --- 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 7ae9c458..83362ddf 100644 --- 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 d6b1a197..9ff1be5e 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 +1,3 @@ -XDG_RUNTIME_DIR=/run/user/0
+XDG_RUNTIME_DIR=/run/user/0 +DLM_RUNTIME_PATH=/var/display/drm-lease-manager +DRM_LEASE_DEVICE=lease |