diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-12 17:34:35 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-11-12 17:34:35 +0000 |
| commit | b52344b8066d5262d78a303276a519786472c536 (patch) | |
| tree | 8f9815e6f94840981e2a2c833b26378e4ce4d902 | |
| parent | 91d7dc99fcf1029e8d09085a540f4c1d7915bb9f (diff) | |
| parent | 1eaaefd2158d97d3db9b723b5c9b859b2d13d489 (diff) | |
| download | morphs-b52344b8066d5262d78a303276a519786472c536.tar.gz | |
Merge branch 'liw/e2fsprogs' of git://git.baserock.org/baserock/morphs
We should add e2fsprogs to devel so that we can have a /boot as ext2
in the release after the next one.
| -rw-r--r-- | devel-system-x86_64-generic.morph | 2 | ||||
| -rw-r--r-- | devel.morph | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph index c9bcda6..da15586 100644 --- a/devel-system-x86_64-generic.morph +++ b/devel-system-x86_64-generic.morph @@ -19,7 +19,7 @@ { "morph": "devel", "repo": "baserock:baserock/morphs", - "ref": "master" + "ref": "liw/e2fsprogs" } ] } diff --git a/devel.morph b/devel.morph index f5e1a2c..b835c92 100644 --- a/devel.morph +++ b/devel.morph @@ -502,6 +502,14 @@ "build-depends": [ "make" ] - } + }, + { + "name": "e2fsprogs", + "repo": "upstream:e2fsprogs", + "ref": "master", + "build-depends": [ + "make" + ] + } ] } |