summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2014-07-29 09:03:07 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2014-07-29 09:06:38 +0000
commit8533643f972cc2ee92a41c7c676c542f31ccfa9e (patch)
tree4d63b1152252feabee56575485ff847ab2b2371d
parent3d31fe6b117341e61552480aa45af75fffe9d937 (diff)
parent9e6844ce8cc394a224fbe61cf137fdb55498aa7f (diff)
downloaddefinitions-8533643f972cc2ee92a41c7c676c542f31ccfa9e.tar.gz
Merge branch 'baserock/pedroalvarez/genivi-I0.1'
This merges an update of connman to 1.24 by Pedro Alvarez as required for GENIVI. Reviewed-by: Richard Maw Reviewed-by: Sam Thursfield
-rw-r--r--connectivity.morph4
1 files changed, 2 insertions, 2 deletions
diff --git a/connectivity.morph b/connectivity.morph
index 69512392..44d61ce0 100644
--- a/connectivity.morph
+++ b/connectivity.morph
@@ -21,7 +21,7 @@ chunks:
build-depends: []
- name: connman
repo: upstream:connman
- ref: f16e43ebc34a32937a67c56655586d2dc1518fbb
- unpetrify-ref: baserock/morph
+ ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44
+ unpetrify-ref: baserock/1.24
build-depends:
- iptables