diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-01-28 15:08:16 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-01-28 15:08:16 +0000 |
| commit | 03432c2c33523965aadfe06c28c531b2cfe016ff (patch) | |
| tree | e5a76a87294a912345a7c3dd990f76a90cf68dae /devel-system-x86_32-generic.morph | |
| parent | d17d1b3a90158a421f4738e30a9f6c2eb55fe318 (diff) | |
| parent | ce7ff87138bfec755c0543ec2d0712574f1128b4 (diff) | |
| download | definitions-03432c2c33523965aadfe06c28c531b2cfe016ff.tar.gz | |
Merge remote-tracking branch 'origin/baserock/samthursfield/build-essential'
Conflicts:
core.morph
Diffstat (limited to 'devel-system-x86_32-generic.morph')
| -rw-r--r-- | devel-system-x86_32-generic.morph | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph index 99e23ef0..6c6b06ef 100644 --- a/devel-system-x86_32-generic.morph +++ b/devel-system-x86_32-generic.morph @@ -7,19 +7,24 @@ "disk-size": "2G", "strata": [ { - "morph": "bsp-x86_32-generic", + "morph": "build-essential", "repo": "baserock:baserock/morphs", - "ref": "master" + "ref": "baserock/samthursfield/build-essential" }, { - "morph": "foundation", + "morph": "core", + "repo": "baserock:baserock/morphs", + "ref": "baserock/samthursfield/build-essential" + }, + { + "morph": "bsp-x86_32-generic", "repo": "baserock:baserock/morphs", - "ref": "master" + "ref": "baserock/samthursfield/build-essential" }, { - "morph": "devel", + "morph": "tools", "repo": "baserock:baserock/morphs", - "ref": "master" + "ref": "baserock/samthursfield/build-essential" } ] } |