diff options
author | Javier Jardón <jjardon@gnome.org> | 2014-10-29 19:11:43 +0000 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2014-10-29 19:12:02 +0000 |
commit | 959deb39b9c5fbdb1342f554fe5841ff6d7eb829 (patch) | |
tree | 8d2fc75afe442a2b7f4b58e873da84b6ae933250 | |
parent | 0feb008280268902bfb50e4c3bc11f26539ba176 (diff) | |
parent | 393ba5011f775fb95b0d3a046c959944bfa62d13 (diff) | |
download | definitions-959deb39b9c5fbdb1342f554fe5841ff6d7eb829.tar.gz |
Merge branch 'baserock/jjardon/clean_genivi'
Reviewed-By: Paul Sherwood <paul.sherwood@codethink.co.uk>
-rw-r--r-- | strata/genivi-foundation.morph | 12 | ||||
-rw-r--r-- | strata/genivi-wayland-generic.morph | 15 | ||||
-rw-r--r-- | strata/genivi-x-generic.morph | 13 | ||||
-rw-r--r-- | strata/genivi-x-generic/layer_management.morph | 8 | ||||
-rw-r--r-- | strata/genivi.morph | 8 | ||||
-rw-r--r-- | strata/genivi/linuxquota.morph (renamed from strata/genivi-foundation/linuxquota.morph) | 0 | ||||
-rw-r--r-- | strata/xfce.morph | 1 | ||||
-rw-r--r-- | systems/devel-system-x86_64-vagrant.morph | 2 | ||||
-rw-r--r-- | systems/genivi-baseline-system-armv7lhf-jetson.morph | 2 | ||||
-rw-r--r-- | systems/genivi-baseline-system-armv7lhf-versatile.morph | 2 | ||||
-rw-r--r-- | systems/genivi-baseline-system-x86_64-generic.morph | 2 | ||||
-rw-r--r-- | systems/gitlab-ci-runner.morph | 4 | ||||
-rw-r--r-- | systems/xfce-system.morph | 4 |
13 files changed, 7 insertions, 66 deletions
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-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: [] 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/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-foundation/linuxquota.morph b/strata/genivi/linuxquota.morph index 826696ad..826696ad 100644 --- a/strata/genivi-foundation/linuxquota.morph +++ b/strata/genivi/linuxquota.morph 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: diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index 6a53d37b..85bbe90c 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -12,8 +12,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: genivi-foundation - morph: strata/genivi-foundation.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: tools diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 250b431b..39f05b4f 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -9,8 +9,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: genivi-foundation - morph: strata/genivi-foundation.morph - name: bsp-jetson-genivi morph: strata/bsp-jetson-genivi.morph - name: connectivity diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index 52f04234..ccc1419d 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -9,8 +9,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: genivi-foundation - morph: strata/genivi-foundation.morph - name: bsp-armv7-versatile morph: strata/bsp-armv7-versatile.morph - name: connectivity diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index a5646a63..883c0efe 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -9,8 +9,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: genivi-foundation - morph: strata/genivi-foundation.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: connectivity diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph index 0f9e296c..919b3647 100644 --- a/systems/gitlab-ci-runner.morph +++ b/systems/gitlab-ci-runner.morph @@ -9,8 +9,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: genivi-foundation - morph: strata/genivi-foundation.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: connectivity @@ -27,8 +25,6 @@ strata: morph: strata/multimedia.morph - name: genivi morph: strata/genivi.morph -- name: genivi-x-generic - morph: strata/genivi-x-generic.morph - name: tools morph: strata/tools.morph - name: virtualization diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph index 0c53d7c2..1a2f8a97 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -9,8 +9,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: genivi-foundation - morph: strata/genivi-foundation.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: connectivity @@ -27,8 +25,6 @@ strata: morph: strata/multimedia.morph - name: genivi morph: strata/genivi.morph -- name: genivi-x-generic - morph: strata/genivi-x-generic.morph - name: gtk2 morph: strata/gtk2.morph - name: tools |