12 files changed, 9 insertions, 73 deletions
diff --git a/devel-system-armv7-chroot.morph b/devel-system-armv7-chroot.morph
index 0ec755f8..aabf9ec1 100644
--- a/devel-system-armv7-chroot.morph
+++ b/devel-system-armv7-chroot.morph
@@ -14,3 +14,4 @@ strata:
 - morph: core
 - morph: foundation
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph
index adeb07b3..a4ebd37e 100644
--- a/devel-system-armv7-highbank.morph
+++ b/devel-system-armv7-highbank.morph
@@ -13,13 +13,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-armv7-highbank
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-armv7-versatile
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-armv7-versatile
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
index e4cf3d53..2fc3e585 100644
--- a/devel-system-armv7-versatile.morph
+++ b/devel-system-armv7-versatile.morph
@@ -13,13 +13,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-armv7-versatile
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-armv7-versatile
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-armv7-versatile
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-armv7-wandboard.morph b/devel-system-armv7-wandboard.morph
index 2d758824..08aeb4af 100644
--- a/devel-system-armv7-wandboard.morph
+++ b/devel-system-armv7-wandboard.morph
@@ -12,13 +12,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-wandboard
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-armv7-versatile
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-armv7-versatile
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-armv7b-chroot.morph b/devel-system-armv7b-chroot.morph
index 66fa0af2..6a417ec6 100644
--- a/devel-system-armv7b-chroot.morph
+++ b/devel-system-armv7b-chroot.morph
@@ -14,3 +14,4 @@ strata:
 - morph: core
 - morph: foundation
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-armv7b-highbank.morph b/devel-system-armv7b-highbank.morph
index 1a120e10..bbb50976 100644
--- a/devel-system-armv7b-highbank.morph
+++ b/devel-system-armv7b-highbank.morph
@@ -13,13 +13,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-armv7b-highbank
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-armv7-versatile
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-armv7-versatile
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-armv7lhf-chroot.morph b/devel-system-armv7lhf-chroot.morph
index c6d5b5a2..f07fc777 100644
--- a/devel-system-armv7lhf-chroot.morph
+++ b/devel-system-armv7lhf-chroot.morph
@@ -14,3 +14,4 @@ strata:
 - morph: core
 - morph: foundation
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-armv7lhf-highbank.morph b/devel-system-armv7lhf-highbank.morph
index d357f483..7a9fd2cd 100644
--- a/devel-system-armv7lhf-highbank.morph
+++ b/devel-system-armv7lhf-highbank.morph
@@ -13,13 +13,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-armv7-highbank
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-armv7-versatile
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-armv7-versatile
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-armv7lhf-wandboard.morph b/devel-system-armv7lhf-wandboard.morph
index 2a0969ec..c9b7c8a5 100644
--- a/devel-system-armv7lhf-wandboard.morph
+++ b/devel-system-armv7lhf-wandboard.morph
@@ -12,13 +12,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-wandboard
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-armv7-versatile
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-armv7-versatile
 - morph: tools
+- morph: openstack-clients
diff --git a/devel-system-ppc64-generic.morph b/devel-system-ppc64-generic.morph
index 1297acba..cbe42301 100644
--- a/devel-system-ppc64-generic.morph
+++ b/devel-system-ppc64-generic.morph
@@ -13,14 +13,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-ppc64-generic
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-ppc64-generic
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-ppc64-generic
 - morph: tools
 - morph: openstack-clients
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index 42d363b5..28c89447 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -13,14 +13,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-x86_32-generic
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-x86_64-generic
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-x86_64-generic
 - morph: tools
 - morph: openstack-clients
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index 7048df53..1daa45d2 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -13,15 +13,6 @@ strata:
 - morph: build-essential
 - morph: core
 - morph: foundation
-- morph: genivi-foundation
 - morph: bsp-x86_64-generic
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-x86_64-generic
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-x86_64-generic
 - morph: tools
-- morph: virtualization
 - morph: openstack-clients