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 /base-system-armv7-versatile.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 'base-system-armv7-versatile.morph')
| -rw-r--r-- | base-system-armv7-versatile.morph | 11 |
1 files changed, 8 insertions, 3 deletions
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" } |