From 19c2203497cd8130bb4dc32df5eefc186bdd7df8 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Tue, 29 Jan 2013 12:10:44 +0000
Subject: Bootstrap: add pyyaml and use core stratum

Morph now requires yaml, so pyyaml must be available.
Bootstrap morphologies weren't updated when the build-essential
work was done. foundation and devel no longer exist, so use core instead.
---
 bootstrap-pass1.morph                | 8 ++++++++
 bootstrap-pass2.morph                | 8 ++++++++
 bootstrap-pass3-imx53.morph          | 7 +------
 bootstrap-pass3-x86_64-generic.morph | 7 +------
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/bootstrap-pass1.morph b/bootstrap-pass1.morph
index 2fd15f8a..3c9a4e6b 100644
--- a/bootstrap-pass1.morph
+++ b/bootstrap-pass1.morph
@@ -163,6 +163,14 @@
             "build-depends": [
                 "gcc-bootstrap-pass1-2"
             ]
+        },
+        {   
+            "name": "pyyaml",
+            "repo": "upstream:pyyaml",
+            "ref": "baserock/morph",
+            "build-depends": [
+                "cpython"
+            ]
         }
     ]
 }
diff --git a/bootstrap-pass2.morph b/bootstrap-pass2.morph
index 31660415..08e102a5 100644
--- a/bootstrap-pass2.morph
+++ b/bootstrap-pass2.morph
@@ -284,6 +284,14 @@
             "build-depends": [
                 "glib"
             ]
+        },
+        {
+            "name": "pyyaml",
+            "repo": "upstream:pyyaml",
+            "ref": "baserock/morph",
+            "build-depends": [
+                "cpython"
+            ]
         }
     ]
 }
diff --git a/bootstrap-pass3-imx53.morph b/bootstrap-pass3-imx53.morph
index facd7645..66a53a0f 100644
--- a/bootstrap-pass3-imx53.morph
+++ b/bootstrap-pass3-imx53.morph
@@ -4,12 +4,7 @@
     "kind": "stratum",
     "build-depends": [
         {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "devel",
+            "morph": "core",
             "repo": "baserock:baserock/morphs",
             "ref": "master"
         },
diff --git a/bootstrap-pass3-x86_64-generic.morph b/bootstrap-pass3-x86_64-generic.morph
index 78da758a..bdd8d147 100644
--- a/bootstrap-pass3-x86_64-generic.morph
+++ b/bootstrap-pass3-x86_64-generic.morph
@@ -4,12 +4,7 @@
     "kind": "stratum",
     "build-depends": [
         {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "devel",
+            "morph": "core",
             "repo": "baserock:baserock/morphs",
             "ref": "master"
         },
-- 
cgit v1.2.1