summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-04-03 15:43:55 +0100
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-04-03 15:43:55 +0100
commitbad255769f235803ce10ff603d27fb947071c83c (patch)
tree60d46dbea3508f97242f782fe4cd3fb5b224fd7c
parent7d6c3f824d909a024f422fc16190454bb6dd6efe (diff)
parent8767317faa1aaed94d0f45a631e1f65900ba4f0a (diff)
downloaddefinitions-bad255769f235803ce10ff603d27fb947071c83c.tar.gz
Merge branch 'baserock/pedroalvarez/upgrade-bluez'
-rw-r--r--audio-bluetooth.morph21
-rw-r--r--foundation.morph8
2 files changed, 18 insertions, 11 deletions
diff --git a/audio-bluetooth.morph b/audio-bluetooth.morph
index e1cd778a..07db9d16 100644
--- a/audio-bluetooth.morph
+++ b/audio-bluetooth.morph
@@ -20,22 +20,29 @@ chunks:
unpetrify-ref: baserock/morph
build-depends:
- alsa-lib
+- name: libical
+ repo: upstream:libical
+ ref: 52568782ae136e1ec4ddf3eb6da7b0f3fbd3f1b3
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: readline
+ repo: upstream:readline
+ ref: 518937ab89be812ccd45e9b8c1ce4ad721d35ef6
+ unpetrify-ref: baserock/genivi/baseline
+ build-depends: []
- name: bluez
repo: upstream:bluez
- ref: df1dd28e3a5c92fb67209e4ae3ad2d04c6380b9b
- unpetrify-ref: baserock/genivi/baseline
+ ref: 9e483337a42f0ddef06cc9ad146c8523f2b08888
+ unpetrify-ref: baserock/v5.17
build-depends:
+ - readline
+ - libical
- alsa-lib
- name: bluez-tools
repo: upstream:bluez-tools
ref: 7350787e96a6ecf2cc5d4afddb3321ccad9fa461
unpetrify-ref: baserock/morph
build-depends: []
-- name: libical
- repo: upstream:libical
- ref: 52568782ae136e1ec4ddf3eb6da7b0f3fbd3f1b3
- unpetrify-ref: baserock/morph
- build-depends: []
- name: obexd
repo: upstream:obexd
ref: 4225280022c206762c91beee47c62d05e1baeacc
diff --git a/foundation.morph b/foundation.morph
index 01938d7f..413ed4be 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -65,8 +65,8 @@ chunks:
- glib
- name: dbus-pre
repo: upstream:dbus
- ref: a0f3687d650c8c73134f318820f4978a4ff3e9e2
- unpetrify-ref: baserock/build-essential
+ ref: f2e4718bf42f507684949ebf484aa94df42abbbe
+ unpetrify-ref: baserock/v1.8.0
build-depends:
- glib
- name: systemd
@@ -94,8 +94,8 @@ chunks:
- lzo
- name: dbus
repo: upstream:dbus
- ref: a0f3687d650c8c73134f318820f4978a4ff3e9e2
- unpetrify-ref: baserock/build-essential
+ ref: f2e4718bf42f507684949ebf484aa94df42abbbe
+ unpetrify-ref: baserock/v1.8.0
build-depends:
- glib
- systemd