summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <javier.jardon@codethink.co.uk>2016-04-28 16:46:31 +0100
committerJavier Jardón <javier.jardon@codethink.co.uk>2016-04-28 16:46:31 +0100
commit631cb205ecdcad5ab6a56da91ff1321029338d1c (patch)
tree58d1a6d3185fb8731560da2b386581a25647b62b
parentf62673de357d4d29ddb1078b81c84c8869287e15 (diff)
downloaddefinitions-631cb205ecdcad5ab6a56da91ff1321029338d1c.tar.gz
Revert "GDP: Use qt5-tools-qtwayland instead qt5-tools-qtwayland-genivi"
This reverts commit f76b2d058882a746fc0264861916f3534a1bd2b4.
-rw-r--r--strata/qt5-tools-qtwayland-genivi.morph13
-rw-r--r--systems/genivi-demo-platform-armv7lhf-jetson.morph4
-rw-r--r--systems/genivi-demo-platform-x86_64-generic.morph4
3 files changed, 17 insertions, 4 deletions
diff --git a/strata/qt5-tools-qtwayland-genivi.morph b/strata/qt5-tools-qtwayland-genivi.morph
new file mode 100644
index 00000000..1a93c5d3
--- /dev/null
+++ b/strata/qt5-tools-qtwayland-genivi.morph
@@ -0,0 +1,13 @@
+name: qt5-tools-qtwayland-genivi
+kind: stratum
+description: |
+ Modified version of Qt5 Wayland which makes Qt applications use the
+ LayerManager API
+build-depends:
+- morph: strata/qt5-tools.morph
+chunks:
+- name: qtwayland@genivi
+ repo: upstream:qt5/qtwayland
+ ref: 394c54253d5d965e353b618fd373fa89f79cbd96
+ unpetrify-ref: baserock/genivi-5.4.0-wip
+ build-system: qmake
diff --git a/systems/genivi-demo-platform-armv7lhf-jetson.morph b/systems/genivi-demo-platform-armv7lhf-jetson.morph
index 08700b8f..27fbf166 100644
--- a/systems/genivi-demo-platform-armv7lhf-jetson.morph
+++ b/systems/genivi-demo-platform-armv7lhf-jetson.morph
@@ -59,8 +59,8 @@ strata:
morph: strata/qt5-tools-qtmultimedia.morph
- name: qt5-tools-qtwebkit
morph: strata/qt5-tools-qtwebkit.morph
-- name: qt5-tools-qtwayland
- morph: strata/qt5-tools-qtwayland.morph
+- name: qt5-tools-qtwayland-genivi
+ morph: strata/qt5-tools-qtwayland-genivi.morph
- name: python-pygobject
morph: strata/python-pygobject.morph
- name: genivi-demo-platform-libs
diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform-x86_64-generic.morph
index cfdb5c82..29518bbb 100644
--- a/systems/genivi-demo-platform-x86_64-generic.morph
+++ b/systems/genivi-demo-platform-x86_64-generic.morph
@@ -61,8 +61,8 @@ strata:
morph: strata/qt5-tools-qtmultimedia.morph
- name: qt5-tools-qtwebkit
morph: strata/qt5-tools-qtwebkit.morph
-- name: qt5-tools-qtwayland
- morph: strata/qt5-tools-qtwayland.morph
+- name: qt5-tools-qtwayland-genivi
+ morph: strata/qt5-tools-qtwayland-genivi.morph
- name: python-pygobject
morph: strata/python-pygobject.morph
- name: genivi-demo-platform-libs