summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-12-01 14:44:30 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-12-05 20:56:02 +0000
commitd3f1e0980eb1cd6b50c6d0af8fb6f80391347e2d (patch)
tree00a1414c0d1fe955622b46022244c940f32fe17b
parent4fd1d739dea480a0f70d2db07ace852464284c96 (diff)
XDG-IVI: Load by default id-agent in weston
Bug-AGL: SPEC-1096 Change-Id: Iecfede123503410e1fdfa509a724cbcaf643d92b Signed-off-by: Romain Forlot <romain.forlot@iot.bzh> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/12273 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> Reviewed-by: Thomas Rini <trini@konsulko.com> Reviewed-by: Nobuhiko Tanibata <nobuhiko_tanibata@denso.co.jp> Reviewed-by: Stéphane Desneux <stephane.desneux@iot.bzh> Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
-rw-r--r--meta-agl/recipes-graphics/wayland/weston-ini-conf.bb1
-rw-r--r--meta-agl/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg2
-rw-r--r--meta-agl/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg1
3 files changed, 4 insertions, 0 deletions
diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb b/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb
index 9ba49bf2e..02a6ea7e8 100644
--- a/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb
+++ b/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb
@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
SRC_URI = "file://core.cfg \
file://ivishell.cfg \
+ file://id-agent.cfg \
file://shell.cfg \
file://hdmi-a-1-270.cfg \
"
diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg b/meta-agl/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg
new file mode 100644
index 000000000..578d8c408
--- /dev/null
+++ b/meta-agl/recipes-graphics/wayland/weston-ini-conf/id-agent.cfg
@@ -0,0 +1,2 @@
+[id-agent]
+default-id-offset=10
diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg b/meta-agl/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg
index 1c4304cdd..f0548f291 100644
--- a/meta-agl/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg
+++ b/meta-agl/recipes-graphics/wayland/weston-ini-conf/ivishell.cfg
@@ -1,3 +1,4 @@
[ivi-shell]
ivi-input-module=ivi-input-controller.so
ivi-module=ivi-controller.so
+id-agent-module=simple-id-agent.so