diff options
-rw-r--r-- | strata/genivi-foundation.morph | 12 | ||||
-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-- | 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 | 2 | ||||
-rw-r--r-- | systems/xfce-system.morph | 2 |
9 files changed, 7 insertions, 25 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.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/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 f44c91a1..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 diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph index eb4c51df..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 |