summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-02-26 12:03:53 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-02-26 12:03:53 (GMT)
commitff63a17315faa341261d696a38c39493e8f4ec64 (patch)
treec5c7176a3d210cb45130db28c28220744a1f9be3
parent425df9dddd7c8655f4545e0c4a183a704e7a8f48 (diff)
downloaddefinitions-baserock/pedroalvarez/wayland1.10-hmi-fixes.tar.gz
Change-Id: I6f0901941eeb4821ddf004f1f5d066c2ff866170
-rw-r--r--strata/weston-genivi/weston.morph26
1 files changed, 21 insertions, 5 deletions
diff --git a/strata/weston-genivi/weston.morph b/strata/weston-genivi/weston.morph
index af6a46f..ff1d6a9 100644
--- a/strata/weston-genivi/weston.morph
+++ b/strata/weston-genivi/weston.morph
@@ -14,7 +14,7 @@ post-install-commands:
- install -d "$DESTDIR/usr/share/weston"
- install -m 0644 data/*.png "$DESTDIR/usr/share/weston/"
- cp ivi-shell/weston.ini ivi-shell/ivi-shell-weston.ini
-- cp ivi-shell/weston.ini ivi-shell/gdp-weston.ini
+
# Generate ivi-shell-weston config used for GENIVI Baseline
- sed -i 's,/weston.build/data/,/usr/share/weston/,g' ivi-shell/ivi-shell-weston.ini
- sed -i 's,/weston.build/clients/,/usr/bin/,g' ivi-shell/ivi-shell-weston.ini
@@ -59,12 +59,28 @@ post-install-commands:
path=/usr/bin/EGLWLMockNavigation
EOF
-- install -d "$DESTDIR/usr/share/doc/weston"
-- install -m 0644 ivi-shell/ivi-shell-weston.ini "$DESTDIR/usr/share/doc/weston/ivi-shell-weston.ini"
-
# Generate gdp-weston config used for GENIVI Demo Platform
-- sed -i 's/hmi-controller.so/ivi-controller.so/' ivi-shell/gdp-weston.ini
+- |
+ cat <<EOF > ivi-shell/gdp-weston.ini
+ [core]
+ shell=ivi-shell.so
+
+ [ivi-shell]
+ ivi-module=ivi-controller.so
+ ivi-input-module=ivi-input-controller.so
+
+ cursor-theme=default
+ cursor-size=32
+
+ base-layer-id=1000
+ workspace-background-layer-id=2000
+ workspace-layer-id=3000
+ application-layer-id=4000
+
+ transition-duration=300
+ EOF
# Install both config files to decide later which one to use
+- install -d "$DESTDIR/usr/share/doc/weston"
- install -m 0644 ivi-shell/ivi-shell-weston.ini "$DESTDIR/usr/share/doc/weston/ivi-shell-weston.ini"
- install -m 0644 ivi-shell/gdp-weston.ini "$DESTDIR/usr/share/doc/weston/gdp-weston.ini"