summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>2022-02-12 14:57:42 +0900
committerNaoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>2022-02-12 15:07:11 +0900
commit878e3ffc85585b83fe9db29086dd125b82162256 (patch)
tree858c6c4d93f65a85f2a1eb782b1982daba0dd81d
parentbbdf5e3bdb72bfe5516cec63573b117d97ed6bc6 (diff)
Input device support in ivi-demo guest
When weston is running in guset, it can't find input device. It cause by udev data dependency for libinput. IC EG member investigate some input support plan now, but it require to long way. This patch is workaround for next release to support input device in ivi-demo guest. That based on CES2020 demo method. Bug-AGL: SPEC-4136 Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp> Change-Id: I622a53add8441374d3c3be6e905f46ee56d51dad
-rw-r--r--meta-agl-lxc/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in5
-rw-r--r--meta-agl-lxc/recipes-container/lxc-config/lxc-config-ivi-demo/mount.in4
-rw-r--r--meta-agl-lxc/recipes-core/base-files/base-files/fstab3
-rw-r--r--meta-agl-lxc/recipes-core/base-files/base-files_%.bbappend2
4 files changed, 14 insertions, 0 deletions
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 1bd40a3f..13216a9e 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
@@ -4,12 +4,17 @@ lxc.mount.entry = /var/lib/lxc/ivi-demo/system.conf etc/systemd/system.conf.d/10
lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed
lxc.mount.entry = shm /dev/shm tmpfs defaults 0 0
lxc.mount.entry = /sys/kernel/security sys/kernel/security none ro,bind,optional 0 0
+lxc.mount.entry = tmpfs run tmpfs defaults
+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.cgroup.devices.allow = c 13:* rwm
+lxc.mount.entry = /dev/input dev/input none bind,optional,create=dir
+
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/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 781cdb7b..7ae9c458 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
@@ -4,9 +4,13 @@ lxc.mount.entry = /var/lib/lxc/ivi-demo/system.conf etc/systemd/system.conf.d/10
lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed
lxc.mount.entry = shm /dev/shm tmpfs defaults 0 0
lxc.mount.entry = /sys/kernel/security sys/kernel/security none ro,bind,optional 0 0
+lxc.mount.entry = tmpfs run tmpfs defaults
+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.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-core/base-files/base-files/fstab b/meta-agl-lxc/recipes-core/base-files/base-files/fstab
new file mode 100644
index 00000000..a27f8cd6
--- /dev/null
+++ b/meta-agl-lxc/recipes-core/base-files/base-files/fstab
@@ -0,0 +1,3 @@
+# Reference fstab for container guest
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+tmpfs /var/volatile tmpfs defaults 0 0
diff --git a/meta-agl-lxc/recipes-core/base-files/base-files_%.bbappend b/meta-agl-lxc/recipes-core/base-files/base-files_%.bbappend
new file mode 100644
index 00000000..2df9447b
--- /dev/null
+++ b/meta-agl-lxc/recipes-core/base-files/base-files_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS:prepend:aglcontainerguest := "${THISDIR}/base-files:"
+