From 0f2d7c626fa7940e8aa9c86da1c62cf47ed61140 Mon Sep 17 00:00:00 2001
From: Emmet Hikory <persia@shipstone.jp>
Date: Fri, 16 May 2014 18:23:37 +0100
Subject: Consolidate genivi-specific X definitions

    The GENIVI-specific X definitions now only differ in name, so
may be consolidated.
---
 devel-system-x86_64-vagrant.morph |  2 +-
 genivi-x-armv7-versatile.morph    | 12 ------------
 genivi-x-generic.morph            | 12 ++++++++++++
 genivi-x-ppc64-generic.morph      | 12 ------------
 genivi-x-x86_64-generic.morph     | 12 ------------
 gitlab-ci-runner.morph            |  2 +-
 nodejs-system-x86_64.morph        |  2 +-
 xfce-system.morph                 |  2 +-
 8 files changed, 16 insertions(+), 40 deletions(-)
 delete mode 100644 genivi-x-armv7-versatile.morph
 create mode 100644 genivi-x-generic.morph
 delete mode 100644 genivi-x-ppc64-generic.morph
 delete mode 100644 genivi-x-x86_64-generic.morph

diff --git a/devel-system-x86_64-vagrant.morph b/devel-system-x86_64-vagrant.morph
index db5ada43..ccd6164f 100644
--- a/devel-system-x86_64-vagrant.morph
+++ b/devel-system-x86_64-vagrant.morph
@@ -22,7 +22,7 @@ strata:
 - morph: x-generic
 - morph: multimedia
 - morph: genivi
-- morph: genivi-x-x86_64-generic
+- morph: genivi-x-generic
 - morph: tools
 - morph: virtualization
 - morph: openstack-clients
diff --git a/genivi-x-armv7-versatile.morph b/genivi-x-armv7-versatile.morph
deleted file mode 100644
index 3fa43e92..00000000
--- a/genivi-x-armv7-versatile.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: genivi-x-armv7-versatile
-kind: stratum
-description: Software components designed by genivi, for genivi.
-build-depends:
-- morph: genivi
-- morph: x-generic
-chunks:
-- name: layer_management
-  repo: upstream:layer_management
-  ref: 206d6709d0a3b3932a02b30ccacaa02b3eab8493
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
diff --git a/genivi-x-generic.morph b/genivi-x-generic.morph
new file mode 100644
index 00000000..9ebea3e2
--- /dev/null
+++ b/genivi-x-generic.morph
@@ -0,0 +1,12 @@
+name: genivi-x-generic
+kind: stratum
+description: Software components designed by genivi, for genivi.
+build-depends:
+- morph: genivi
+- morph: x-generic
+chunks:
+- name: layer_management
+  repo: upstream:layer_management
+  ref: 206d6709d0a3b3932a02b30ccacaa02b3eab8493
+  unpetrify-ref: baserock/genivi/baseline
+  build-depends: []
diff --git a/genivi-x-ppc64-generic.morph b/genivi-x-ppc64-generic.morph
deleted file mode 100644
index 1b845259..00000000
--- a/genivi-x-ppc64-generic.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: genivi-x-ppc64-generic
-kind: stratum
-description: Software components designed by genivi, for genivi.
-build-depends:
-- morph: genivi
-- morph: x-generic
-chunks:
-- name: layer_management
-  repo: upstream:layer_management
-  ref: 206d6709d0a3b3932a02b30ccacaa02b3eab8493
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
diff --git a/genivi-x-x86_64-generic.morph b/genivi-x-x86_64-generic.morph
deleted file mode 100644
index c9dd30ce..00000000
--- a/genivi-x-x86_64-generic.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: genivi-x-x86_64-generic
-kind: stratum
-description: Software components designed by genivi, for genivi.
-build-depends:
-- morph: genivi
-- morph: x-generic
-chunks:
-- name: layer_management
-  repo: upstream:layer_management
-  ref: 206d6709d0a3b3932a02b30ccacaa02b3eab8493
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
diff --git a/gitlab-ci-runner.morph b/gitlab-ci-runner.morph
index 65cde1f5..5399307a 100644
--- a/gitlab-ci-runner.morph
+++ b/gitlab-ci-runner.morph
@@ -21,7 +21,7 @@ strata:
 - morph: x-generic
 - morph: multimedia
 - morph: genivi
-- morph: genivi-x-x86_64-generic
+- morph: genivi-x-generic
 - morph: tools
 - morph: virtualization
 - morph: openstack-clients
diff --git a/nodejs-system-x86_64.morph b/nodejs-system-x86_64.morph
index 35ad292f..ade66f7e 100644
--- a/nodejs-system-x86_64.morph
+++ b/nodejs-system-x86_64.morph
@@ -21,7 +21,7 @@ strata:
 - morph: x-generic
 - morph: multimedia
 - morph: genivi
-- morph: genivi-x-x86_64-generic
+- morph: genivi-x-generic
 - morph: tools
 - morph: virtualization
 - morph: openstack-clients
diff --git a/xfce-system.morph b/xfce-system.morph
index b771d5e4..475aca6a 100644
--- a/xfce-system.morph
+++ b/xfce-system.morph
@@ -20,7 +20,7 @@ strata:
 - morph: x-generic
 - morph: multimedia
 - morph: genivi
-- morph: genivi-x-x86_64-generic
+- morph: genivi-x-generic
 - morph: gtk2
 - morph: tools
 - morph: xfce
-- 
cgit v1.2.1