diff options
| -rw-r--r-- | base-system-armv7-versatile.morph | 6 | ||||
| -rw-r--r-- | base-system-x86_32-generic.morph | 6 | ||||
| -rw-r--r-- | base-system-x86_64-generic.morph | 6 | ||||
| -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 | ||||
| -rw-r--r-- | bsp-armv7-versatile.morph | 2 | ||||
| -rw-r--r-- | bsp-imx53.morph | 2 | ||||
| -rw-r--r-- | bsp-x86_32-generic.morph | 2 | ||||
| -rw-r--r-- | bsp-x86_64-generic.morph | 2 | ||||
| -rw-r--r-- | devel-system-armv7-versatile.morph | 8 | ||||
| -rw-r--r-- | devel-system-x86_32-generic.morph | 8 | ||||
| -rw-r--r-- | devel-system-x86_64-generic.morph | 8 | ||||
| -rw-r--r-- | foundation.morph | 4 | ||||
| -rw-r--r-- | tools.morph | 2 |
16 files changed, 46 insertions, 40 deletions
diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph index 66f7488a..04db502d 100644 --- a/base-system-armv7-versatile.morph +++ b/base-system-armv7-versatile.morph @@ -14,17 +14,17 @@ { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" }, { "morph": "bsp-armv7-versatile", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" } ] } diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph index b8b2f6c4..23f518d1 100644 --- a/base-system-x86_32-generic.morph +++ b/base-system-x86_32-generic.morph @@ -14,17 +14,17 @@ { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" }, { "morph": "bsp-x86_32-generic", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" } ] } diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph index b3c442ea..c41be08c 100644 --- a/base-system-x86_64-generic.morph +++ b/base-system-x86_64-generic.morph @@ -14,17 +14,17 @@ { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" }, { "morph": "bsp-x86_64-generic", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" } ] } 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" }, diff --git a/bsp-armv7-versatile.morph b/bsp-armv7-versatile.morph index 4048a867..6f5e4a1c 100644 --- a/bsp-armv7-versatile.morph +++ b/bsp-armv7-versatile.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core", + "ref": "master", "morph": "core" } ], diff --git a/bsp-imx53.morph b/bsp-imx53.morph index 7b7bd064..d8c668da 100644 --- a/bsp-imx53.morph +++ b/bsp-imx53.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core", + "ref": "master", "morph": "core" } ], diff --git a/bsp-x86_32-generic.morph b/bsp-x86_32-generic.morph index afbc9cfa..0636f273 100644 --- a/bsp-x86_32-generic.morph +++ b/bsp-x86_32-generic.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core", + "ref": "master", "morph": "core" } ], diff --git a/bsp-x86_64-generic.morph b/bsp-x86_64-generic.morph index fb95c375..b984a138 100644 --- a/bsp-x86_64-generic.morph +++ b/bsp-x86_64-generic.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core", + "ref": "master", "morph": "core" } ], diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph index 1a550a02..fb3a30c5 100644 --- a/devel-system-armv7-versatile.morph +++ b/devel-system-armv7-versatile.morph @@ -14,22 +14,22 @@ { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" }, { "morph": "bsp-armv7-versatile", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" }, { "morph": "tools", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" } ] } diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph index 84ebf795..ed67df89 100644 --- a/devel-system-x86_32-generic.morph +++ b/devel-system-x86_32-generic.morph @@ -14,22 +14,22 @@ { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" }, { "morph": "bsp-x86_32-generic", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" }, { "morph": "tools", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" } ] } diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph index ad185747..ebaf46ef 100644 --- a/devel-system-x86_64-generic.morph +++ b/devel-system-x86_64-generic.morph @@ -14,22 +14,22 @@ { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" }, { "morph": "bsp-x86_64-generic", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" }, { "morph": "tools", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core" + "ref": "master" } ] } diff --git a/foundation.morph b/foundation.morph index e1d121cf..f13cc85a 100644 --- a/foundation.morph +++ b/foundation.morph @@ -1,11 +1,11 @@ { "name": "foundation", "kind": "stratum", - "description": "Non-build components of a Baserock base system", + "description": "Basic userland runtime system", "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core", + "ref": "master", "morph": "core" } ], diff --git a/tools.morph b/tools.morph index 5e7eaf46..e337bf31 100644 --- a/tools.morph +++ b/tools.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/minimal-core", + "ref": "master", "morph": "foundation" } ], |