From 42b2bba3de1bfac56ccc019dc56c3819fd8d6185 Mon Sep 17 00:00:00 2001
From: Tiago Gomes <tiago.gomes@codethink.co.uk>
Date: Sat, 18 May 2013 23:50:56 +0000
Subject: Add lzo as a dependency to btrfs-progs

This also will require to move lzo from tools to foundation.
---
 base-system-x86_64-generic.morph |  2 +-
 foundation.morph                 |  9 ++++++++-
 tools.morph                      | 10 +---------
 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
@@ -99,12 +99,19 @@
                 "usbutils"
             ]
         },
+        {
+            "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
@@ -10,12 +10,6 @@
         }
     ],
     "chunks": [
-        {
-            "name": "lzo",
-            "repo": "upstream:lzo",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
         {
             "name": "patch",
             "repo": "upstream:patch",
@@ -87,9 +81,7 @@
             "name": "distcc",
             "repo": "upstream:distcc",
             "ref": "baserock/morph",
-            "build-depends": [
-                "lzo"
-            ]
+            "build-depends": []
         },
         {
             "name": "e2fsprogs",
-- 
cgit v1.2.1