summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2015-05-01 14:51:26 +0000
committerJames Thomas <james.thomas@codethink.co.uk>2015-05-20 14:06:56 +0000
commit3a305987df513ae30e5f5972e3e29e52f2110a69 (patch)
tree9144d66c8b958d6e8d00ceb89519656431b3141f
parent0745798d5118b26158e181a1e6b7aa619ab6169c (diff)
downloaddefinitions-3a305987df513ae30e5f5972e3e29e52f2110a69.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.morph26
-rw-r--r--strata/weston-genivi.morph10
-rw-r--r--strata/weston-genivi/weston.morph10
-rw-r--r--systems/genivi-baseline-system-armv7lhf-jetson.morph4
-rw-r--r--systems/genivi-baseline-system-armv7lhf-versatile.morph4
-rw-r--r--systems/genivi-baseline-system-x86_64-generic.morph4
-rw-r--r--systems/genivi-demo-platform-x86_64-generic.morph4
7 files changed, 49 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..88d6df66 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: 1a43127064349577d1d41a910d8ed1a39caf2867
+ unpetrify-ref: baserock/genivi/genivi-demo-platform
- 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/strata/weston-genivi/weston.morph b/strata/weston-genivi/weston.morph
index 810ce5e9..cb28b715 100644
--- a/strata/weston-genivi/weston.morph
+++ b/strata/weston-genivi/weston.morph
@@ -5,7 +5,17 @@ build-system: autotools
configure-commands:
- autoreconf -ivf
- |
+ cpu=$(echo $TARGET | cut -d '-' -f 1)
+ case "$cpu" in
+ armv7lhf)
+ export WESTON_NATIVE_BACKEND=drm-backend.so
+ ;;
+ *)
+ export WESTON_NATIVE_BACKEND=fbdev-backend.so
+ ;;
+ esac
LDFLAGS='-L/lib64 -lrt' \
+ $
./configure --prefix=$PREFIX --disable-xwayland \
--disable-x11-compositor \
--disable-wayland-compositor --enable-egl \
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