summaryrefslogtreecommitdiff
path: root/strata/weston-genivi.morph
diff options
context:
space:
mode:
authorRichard Ipsum <richardipsum@fastmail.co.uk>2014-10-03 19:13:30 +0100
committerRichard Ipsum <richardipsum@fastmail.co.uk>2014-10-03 19:13:30 +0100
commit17067a594df8683e533ec2e4cde8c66db5796a77 (patch)
tree03c755013a6ffc23f6366b397666f468798af8b3 /strata/weston-genivi.morph
parentc1d14ecd893c4be9b1e6c1a211a3ff2fe51ef7b1 (diff)
parent6192396b0515942344298b38d7bf906a6f60df77 (diff)
downloaddefinitions-17067a594df8683e533ec2e4cde8c66db5796a77.tar.gz
Merge branch 'baserock/release/baserock-14.40'
Reviewed by: Sam Thursfield Paul Sherwood
Diffstat (limited to 'strata/weston-genivi.morph')
-rw-r--r--strata/weston-genivi.morph8
1 files changed, 4 insertions, 4 deletions
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
index e563ab31..a84c9aa9 100644
--- a/strata/weston-genivi.morph
+++ b/strata/weston-genivi.morph
@@ -15,13 +15,13 @@ chunks:
- name: weston
morph: strata/weston-genivi/weston.morph
repo: upstream:weston
- ref: 8658e06e69cc3944e89684a2de619e479751633f
- unpetrify-ref: baserock/genivi/baseline-h-1.1
+ ref: 5d9e9c1393c6b0ea6ce52912fc458c963e644547
+ unpetrify-ref: baserock/genivi/1.2.0
build-depends:
- linux-pam
- name: wayland-ivi-extension
repo: upstream:genivi/wayland-ivi-extension
- ref: 8b59529cf3b279a948f253bc79263d00d3f051a5
- unpetrify-ref: baserock/genivi/baseline-h-1.1
+ ref: 633ce4f89f695c575bdfc080551b0e59c8287427
+ unpetrify-ref: baserock/genivi/1.2.0
build-depends:
- weston