diff options
| author |   Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp> | 2023-05-05 11:03:42 +0900 |
|---|---|---|
| committer | Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp> | 2023-05-09 08:13:10 +0900 |
| commit | 84a2fd1c5363b66ae898c1377db0b5ad17c59fcf (patch) | |
| tree | 2b962aff3552202f5bff620f6ed45c075dcecc30 /meta-agl-ic-container | |
| parent | 839dcdeb3073c094bf171d7107d81955feeb3dea (diff) | |
Reworking environment variable setting for guest
After the drm-lease-manager update, the drm-lease socket
file setting is move on each environment variable setting.
On the other hand, previous setting was not remove from
system.conf for each guest.
This patch remove drm-lease-manager and qt environment
variable setting from system.conf for each guest.
Bug-AGL: SPEC-4777
Change-Id: I972ee51f593ab305e0ffa548083cff11cf0014d5
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Diffstat (limited to 'meta-agl-ic-container')
11 files changed, 15 insertions, 29 deletions
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/system.conf.agl-flutter-ivi-demo.in b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/system.conf.agl-flutter-ivi-demo.in index 876597f5..7605d25f 100644 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/system.conf.agl-flutter-ivi-demo.in +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/system.conf.agl-flutter-ivi-demo.in @@ -1,4 +1,2 @@ [Manager] -DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager -DefaultEnvironment = DRM_LEASE_DEVICE=@DRM_LEASE_DEVICE@ DefaultEnvironment = PIPEWIRE_RUNTIME_DIR=/var diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in index 876597f5..7605d25f 100644 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in @@ -1,4 +1,2 @@ [Manager] -DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager -DefaultEnvironment = DRM_LEASE_DEVICE=@DRM_LEASE_DEVICE@ DefaultEnvironment = PIPEWIRE_RUNTIME_DIR=/var diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/system.conf.agl-momi-ivi-demo.in b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/system.conf.agl-momi-ivi-demo.in index 876597f5..7605d25f 100644 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/system.conf.agl-momi-ivi-demo.in +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/system.conf.agl-momi-ivi-demo.in @@ -1,4 +1,2 @@ [Manager] -DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager -DefaultEnvironment = DRM_LEASE_DEVICE=@DRM_LEASE_DEVICE@ DefaultEnvironment = PIPEWIRE_RUNTIME_DIR=/var diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/system.conf.agl-qt-ivi-demo.in b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/system.conf.agl-qt-ivi-demo.in index 876597f5..7605d25f 100644 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/system.conf.agl-qt-ivi-demo.in +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/system.conf.agl-qt-ivi-demo.in @@ -1,4 +1,2 @@ [Manager] -DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager -DefaultEnvironment = DRM_LEASE_DEVICE=@DRM_LEASE_DEVICE@ DefaultEnvironment = PIPEWIRE_RUNTIME_DIR=/var diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/system.conf.cluster-demo.in b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/system.conf.cluster-demo.in index 29a49b6c..f496c589 100644 --- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/system.conf.cluster-demo.in +++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/system.conf.cluster-demo.in @@ -1,8 +1,2 @@ [Manager] -DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager -DefaultEnvironment = DRM_LEASE_DEVICE=@DRM_LEASE_DEVICE@ -DefaultEnvironment = QT_QPA_PLATFORM=wayland -DefaultEnvironment = QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ -DefaultEnvironment = QML_IMPORT_PATH=/usr/lib/qml/ -DefaultEnvironment = QML2_IMPORT_PATH=/usr/lib/qml/ -DefaultEnvironment = QT_WAYLAND_SHELL_INTEGRATION=xdg-shell +#DefaultEnvironment = diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/system.conf.cluster-demo.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/system.conf.cluster-demo.in index 29a49b6c..f496c589 100644 --- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/system.conf.cluster-demo.in +++ b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-cluster-demo/system.conf.cluster-demo.in @@ -1,8 +1,2 @@ [Manager] -DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager -DefaultEnvironment = DRM_LEASE_DEVICE=@DRM_LEASE_DEVICE@ -DefaultEnvironment = QT_QPA_PLATFORM=wayland -DefaultEnvironment = QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ -DefaultEnvironment = QML_IMPORT_PATH=/usr/lib/qml/ -DefaultEnvironment = QML2_IMPORT_PATH=/usr/lib/qml/ -DefaultEnvironment = QT_WAYLAND_SHELL_INTEGRATION=xdg-shell +#DefaultEnvironment = diff --git a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/system.conf.ivi-demo.in b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/system.conf.ivi-demo.in index de7c6cdd..7605d25f 100644 --- a/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/system.conf.ivi-demo.in +++ b/meta-agl-ic-container/recipes-container/lxc-config/lxc-config-ivi-demo/system.conf.ivi-demo.in @@ -1,9 +1,2 @@ [Manager] -DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager -DefaultEnvironment = DRM_LEASE_DEVICE=@DRM_LEASE_DEVICE@ -DefaultEnvironment = QT_QPA_PLATFORM=wayland -DefaultEnvironment = QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ -DefaultEnvironment = QML_IMPORT_PATH=/usr/lib/qml/ -DefaultEnvironment = QML2_IMPORT_PATH=/usr/lib/qml/ -DefaultEnvironment = QT_WAYLAND_SHELL_INTEGRATION=xdg-shell DefaultEnvironment = PIPEWIRE_RUNTIME_DIR=/var diff --git a/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster b/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster index ff5166d0..53a662be 100644 --- a/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster +++ b/meta-agl-ic-container/recipes-demo/cluster-refgui/cluster-refgui/cluster @@ -1,5 +1,9 @@ XDG_RUNTIME_DIR=/run/user/0 QT_QPA_PLATFORM=wayland-egl +QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ QT_WAYLAND_DISABLE_WINDOWDECORATION=1 QT_QPA_FONTDIR=/usr/share/fonts/truetype +QT_WAYLAND_SHELL_INTEGRATION=xdg-shell +QML_IMPORT_PATH=/usr/lib/qml/ +QML2_IMPORT_PATH=/usr/lib/qml/ WAYLAND_DISPLAY=wayland-1 diff --git a/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi b/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi index bd017dc9..a683c9d5 100644 --- a/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi +++ b/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi @@ -1,7 +1,10 @@ XDG_RUNTIME_DIR=/run/user/0 QT_QPA_PLATFORM=wayland-egl +QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ QT_WAYLAND_DISABLE_WINDOWDECORATION=1 QT_QPA_FONTDIR=/usr/share/fonts/truetype QT_IVI_SURFACE_ID=2010 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell +QML_IMPORT_PATH=/usr/lib/qml/ +QML2_IMPORT_PATH=/usr/lib/qml/ WAYLAND_DISPLAY=wayland-1 diff --git a/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay b/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay index be5a97a1..62c21af9 100644 --- a/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay +++ b/meta-agl-ic-container/recipes-demo/momiplay/momiplay/momiplay @@ -1,8 +1,11 @@ XDG_RUNTIME_DIR=/run/user/0 QT_QPA_PLATFORM=wayland-egl +QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ QT_WAYLAND_DISABLE_WINDOWDECORATION=1 QT_QPA_FONTDIR=/usr/share/fonts/truetype QT_IVI_SURFACE_ID=2011 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell +QML_IMPORT_PATH=/usr/lib/qml/ +QML2_IMPORT_PATH=/usr/lib/qml/ WAYLAND_DISPLAY=wayland-1 HOME=/home/root diff --git a/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen b/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen index 2c0e461c..d10b9da4 100644 --- a/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen +++ b/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen/momiscreen @@ -1,8 +1,11 @@ XDG_RUNTIME_DIR=/run/user/0 QT_QPA_PLATFORM=wayland-egl +QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ QT_WAYLAND_DISABLE_WINDOWDECORATION=1 QT_QPA_FONTDIR=/usr/share/fonts/truetype QT_IVI_SURFACE_ID=2000 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell +QML_IMPORT_PATH=/usr/lib/qml/ +QML2_IMPORT_PATH=/usr/lib/qml/ WAYLAND_DISPLAY=wayland-1 HOME=/home/root |