From f086c91433ed59ef9c88b0bfc33b54f98bf65c53 Mon Sep 17 00:00:00 2001
From: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
Date: Wed, 11 Feb 2015 11:40:52 +0000
Subject: Move six to python core

Add python-core to all the systems/strata which depend on six.
---
 strata/core.morph                     | 6 ------
 strata/cross-bootstrap.morph          | 1 +
 strata/django.morph                   | 1 +
 strata/python-core.morph              | 5 +++++
 systems/installer-system-x86_64.morph | 2 ++
 systems/openstack-server.morph        | 2 ++
 systems/xfce-system.morph             | 2 ++
 7 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/strata/core.morph b/strata/core.morph
index 46fc03c3..d60e3baf 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -118,12 +118,6 @@ chunks:
   unpetrify-ref: libtool-2.4.5
   build-depends:
   - bash
-- name: six
-  repo: upstream:six
-  ref: 8cfbff6b764af86d825086fa1637aa009e90d75a
-  unpetrify-ref: 1.9.0
-  build-depends:
-  - cpython
 - name: gtk-doc-stub
   repo: upstream:gtk-doc-stub
   ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0
diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph
index 1ef06abc..8c8ff51f 100644
--- a/strata/cross-bootstrap.morph
+++ b/strata/cross-bootstrap.morph
@@ -3,6 +3,7 @@ kind: stratum
 description: The minimal development tools to build a baserock devel system
 build-depends:
 - morph: strata/core.morph
+- morph: strata/python-core.morph
 chunks:
 - name: groff
   morph: strata/cross-bootstrap/groff.morph
diff --git a/strata/django.morph b/strata/django.morph
index cde9fd41..5e81c3b3 100644
--- a/strata/django.morph
+++ b/strata/django.morph
@@ -3,6 +3,7 @@ kind: stratum
 description: Stratum with Django and its plugins and dependencies.
 build-depends:
 - morph: strata/foundation.morph
+- morph: strata/python-core.morph
 chunks:
 - name: django
   repo: github:django/django
diff --git a/strata/python-core.morph b/strata/python-core.morph
index ca07449f..409d6f17 100644
--- a/strata/python-core.morph
+++ b/strata/python-core.morph
@@ -20,3 +20,8 @@ chunks:
   ref: b83131779c701720a9ae9efae78996277d416269
   unpetrify-ref: v2.5.1
   build-depends: []
+- name: six
+  repo: upstream:six
+  ref: 8cfbff6b764af86d825086fa1637aa009e90d75a
+  unpetrify-ref: 1.9.0
+  build-depends: []
diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph
index 0b5e4709..8798182b 100644
--- a/systems/installer-system-x86_64.morph
+++ b/systems/installer-system-x86_64.morph
@@ -7,6 +7,8 @@ strata:
   morph: strata/build-essential.morph
 - name: core
   morph: strata/core.morph
+- name: python-core
+  morph: strata/python-core.morph
 - name: foundation
   morph: strata/foundation.morph
 - name: bsp-x86_64-generic
diff --git a/systems/openstack-server.morph b/systems/openstack-server.morph
index db5d5fe9..b3f342af 100644
--- a/systems/openstack-server.morph
+++ b/systems/openstack-server.morph
@@ -7,6 +7,8 @@ strata:
   morph: strata/build-essential.morph
 - name: core
   morph: strata/core.morph
+- name: python-core
+  morph: strata/python-core.morph
 - name: foundation
   morph: strata/foundation.morph
 - name: bsp-x86_64-generic
diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph
index 152bf16b..697ea52d 100644
--- a/systems/xfce-system.morph
+++ b/systems/xfce-system.morph
@@ -7,6 +7,8 @@ strata:
   morph: strata/build-essential.morph
 - name: core
   morph: strata/core.morph
+- name: python-core
+  morph: strata/python-core.morph
 - name: foundation
   morph: strata/foundation.morph
 - name: bsp-x86_64-generic
-- 
cgit v1.2.1