summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-10-01 18:54:55 +0100
committerJavier Jardón <jjardon@gnome.org>2014-10-01 18:56:22 +0100
commit93ea7bf4ca153970134968c8034b5e25168998f9 (patch)
tree292fdbe00eeaedda35aff6739ce9f0f30ff299ee
parentf0577e91e82a39db849f3f2bcff8c73972cc8fc5 (diff)
parentdfcf9cf1a842d4974237b6963b79f5a031d7996f (diff)
downloaddefinitions-93ea7bf4ca153970134968c8034b5e25168998f9.tar.gz
Merge branch 'jjardon/dbus-glib'
Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk> Reviewed-By: Richard Maw <richard.maw@codethink.co.uk> Reviewed-By: Paul Sherwood <paul.sherwood@codethink.co.uk>
-rw-r--r--strata/audio-bluetooth.morph2
-rw-r--r--strata/connectivity.morph2
-rw-r--r--strata/foundation.morph7
-rw-r--r--strata/genivi-foundation.morph5
-rw-r--r--strata/input-common.morph2
-rw-r--r--strata/wayland-generic.morph1
-rw-r--r--strata/x-common.morph2
-rw-r--r--strata/x-generic.morph1
8 files changed, 13 insertions, 9 deletions
diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph
index 7ab792af..a24158b6 100644
--- a/strata/audio-bluetooth.morph
+++ b/strata/audio-bluetooth.morph
@@ -2,7 +2,7 @@ name: audio-bluetooth
kind: stratum
description: Components required for audio and bluetooth.
build-depends:
-- morph: strata/genivi-foundation.morph
+- morph: strata/foundation.morph
chunks:
- name: libatomic_ops
repo: upstream:libatomic_ops
diff --git a/strata/connectivity.morph b/strata/connectivity.morph
index bf83b8c3..a65a940e 100644
--- a/strata/connectivity.morph
+++ b/strata/connectivity.morph
@@ -1,7 +1,7 @@
name: connectivity
kind: stratum
build-depends:
-- morph: strata/genivi-foundation.morph
+- morph: strata/foundation.morph
chunks:
- name: libnl
repo: upstream:libnl
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 7cc03ed8..c97a1cff 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -136,3 +136,10 @@ chunks:
unpetrify-ref: master
build-depends:
- attr
+- name: dbus-glib
+ repo: upstream:dbus-glib
+ ref: 397e8297d433547c9bf4150ddd2b9e0b4c39628c
+ unpetrify-ref: dbus-glib_0.102
+ build-depends:
+ - dbus
+ - glib
diff --git a/strata/genivi-foundation.morph b/strata/genivi-foundation.morph
index 0c4c7047..2dd44f40 100644
--- a/strata/genivi-foundation.morph
+++ b/strata/genivi-foundation.morph
@@ -4,11 +4,6 @@ description: Basic components needed by the GENIVI baseline.
build-depends:
- morph: strata/foundation.morph
chunks:
-- name: dbus-glib
- repo: upstream:dbus-glib
- ref: ee85b071fb51efb9f9a48d4a658cbefefd14544a
- unpetrify-ref: baserock/morph
- build-depends: []
- name: linuxquota
morph: strata/genivi-foundation/linuxquota.morph
repo: upstream:linuxquota
diff --git a/strata/input-common.morph b/strata/input-common.morph
index 20fe6ec0..8cee9f7d 100644
--- a/strata/input-common.morph
+++ b/strata/input-common.morph
@@ -1,7 +1,7 @@
name: input-common
kind: stratum
build-depends:
-- morph: strata/build-essential.morph
+- morph: strata/foundation.morph
- morph: strata/x-common.morph
chunks:
- name: mtdev
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index e21a5d5d..a2f97de2 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -1,6 +1,7 @@
name: wayland-generic
kind: stratum
build-depends:
+- morph: strata/foundation.morph
- morph: strata/x-common.morph
chunks:
- name: libxkbcommon
diff --git a/strata/x-common.morph b/strata/x-common.morph
index 20eb7c06..987862a9 100644
--- a/strata/x-common.morph
+++ b/strata/x-common.morph
@@ -1,7 +1,7 @@
name: x-common
kind: stratum
build-depends:
-- morph: strata/genivi-foundation.morph
+- morph: strata/foundation.morph
chunks:
- name: llvm
morph: strata/x-common/llvm.morph
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index 5128ef19..b30b2a9a 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.morph
@@ -1,6 +1,7 @@
name: x-generic
kind: stratum
build-depends:
+- morph: strata/foundation.morph
- morph: strata/mesa-common.morph
- morph: strata/x-common.morph
- morph: strata/graphics-common.morph