diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-05-21 10:40:31 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-05-21 10:40:47 +0000 |
| commit | 6abe06f8372121412d77501e4f274adef7561994 (patch) | |
| tree | 7178c38bb0abdb753ed1bb8a814430c037f50f54 | |
| parent | 6be85f8c1de7423a13ef15c828b2e50516632afd (diff) | |
| parent | 42b2bba3de1bfac56ccc019dc56c3819fd8d6185 (diff) | |
| download | morphs-6abe06f8372121412d77501e4f274adef7561994.tar.gz | |
Merge remote-tracking branch 'origin/baserock/tiagogomes/btrfsa'
I verified that base and devel systems build on x86-64.
| -rw-r--r-- | foundation.morph | 9 | ||||
| -rw-r--r-- | tools.morph | 10 |
2 files changed, 9 insertions, 10 deletions
diff --git a/foundation.morph b/foundation.morph index 39e366d..0e2a803 100644 --- a/foundation.morph +++ b/foundation.morph @@ -100,11 +100,18 @@ ] }, { + "name": "lzo", + "repo": "upstream:lzo", + "ref": "baserock/morph", + "build-depends": [] + }, + { "name": "btrfs-progs", "repo": "upstream:btrfs-progs", "ref": "baserock/morph", "build-depends": [ - "attr" + "attr", + "lzo" ] }, { diff --git a/tools.morph b/tools.morph index 74a8c80..2faaca3 100644 --- a/tools.morph +++ b/tools.morph @@ -11,12 +11,6 @@ ], "chunks": [ { - "name": "lzo", - "repo": "upstream:lzo", - "ref": "baserock/morph", - "build-depends": [] - }, - { "name": "patch", "repo": "upstream:patch", "ref": "baserock/morph", @@ -87,9 +81,7 @@ "name": "distcc", "repo": "upstream:distcc", "ref": "baserock/morph", - "build-depends": [ - "lzo" - ] + "build-depends": [] }, { "name": "e2fsprogs", |