summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Brown <ben.brown@codethink.co.uk>2013-12-16 16:14:29 (GMT)
committerBen Brown <ben.brown@codethink.co.uk>2013-12-16 16:14:29 (GMT)
commitce24d797c73f43736464b05d913bcc6556d951c1 (patch)
treeadd226b81f741244679994d485303e3fa795de01
parent2e8685ed6fc35bf62569b514929388f7df189055 (diff)
parentc0bcb0e6bc9fbebf67b36ae6f17dc3a7da05c8eb (diff)
downloaddefinitions-ce24d797c73f43736464b05d913bcc6556d951c1.tar.gz
Merge branch 'baserock/genivi/G-1.1'
-rw-r--r--genivi.morph15
1 files changed, 13 insertions, 2 deletions
diff --git a/genivi.morph b/genivi.morph
index dd327ed..b360e90 100644
--- a/genivi.morph
+++ b/genivi.morph
@@ -5,7 +5,7 @@ build-depends:
chunks:
- build-depends: []
name: DLT-daemon
- ref: baserock/morphs
+ ref: v2.9.1
repo: upstream:DLT-daemon
- build-depends: []
name: sqlite3
@@ -25,13 +25,24 @@ chunks:
name: googlemock
ref: baserock/morph
repo: upstream:googlemock
+- build-depends: []
+ name: genivi-common-api-runtime
+ ref: 2.1.4
+ repo: upstream:genivi-common-api-runtime
+- build-depends:
+ - genivi-common-api-runtime
+ name: genivi-common-api-dbus-runtime
+ ref: 2.1.4
+ repo: upstream:genivi-common-api-dbus-runtime
- build-depends:
- DLT-daemon
- sqlite3
- googletest
- googlemock
+ - genivi-common-api-runtime
+ - genivi-common-api-dbus-runtime
name: audiomanager
- ref: baserock/genivi/baseline
+ ref: 5.0
repo: upstream:audiomanager
description: Software components designed by genivi, for genivi.
kind: stratum