diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-01-29 12:10:44 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-01-29 12:10:44 +0000 |
| commit | 19c2203497cd8130bb4dc32df5eefc186bdd7df8 (patch) | |
| tree | aa49c5f08f658d1cde926f209283607c7b428f93 | |
| parent | b8b6e89d37a622c3276cba31d06de1fe720a108a (diff) | |
| download | morphs-19c2203497cd8130bb4dc32df5eefc186bdd7df8.tar.gz | |
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.
| -rw-r--r-- | bootstrap-pass1.morph | 8 | ||||
| -rw-r--r-- | bootstrap-pass2.morph | 8 | ||||
| -rw-r--r-- | bootstrap-pass3-imx53.morph | 7 | ||||
| -rw-r--r-- | 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 2fd15f8..3c9a4e6 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 3166041..08e102a 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 facd764..66a53a0 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 78da758..bdd8d14 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" }, |