summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2015-04-21 16:59:58 (GMT)
committerJonathan Maw <jonathan.maw@codethink.co.uk>2015-04-21 16:59:58 (GMT)
commit8633e4d3d92c722ad0334ddfb613f5c127cdca02 (patch)
tree15d12b15b1ac15d8def6012085282ae598ee0b6d
parent2e4e61de6b05f4f26e49f220e1c969ec549d5ce5 (diff)
downloaddefinitions-baserock/jonathanmaw/genivi-demo-jetson.tar.gz
WIP of GENIVI Demo Platform supportbaserock/jonathanmaw/genivi-demo-jetson
-rw-r--r--strata/genivi-demo-platform.morph24
-rw-r--r--strata/genivi-demo-platform/genivi-demo-platform-hmi.morph22
2 files changed, 28 insertions, 18 deletions
diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph
index ef119ef..5ac82bb 100644
--- a/strata/genivi-demo-platform.morph
+++ b/strata/genivi-demo-platform.morph
@@ -50,8 +50,9 @@ chunks:
- name: browser-poc
morph: strata/genivi-demo-platform/browser-poc.morph
repo: upstream:genivi/browser-poc
- ref: baserock/genivi-demo-platform
- unpetrify-ref: master
+# ref: f1d02d11d86d53b96c85a2ea03d7cd4736c1c616
+ ref: baserock/jonathanmaw/genivi-demo-jetson
+ unpetrify-ref: baserock/genivi-demo-platform
build-depends: []
- name: dbus-python
repo: upstream:dbus-python
@@ -86,22 +87,6 @@ chunks:
repo: upstream:navit-svn
ref: 358812af2c27c4abe324beb205e6d156b96fb1ea
unpetrify-ref: master
-#- name: poi-service
-# morph: strata/genivi-demo-platform/poi-service.morph
-# repo: upstream:genivi/poi-service
-# ref: jonathanmaw/genivi-demo-jetson
-# unpetrify-ref: c8bb70af8b6e8fa0dc8530800adbd2b7cbffc293
-# build-depends:
-# - navit
-#- name: fuel-stop-advisor
-# morph: strata/genivi-demo-platform/fuel-stop-advisor.morph
-# repo: upstream:genivi/navigation
-# ref: abfc49ee6c812e65ce12583f318b72165a3e6603
-# unpetrify-ref: master
-# build-depends:
-# - navit
-# - poi-service
-# - automotive-message-broker
- name: genivi-demo-platform-hmi
morph: strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
repo: upstream:genivi/genivi-demo-platform-hmi
@@ -109,3 +94,6 @@ chunks:
unpetrify-ref: 3955d0dd4a544577f812854ef333ddb80dbc177f
build-depends:
- dbus-c++
+- name: hacked-up-qtwayland
+ repo: upstream:qt5/qtwayland
+ ref: baserock/jonathanmaw/genivi-demo-jetson
diff --git a/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph b/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
index 74aef2f..fe583b7 100644
--- a/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
+++ b/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
@@ -2,6 +2,12 @@ name: genivi-demo-platform-hmi
kind: chunk
pre-configure-commands:
- |
+ sed -i 's/sd_journal_print(LOG_DEBUG,/printf("DEBUG: "/' $(find . -name '*.cpp' -o -name '*.h')
+- |
+ sed -i 's/sd_journal_print(LOG_INFO,/printf("INFO: "/' $(find . -name '*.cpp' -o -name '*.h')
+- |
+ sed -i 's/sd_journal_print(LOG_ERR,/printf("ERR: "/' $(find . -name '*.cpp' -o -name '*.h')
+- |
git apply - << "EOF"
diff --git a/configure.ac b/configure.ac
index f0c7ba2..4ff1462 100644
@@ -76,3 +82,19 @@ install-commands:
Environment=LD_PRELOAD=/usr/lib/libEGL.so
ExecStart=/usr/bin/gdp-hmi-panel
EOF
+- |
+ cat >"$DESTDIR/usr/lib/systemd/user/EGLWLMockNavigation.service" <<EOF
+ [Unit]
+ Description=EGL Wayland Mock Navigation
+
+ [Service]
+ ExecStart=/usr/bin/EGLWLMockNavigation -surface 10
+ EOF
+- |
+ cat > "$DESTDIR/usr/lib/systemd/user/EGLWLInputEventExample.service" <<EOF
+ [Unit]
+ Description=EGL Wayland Input Event Example
+
+ [Service]
+ ExecStart=/usr/bin/EGLWLInputEventExample --surface=5100
+ EOF