diff options
author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2015-05-01 14:51:26 +0000 |
---|---|---|
committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2015-05-01 15:18:23 +0000 |
commit | 209c1086fde9ff62a842cbe60ec514b32be3d9a3 (patch) | |
tree | 9c2aac9bce3c3ae35dfd5a9433d49063fdf1c165 | |
parent | 4218bf6ade641a62efda497f95921a15a217eb5b (diff) | |
download | definitions-209c1086fde9ff62a842cbe60ec514b32be3d9a3.tar.gz |
Use a specific combination of wayland-ivi-extension, weston and libinput
This is necessary because:
* genivi-demo-platform-hmi requires features of wayland-ivi-extension
which were taken out after version 1.3.91
* It links against an ivi-layout module in weston with an interface
that is part of the weston-ivi-shell fork before it was merged with
weston, hence it must be a version before weston 1.7.
this existed as the branch "weston-ivi-shell-1.6.0-rc1-testing-01" on
github/ntanibata/weston-ivi-shell.
* libinput 0.7, because 0.8+ changed function signatures that weston
uses.
-rw-r--r-- | strata/input-genivi.morph | 26 | ||||
-rw-r--r-- | strata/weston-genivi.morph | 10 | ||||
-rw-r--r-- | systems/genivi-baseline-system-armv7lhf-jetson.morph | 4 | ||||
-rw-r--r-- | systems/genivi-baseline-system-armv7lhf-versatile.morph | 4 | ||||
-rw-r--r-- | systems/genivi-baseline-system-x86_64-generic.morph | 4 | ||||
-rw-r--r-- | systems/genivi-demo-platform-x86_64-generic.morph | 4 |
6 files changed, 39 insertions, 13 deletions
diff --git a/strata/input-genivi.morph b/strata/input-genivi.morph new file mode 100644 index 00000000..a4525932 --- /dev/null +++ b/strata/input-genivi.morph @@ -0,0 +1,26 @@ +name: input-genivi +kind: stratum +build-depends: +- morph: strata/foundation.morph +- morph: strata/xorg-util-macros-common.morph +chunks: +- name: mtdev + repo: upstream:mtdev-git + ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d + unpetrify-ref: v1.1.5 +- name: xkeyboard-config + morph: strata/input-common/xkeyboard-config.morph + repo: upstream:xkeyboard-config + ref: 73aa90ce32967747c84a1b5fe32cee329bc3bbcf + unpetrify-ref: xkeyboard-config-2.13 +- name: libevdev + repo: upstream:libevdev + ref: 7ac00d7e920c56bb8617403699030a5300bfae1c + unpetrify-ref: libevdev-1.3.2 +- name: libinput + repo: upstream:libinput + ref: 06e2f522a4ab5ea0a1de68cce1b5f9fff568ed4f + unpetrify-ref: 0.7.0 + build-depends: + - mtdev + - libevdev diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index ea619821..4de365e7 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -2,7 +2,7 @@ name: weston-genivi kind: stratum build-depends: - morph: strata/graphics-common.morph -- morph: strata/input-common.morph +- morph: strata/input-genivi.morph - morph: strata/mesa-common.morph - morph: strata/libdrm-common.morph - morph: strata/wayland-generic.morph @@ -10,12 +10,12 @@ chunks: - name: weston morph: strata/weston-genivi/weston.morph repo: upstream:weston - ref: 5d7a71cb941ed419ec042ea28be56c87ea407db6 - unpetrify-ref: baserock/genivi/1.3.0 + ref: 1d5fe5b2bdb9c62903baec6f38ada60f4065c16f + unpetrify-ref: baserock/jonathanmaw/genivi-demo-jetson - name: wayland-ivi-extension morph: strata/weston-genivi/wayland-ivi-extension.morph repo: upstream:genivi/wayland-ivi-extension - ref: 43fa65ede93cef9e6c902df2248229ad204b510a - unpetrify-ref: master + ref: bac7fc24bb94e37e33f447b58ec74240bb248841 + unpetrify-ref: 1.3.91 build-depends: - weston diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 9306426d..32ad1890 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -29,8 +29,8 @@ strata: morph: strata/wayland-generic.morph - name: graphics-common morph: strata/graphics-common.morph -- name: input-common - morph: strata/input-common.morph +- name: input-genivi + morph: strata/input-genivi.morph - name: mesa-common morph: strata/mesa-common.morph - name: x-common diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index 698230bb..a0ee81d2 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -29,8 +29,8 @@ strata: morph: strata/wayland-generic.morph - name: graphics-common morph: strata/graphics-common.morph -- name: input-common - morph: strata/input-common.morph +- name: input-genivi + morph: strata/input-genivi.morph - name: x-common morph: strata/x-common.morph - name: weston-genivi diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index 7b339c43..f84dd814 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -29,8 +29,8 @@ strata: morph: strata/wayland-generic.morph - name: graphics-common morph: strata/graphics-common.morph -- name: input-common - morph: strata/input-common.morph +- name: input-genivi + morph: strata/input-genivi.morph - name: llvm-common morph: strata/llvm-common.morph - name: mesa-common-vm diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform-x86_64-generic.morph index 6a338540..87e56cc9 100644 --- a/systems/genivi-demo-platform-x86_64-generic.morph +++ b/systems/genivi-demo-platform-x86_64-generic.morph @@ -29,8 +29,8 @@ strata: morph: strata/wayland-generic.morph - name: graphics-common morph: strata/graphics-common.morph -- name: input-common - morph: strata/input-common.morph +- name: input-genivi + morph: strata/input-genivi.morph - name: llvm-common morph: strata/llvm-common.morph - name: mesa-common |