diff options
| author | Emmet Hikory <persia@shipstone.jp> | 2014-05-16 18:23:37 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-07-25 13:19:39 +0000 |
| commit | c2105d9b8bb0849888547c27224a4b9679fc888f (patch) | |
| tree | c81b492ef7483a60f685c512c779f2da20c9b06d | |
| parent | 240a07a140a0d82fa0a5f57e4bc1f5808202fe2c (diff) | |
| download | definitions-c2105d9b8bb0849888547c27224a4b9679fc888f.tar.gz | |
Consolidate genivi-specific X definitions
The GENIVI-specific X definitions now only differ in name, so
may be consolidated.
| -rw-r--r-- | devel-system-x86_64-vagrant.morph | 2 | ||||
| -rw-r--r-- | genivi-x-armv7-versatile.morph | 12 | ||||
| -rw-r--r-- | genivi-x-generic.morph (renamed from genivi-x-ppc64-generic.morph) | 2 | ||||
| -rw-r--r-- | genivi-x-x86_64-generic.morph | 12 | ||||
| -rw-r--r-- | gitlab-ci-runner.morph | 2 | ||||
| -rw-r--r-- | nodejs-system-x86_64.morph | 2 | ||||
| -rw-r--r-- | xfce-system.morph | 2 |
7 files changed, 5 insertions, 29 deletions
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-ppc64-generic.morph b/genivi-x-generic.morph index 1b845259..9ebea3e2 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 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 |