From dfcf9cf1a842d4974237b6963b79f5a031d7996f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 22 Sep 2014 17:08:57 +0000 Subject: Fix some strata that depends on foundation, not genivi-foundation x-common depends on foundation because llvm. Note that other strata assume that x-common depends on core as llvm will be moved away from it --- strata/audio-bluetooth.morph | 2 +- strata/connectivity.morph | 2 +- strata/input-common.morph | 2 +- strata/wayland-generic.morph | 1 + strata/x-common.morph | 2 +- strata/x-generic.morph | 1 + 6 files changed, 6 insertions(+), 4 deletions(-) (limited to 'strata') 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/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 -- cgit v1.2.1