diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2014-11-17 11:02:24 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-11-17 11:02:24 +0000 |
commit | eec626b916645e6b480dfdadb1165dffb3b6a820 (patch) | |
tree | 3d9d97e6d5fc2b75555c357dbc3e8bd1461b19e3 | |
parent | 522e5ce8f922a688c1fa715d35445aeebf975336 (diff) | |
parent | a3c191ec69d95aed6eee4e38406769fe5cbd7af4 (diff) | |
download | definitions-eec626b916645e6b480dfdadb1165dffb3b6a820.tar.gz |
Merge remote-tracking branch 'origin/baserock/james/upgrade-genivi-weston'
Reviewed-by: Richard Maw
Reviewed-by: Sam Thursfield
-rw-r--r-- | strata/weston-genivi.morph | 9 | ||||
-rw-r--r-- | strata/weston-genivi/wayland-ivi-extension.morph | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index c676d636..d47d0ac4 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -15,13 +15,14 @@ chunks: - name: weston morph: strata/weston-genivi/weston.morph repo: upstream:weston - ref: 5d9e9c1393c6b0ea6ce52912fc458c963e644547 - unpetrify-ref: baserock/genivi/1.2.0 + ref: 5d7a71cb941ed419ec042ea28be56c87ea407db6 + unpetrify-ref: baserock/genivi/1.3.0 build-depends: - linux-pam - name: wayland-ivi-extension + morph: strata/weston-genivi/wayland-ivi-extension.morph repo: upstream:genivi/wayland-ivi-extension - ref: 633ce4f89f695c575bdfc080551b0e59c8287427 - unpetrify-ref: baserock/genivi/1.2.0 + ref: 43fa65ede93cef9e6c902df2248229ad204b510a + unpetrify-ref: master build-depends: - weston diff --git a/strata/weston-genivi/wayland-ivi-extension.morph b/strata/weston-genivi/wayland-ivi-extension.morph new file mode 100644 index 00000000..bceb2a88 --- /dev/null +++ b/strata/weston-genivi/wayland-ivi-extension.morph @@ -0,0 +1,8 @@ +name: wayland-ivi-extension +kind: chunk +configure-commands: +- cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_C_FLAGS="-I/usr/include/weston" +build-commands: +- make +install-commands: +- make install DESTDIR="$DESTDIR" |