summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2013-05-18 23:50:56 +0000
committerTiago Gomes <tiago.gomes@codethink.co.uk>2013-05-20 17:55:39 +0100
commit42b2bba3de1bfac56ccc019dc56c3819fd8d6185 (patch)
tree6dfab8617a201c295a9a082448c942d03f36221a
parent6be85f8c1de7423a13ef15c828b2e50516632afd (diff)
downloadmorphs-42b2bba3de1bfac56ccc019dc56c3819fd8d6185.tar.gz
Add lzo as a dependency to btrfs-progs
This also will require to move lzo from tools to foundation.
-rw-r--r--base-system-x86_64-generic.morph2
-rw-r--r--foundation.morph9
-rw-r--r--tools.morph10
3 files changed, 10 insertions, 11 deletions
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index 3d5c45f..aedb753 100644
--- a/base-system-x86_64-generic.morph
+++ b/base-system-x86_64-generic.morph
@@ -19,7 +19,7 @@
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/tiagogomes/btrfsa"
},
{
"morph": "bsp-x86_64-generic",
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",