summaryrefslogtreecommitdiff
path: root/strata
diff options
context:
space:
mode:
Diffstat (limited to 'strata')
-rw-r--r--strata/genivi-foundation.morph12
-rw-r--r--strata/genivi-wayland-generic.morph15
-rw-r--r--strata/genivi-x-generic.morph13
-rw-r--r--strata/genivi-x-generic/layer_management.morph8
-rw-r--r--strata/genivi.morph8
-rw-r--r--strata/genivi/linuxquota.morph (renamed from strata/genivi-foundation/linuxquota.morph)0
-rw-r--r--strata/xfce.morph1
7 files changed, 7 insertions, 50 deletions
diff --git a/strata/genivi-foundation.morph b/strata/genivi-foundation.morph
deleted file mode 100644
index 2dd44f40..00000000
--- a/strata/genivi-foundation.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: genivi-foundation
-kind: stratum
-description: Basic components needed by the GENIVI baseline.
-build-depends:
-- morph: strata/foundation.morph
-chunks:
-- name: linuxquota
- morph: strata/genivi-foundation/linuxquota.morph
- repo: upstream:linuxquota
- ref: 0804c89a16736533e440771dc42a15e5d0223902
- unpetrify-ref: baserock/genivi/morph
- build-depends: []
diff --git a/strata/genivi-wayland-generic.morph b/strata/genivi-wayland-generic.morph
deleted file mode 100644
index 3f9eb240..00000000
--- a/strata/genivi-wayland-generic.morph
+++ /dev/null
@@ -1,15 +0,0 @@
-name: genivi-wayland-generic
-kind: stratum
-description: Software components designed by genivi, for genivi.
-build-depends:
-- morph: strata/core.morph
-- morph: strata/foundation.morph
-- morph: strata/genivi-foundation.morph
-- morph: strata/genivi.morph
-- morph: strata/wayland-generic.morph
-chunks:
-- name: layer_management-wayland
- repo: upstream:layer_management
- ref: 206d6709d0a3b3932a02b30ccacaa02b3eab8493
- unpetrify-ref: baserock/genivi/baseline
- build-depends: []
diff --git a/strata/genivi-x-generic.morph b/strata/genivi-x-generic.morph
deleted file mode 100644
index 47b912bb..00000000
--- a/strata/genivi-x-generic.morph
+++ /dev/null
@@ -1,13 +0,0 @@
-name: genivi-x-generic
-kind: stratum
-description: Software components designed by genivi, for genivi.
-build-depends:
-- morph: strata/genivi.morph
-- morph: strata/x-generic.morph
-chunks:
-- name: layer_management
- morph: strata/genivi-x-generic/layer_management.morph
- repo: upstream:layer_management
- ref: 206d6709d0a3b3932a02b30ccacaa02b3eab8493
- unpetrify-ref: baserock/genivi/baseline
- build-depends: []
diff --git a/strata/genivi-x-generic/layer_management.morph b/strata/genivi-x-generic/layer_management.morph
deleted file mode 100644
index f4840604..00000000
--- a/strata/genivi-x-generic/layer_management.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: layer_management
-kind: chunk
-configure-commands:
-- mkdir -p build && cd build && cmake .. -DWITH_GLESv2_LIB=ON
-build-commands:
-- make -C build
-install-commands:
-- make -C build install
diff --git a/strata/genivi.morph b/strata/genivi.morph
index b75861ca..1ba464c6 100644
--- a/strata/genivi.morph
+++ b/strata/genivi.morph
@@ -2,8 +2,14 @@ name: genivi
kind: stratum
description: Software components designed by genivi, for genivi.
build-depends:
-- morph: strata/genivi-foundation.morph
+- morph: strata/foundation.morph
chunks:
+- name: linuxquota
+ morph: strata/genivi/linuxquota.morph
+ repo: upstream:linuxquota
+ ref: 0804c89a16736533e440771dc42a15e5d0223902
+ unpetrify-ref: baserock/genivi/morph
+ build-depends: []
- name: DLT-daemon
repo: upstream:DLT-daemon
ref: 8b48e73f79b4463393916e4c6696917e3dedd026
diff --git a/strata/genivi-foundation/linuxquota.morph b/strata/genivi/linuxquota.morph
index 826696ad..826696ad 100644
--- a/strata/genivi-foundation/linuxquota.morph
+++ b/strata/genivi/linuxquota.morph
diff --git a/strata/xfce.morph b/strata/xfce.morph
index e5a30821..5678c1fc 100644
--- a/strata/xfce.morph
+++ b/strata/xfce.morph
@@ -2,7 +2,6 @@ name: xfce
kind: stratum
description: xfce stratum
build-depends:
-- morph: strata/genivi-x-generic.morph
- morph: strata/gtk2.morph
- morph: strata/x-generic.morph
chunks: