summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmet Hikory <persia@shipstone.jp>2014-05-16 17:23:37 (GMT)
committerMichael Drake <michael.drake@codethink.co.uk>2014-07-14 12:22:19 (GMT)
commit0f2d7c626fa7940e8aa9c86da1c62cf47ed61140 (patch)
tree2609322e9e856a14644a66427b2f99883dcc2cca
parent0d33d2388c8e6768551c459e2ac70fb47af4007b (diff)
downloaddefinitions-baserock/michaeldrake/x-consolidation.tar.gz
Consolidate genivi-specific X definitionsbaserock/michaeldrake/x-consolidation
The GENIVI-specific X definitions now only differ in name, so may be consolidated.
-rw-r--r--devel-system-x86_64-vagrant.morph2
-rw-r--r--genivi-x-armv7-versatile.morph12
-rw-r--r--genivi-x-generic.morph (renamed from genivi-x-ppc64-generic.morph)2
-rw-r--r--genivi-x-x86_64-generic.morph12
-rw-r--r--gitlab-ci-runner.morph2
-rw-r--r--nodejs-system-x86_64.morph2
-rw-r--r--xfce-system.morph2
7 files changed, 5 insertions, 29 deletions
diff --git a/devel-system-x86_64-vagrant.morph b/devel-system-x86_64-vagrant.morph
index db5ada4..ccd6164 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 3fa43e9..0000000
--- 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-ppc64-generic.morph b/genivi-x-generic.morph
index 1b84525..9ebea3e 100644
--- a/genivi-x-ppc64-generic.morph
+++ b/genivi-x-generic.morph
@@ -1,4 +1,4 @@
-name: genivi-x-ppc64-generic
+name: genivi-x-generic
kind: stratum
description: Software components designed by genivi, for genivi.
build-depends:
diff --git a/genivi-x-x86_64-generic.morph b/genivi-x-x86_64-generic.morph
deleted file mode 100644
index c9dd30c..0000000
--- 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 65cde1f..5399307 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 35ad292..ade66f7 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 b771d5e..475aca6 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