summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <javier.jardon@codethink.co.uk>2016-04-14 17:50:45 +0000
committerJavier Jardón <jjardon@gnome.org>2016-04-14 18:55:18 +0100
commitf76b2d058882a746fc0264861916f3534a1bd2b4 (patch)
treeb9be8f8eb5e625f42db48757ff7aa3210f0eb466
parent6105450773851f0e150aaa7787ff48c9203b449e (diff)
downloaddefinitions-f76b2d058882a746fc0264861916f3534a1bd2b4.tar.gz
GDP: Use qt5-tools-qtwayland instead qt5-tools-qtwayland-genivi
Our generic version of qtwayland has already backported the needed bits genivi systems need for the layer management Change-Id: I99c34053889b4fc85a89c04bcfe86bb5455ff312
-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, 4 insertions, 17 deletions
diff --git a/strata/qt5-tools-qtwayland-genivi.morph b/strata/qt5-tools-qtwayland-genivi.morph
deleted file mode 100644
index 1a93c5d3..00000000
--- a/strata/qt5-tools-qtwayland-genivi.morph
+++ /dev/null
@@ -1,13 +0,0 @@
-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 27fbf166..08700b8f 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-genivi
- morph: strata/qt5-tools-qtwayland-genivi.morph
+- name: qt5-tools-qtwayland
+ morph: strata/qt5-tools-qtwayland.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 29518bbb..cfdb5c82 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-genivi
- morph: strata/qt5-tools-qtwayland-genivi.morph
+- name: qt5-tools-qtwayland
+ morph: strata/qt5-tools-qtwayland.morph
- name: python-pygobject
morph: strata/python-pygobject.morph
- name: genivi-demo-platform-libs