From 2ef01d832016966287024a25b615ce5467dde135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Sun, 5 Oct 2014 17:46:27 +0000
Subject: Remove genivi-wayland-generic

Its not a dependency of any stratum or system
---
 strata/genivi-wayland-generic.morph | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 strata/genivi-wayland-generic.morph

(limited to 'strata')

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: []
-- 
cgit v1.2.1


From e0ba084d447a89b17c5cce6fdfc452dd58371925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Sun, 5 Oct 2014 17:46:57 +0000
Subject: Remove genivi-x-generic

It only contains genivi layer_management component, but this component
seems to be replaced by wayland-ivi-extension present in
weston-genivi
---
 strata/genivi-x-generic.morph                  | 13 -------------
 strata/genivi-x-generic/layer_management.morph |  8 --------
 strata/xfce.morph                              |  1 -
 3 files changed, 22 deletions(-)
 delete mode 100644 strata/genivi-x-generic.morph
 delete mode 100644 strata/genivi-x-generic/layer_management.morph

(limited to 'strata')

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/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:
-- 
cgit v1.2.1


From 393ba5011f775fb95b0d3a046c959944bfa62d13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Sun, 5 Oct 2014 17:59:51 +0000
Subject: Move linuxquota to genivi stratum and remove genivi-foundation
 stratum

---
 strata/genivi-foundation.morph            | 12 ------------
 strata/genivi-foundation/linuxquota.morph | 10 ----------
 strata/genivi.morph                       |  8 +++++++-
 strata/genivi/linuxquota.morph            | 10 ++++++++++
 4 files changed, 17 insertions(+), 23 deletions(-)
 delete mode 100644 strata/genivi-foundation.morph
 delete mode 100644 strata/genivi-foundation/linuxquota.morph
 create mode 100644 strata/genivi/linuxquota.morph

(limited to 'strata')

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-foundation/linuxquota.morph b/strata/genivi-foundation/linuxquota.morph
deleted file mode 100644
index 826696ad..00000000
--- a/strata/genivi-foundation/linuxquota.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: linuxquota
-kind: chunk
-build-system: autotools
-configure-commands:
-- autoreconf -ivf
-- ./configure --prefix="$PREFIX"
-build-commands:
-- make "RPCGEN=rpcgen -Y /usr/bin"
-install-commands:
-- make ROOTDIR="$DESTDIR" 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/linuxquota.morph b/strata/genivi/linuxquota.morph
new file mode 100644
index 00000000..826696ad
--- /dev/null
+++ b/strata/genivi/linuxquota.morph
@@ -0,0 +1,10 @@
+name: linuxquota
+kind: chunk
+build-system: autotools
+configure-commands:
+- autoreconf -ivf
+- ./configure --prefix="$PREFIX"
+build-commands:
+- make "RPCGEN=rpcgen -Y /usr/bin"
+install-commands:
+- make ROOTDIR="$DESTDIR" install
-- 
cgit v1.2.1