From 4de377ebd6877abeb312954dda001fb1f45b14df Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Thu, 24 Jan 2013 11:49:48 +0000 Subject: Reorganise morphologies for build-essential This patch rewrites the Baserock morphologies so that they can be built using a minimal "build-essential" staging filler, as described in my previous patch mail. The Baserock system is split up into three strata: - build-essential: the minimum set of tools that can rebuild itself (from tarballs) - core: the remaining set of components necessary to produce a Baserock system which can rebuild itself from source - tools: auxiliary development tools and libraries The 'build-essential' stratum does not specify any build dependencies, because it expects to be built with a staging filler containing itself. In effect, the stratum has a circular dependency on itself, which we solve by using a staging filler. The 'core' stratum depends on only on 'build-essential'. This ensures that all build dependencies between chunks in 'core' are explicit. These strata can also be built with the staging filler from the water-bomb release. The distinction between a base and a devel system is no longer defined by the 'foundation' and 'devel' strata (in practice these had various hidden build dependencies between each other). The size of a base system is larger than before, due to more development tools being in 'core'. --- base-system-armv7-versatile.morph | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'base-system-armv7-versatile.morph') diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph index 9f49ea8b..7aafc39b 100644 --- a/base-system-armv7-versatile.morph +++ b/base-system-armv7-versatile.morph @@ -7,12 +7,17 @@ "disk-size": "2G", "strata": [ { - "morph": "bsp-armv7-versatile", + "morph": "build-essential", "repo": "baserock:baserock/morphs", - "ref": "master" + "ref": "baserock/samthursfield/build-essential" + }, + { + "morph": "core", + "repo": "baserock:baserock/morphs", + "ref": "baserock/samthursfield/build-essential" }, { - "morph": "foundation", + "morph": "bsp-armv7-versatile", "repo": "baserock:baserock/morphs", "ref": "master" } -- cgit v1.2.1