summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-11-17 11:21:31 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-11-17 11:21:31 +0000
commite3e0baf91a5f0e1bcd1fad06345bbe4ec88fad1d (patch)
tree87afcfce2a9915efd27bbbffc2e5f5f08030cc99
parent14094ea12b9e3044a50c0085c745d66c5dcb9366 (diff)
parent16526405ae9feaa0fa7f3ba7ec7fde430236a3ea (diff)
downloaddefinitions-e3e0baf91a5f0e1bcd1fad06345bbe4ec88fad1d.tar.gz
Merge branch 'baserock/ps/genivi-updates'
Reviewed-by: Richard Maw
-rw-r--r--strata/audio-bluetooth.morph4
-rw-r--r--strata/core.morph4
-rw-r--r--strata/genivi.morph6
3 files changed, 7 insertions, 7 deletions
diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph
index a24158b6..003d451a 100644
--- a/strata/audio-bluetooth.morph
+++ b/strata/audio-bluetooth.morph
@@ -70,8 +70,8 @@ chunks:
- name: ofono
morph: strata/audio-bluetooth/ofono.morph
repo: upstream:ofono
- ref: a53228f6b1b32d0405c0c3c8e0861d6202ffbba2
- unpetrify-ref: baserock/morph
+ ref: d05b718cc0b0d367227fbfbf52e60fc5462cc549
+ unpetrify-ref: "1.15"
build-depends:
- mobile-broadband-provider-info
- bluez
diff --git a/strata/core.morph b/strata/core.morph
index 6f66adbc..140674f1 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -105,8 +105,8 @@ chunks:
- name: openssl-new
morph: strata/core/openssl-new.morph
repo: upstream:openssl-new
- ref: ed9938171f80c7534f6eb52f75c2538bca462807
- unpetrify-ref: baserock/OpenSSL_1_0_1g
+ ref: 872e681c00a713e840ebed77a4e05fa0e181f16f
+ unpetrify-ref: OpenSSL_1_0_1j
build-depends:
- perl
- name: bzip2
diff --git a/strata/genivi.morph b/strata/genivi.morph
index 1ba464c6..bd0a457d 100644
--- a/strata/genivi.morph
+++ b/strata/genivi.morph
@@ -37,13 +37,13 @@ chunks:
- googletest
- name: genivi-common-api-runtime
repo: upstream:genivi-common-api-runtime
- ref: 8a62115bad2c0615fdf40f4e54a41454ae6e4698
+ ref: 188abb5e24d6a2a7fdd7e5d150439a162621292c
unpetrify-ref: 2.1.6
build-depends: []
- name: genivi-common-api-dbus-runtime
repo: upstream:genivi-common-api-dbus-runtime
- ref: 53d9341444ff9a31b9cc551b10fd0b341207937b
- unpetrify-ref: 2.1.6
+ ref: 3372155b32a2cf3b05e1a2a13f6f8413069de33f
+ unpetrify-ref: 2.1.6-p1
build-depends:
- genivi-common-api-runtime
- name: audiomanager