diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-02-11 10:08:51 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-02-11 10:08:51 +0000 |
commit | b99d414e163b5f01a132e81b0ed8b9f2af821c04 (patch) | |
tree | 90251ee9f1e2e30fa78f41bbf422bfb9e3f6174a | |
parent | 540aa3405c5bcd54ed0e15c382607a3841ed8296 (diff) | |
parent | 61c8e415cc1c53641f24706b22dab7dd1718c34d (diff) | |
download | definitions-b99d414e163b5f01a132e81b0ed8b9f2af821c04.tar.gz |
Merge branch 'sam/more-python-core'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Reviewed-By: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
-rw-r--r-- | strata/morph-utils.morph | 1 | ||||
-rw-r--r-- | strata/trove.morph | 1 | ||||
-rw-r--r-- | systems/build-system-armv7lhf-highbank.morph | 2 | ||||
-rw-r--r-- | systems/build-system-armv7lhf-jetson.morph | 2 | ||||
-rw-r--r-- | systems/build-system-ppc64.morph | 2 | ||||
-rw-r--r-- | systems/build-system-x86_32-chroot.morph | 2 | ||||
-rw-r--r-- | systems/build-system-x86_32.morph | 2 | ||||
-rw-r--r-- | systems/build-system-x86_64-chroot.morph | 2 | ||||
-rw-r--r-- | systems/build-system-x86_64.morph | 2 | ||||
-rw-r--r-- | systems/trove-system-x86_64.morph | 2 |
10 files changed, 18 insertions, 0 deletions
diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 95d9807c..4e28f48a 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -2,6 +2,7 @@ name: morph-utils kind: stratum build-depends: - morph: strata/core.morph +- morph: strata/python-core.morph chunks: - name: python-ttystatus morph: strata/morph-utils/python-ttystatus.morph diff --git a/strata/trove.morph b/strata/trove.morph index b3d95533..aeea4721 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -2,6 +2,7 @@ name: trove kind: stratum description: Trove software build-depends: +- morph: strata/python-core.morph - morph: strata/tools.morph - morph: strata/morph-utils.morph - morph: strata/pcre-utils.morph diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index 3c41fa1e..cf37f5e6 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -9,6 +9,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph +- name: python-core + morph: strata/python-core.morph - name: bsp-armv7-highbank morph: strata/bsp-armv7-highbank.morph - name: tools diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index 5a45c7c8..846681a2 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -9,6 +9,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph +- name: python-core + morph: strata/python-core.morph - name: bsp-jetson morph: strata/bsp-jetson.morph - name: tools diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index 1f49c1a7..8be51f90 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -9,6 +9,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph +- name: python-core + morph: strata/python-core.morph - name: bsp-ppc64-generic morph: strata/bsp-ppc64-generic.morph - name: tools diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index 33dad794..f74ce07d 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -9,6 +9,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph +- name: python-core + morph: strata/python-core.morph - name: tools morph: strata/tools.morph - name: morph-utils diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index 019a0afa..5bbe38f8 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -9,6 +9,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph +- name: python-core + morph: strata/python-core.morph - name: bsp-x86_32-generic morph: strata/bsp-x86_32-generic.morph - name: tools diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index 97b317ad..1ca20c00 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -9,6 +9,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph +- name: python-core + morph: strata/python-core.morph - name: tools morph: strata/tools.morph - name: morph-utils diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index a255ba8b..2bf25493 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -9,6 +9,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph +- name: python-core + morph: strata/python-core.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: tools diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index 0d633f41..580f53f7 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -11,6 +11,8 @@ strata: morph: strata/foundation.morph - name: core morph: strata/core.morph +- name: python-core + morph: strata/python-core.morph - name: tools morph: strata/tools.morph - name: morph-utils |