summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-10-14 12:53:44 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-10-14 13:26:19 +0000
commit16b0064896b03e9f29853524588b499346d473b6 (patch)
treefea61e8750d9bc101d3f3062c5181ecbc92bea55
parent6a5fdb5ee9b535397988f0907d689043dbf793da (diff)
downloaddefinitions-16b0064896b03e9f29853524588b499346d473b6.tar.gz
migrate to version 6
-rw-r--r--strata/genivi-demo-platform-libs.morph1
-rw-r--r--strata/genivi-demo-platform.morph1
-rw-r--r--strata/input-genivi.morph5
-rw-r--r--strata/qt5-tools.morph1
4 files changed, 7 insertions, 1 deletions
diff --git a/strata/genivi-demo-platform-libs.morph b/strata/genivi-demo-platform-libs.morph
index 07af27f4..e0df3d29 100644
--- a/strata/genivi-demo-platform-libs.morph
+++ b/strata/genivi-demo-platform-libs.morph
@@ -21,3 +21,4 @@ chunks:
repo: upstream:dbus-python
ref: d0d5b5be685dc4c16b21c54335becc87ca4d6f58
unpetrify-ref: dbus-python-1.2.0
+ build-system: autotools
diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph
index 2abea75e..ab92a00f 100644
--- a/strata/genivi-demo-platform.morph
+++ b/strata/genivi-demo-platform.morph
@@ -37,6 +37,7 @@ chunks:
- name: audiomanagerdemo
repo: upstream:genivi/audiomanagerdemo
ref: master
+ build-system: qmake
- name: genivi-demo-platform-hmi
morph: strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
repo: upstream:genivi/genivi-demo-platform-hmi
diff --git a/strata/input-genivi.morph b/strata/input-genivi.morph
index 98a624ac..f9cd67a9 100644
--- a/strata/input-genivi.morph
+++ b/strata/input-genivi.morph
@@ -8,6 +8,7 @@ chunks:
repo: upstream:mtdev-git
ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d
unpetrify-ref: v1.1.5
+ build-system: autotools
- name: xkeyboard-config
morph: strata/input-common/xkeyboard-config.morph
repo: upstream:xkeyboard-config
@@ -17,10 +18,12 @@ chunks:
repo: upstream:libevdev
ref: 7ac00d7e920c56bb8617403699030a5300bfae1c
unpetrify-ref: libevdev-1.3.2
+ build-system: autotools
- name: libinput@genivi
repo: upstream:libinput
ref: 06e2f522a4ab5ea0a1de68cce1b5f9fff568ed4f
unpetrify-ref: 0.7.0
+ build-system: autotools
build-depends:
- mtdev
- libevdev
@@ -30,4 +33,4 @@ chunks:
morph: strata/input-common/libxkbcommon-no-x11.morph
unpetrify-ref: xkbcommon-0.5.0
build-depends:
- - xkeyboard-config
+ - xkeyboard-config
diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph
index cb9c7c70..b0ac0ba3 100644
--- a/strata/qt5-tools.morph
+++ b/strata/qt5-tools.morph
@@ -138,5 +138,6 @@ chunks:
- name: qtwayland
repo: upstream:qt5/qtwayland
ref: baserock/genivi-5.4.0-wip
+ build-system: qmake
build-depends:
- qtbase