From e93cc7309bc019ef97c2cf5c5d37ec576fcf92ad Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
Date: Mon, 18 Feb 2013 15:19:08 +0000
Subject: Reference baserock/morph instead of master branch in chunks

This is useful so that we can enable Lorry Controller on
trove.baserock.org, which will mirror latest upstream changes
continuously, but not have our builds break randomly all the
time.
---
 core.morph       |  6 +++---
 foundation.morph | 10 +++++-----
 nfs.morph        |  2 +-
 tools.morph      | 20 ++++++++++----------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/core.morph b/core.morph
index 2279b91a..0238f3d5 100644
--- a/core.morph
+++ b/core.morph
@@ -106,7 +106,7 @@
         {
             "name": "error-perl-tarball",
             "repo": "upstream:error-perl-tarball",
-            "ref": "master",
+            "ref": "baserock/morph",
             "build-depends": [
                 "perl"
             ]
@@ -130,7 +130,7 @@
         {
             "name": "libxml2",
             "repo": "upstream:libxml2",
-            "ref": "master",
+            "ref": "baserock/morph",
             "build-depends": [
                 "autoconf",
                 "automake",
@@ -179,7 +179,7 @@
         {
             "name": "XML-Parser",
             "repo": "upstream:XML-Parser",
-            "ref": "master",
+            "ref": "baserock/morph",
             "build-depends": [
                 "libexpat",
                 "libxml2",
diff --git a/foundation.morph b/foundation.morph
index f13cc85a..c49dba11 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -39,13 +39,13 @@
         {
             "name": "libffi",
             "repo": "upstream:libffi",
-            "ref": "master",
+            "ref": "baserock/morph",
             "build-depends": []
         },
         {
             "name": "libusbx",
             "repo": "upstream:libusbx",
-            "ref": "master",
+            "ref": "baserock/morph",
             "build-depends": []
         },
         {
@@ -65,7 +65,7 @@
         {
             "name": "glib",
             "repo": "upstream:glib",
-            "ref": "master",
+            "ref": "baserock/morph",
             "build-depends": [
                 "libffi"
             ]
@@ -119,7 +119,7 @@
         {
             "name": "gtk-doc-stub",
             "repo": "upstream:gtk-doc-stub",
-            "ref": "master",
+            "ref": "baserock/morph",
             "build-depends": []
         },
         {
@@ -131,7 +131,7 @@
         {
             "name": "libxslt",
             "repo": "upstream:libxslt",
-            "ref": "master",
+            "ref": "baserock/master",
             "build-depends": []
         },
         {
diff --git a/nfs.morph b/nfs.morph
index c85877f5..ee6744ea 100644
--- a/nfs.morph
+++ b/nfs.morph
@@ -12,7 +12,7 @@
         {
             "name": "sqlite3",
             "repo": "upstream:sqlite3",
-            "ref": "master",
+            "ref": "baserock/morph",
             "build-depends": []
         },
         {
diff --git a/tools.morph b/tools.morph
index e337bf31..a094dcd1 100644
--- a/tools.morph
+++ b/tools.morph
@@ -13,7 +13,7 @@
         {
             "name": "lzo",
             "repo": "upstream:lzo",
-            "ref": "master",
+            "ref": "baserock/morph",
             "build-depends": []
         },
         {
@@ -61,7 +61,7 @@
         {
             "name": "cliapp",
             "repo": "upstream:cliapp",
-            "ref": "trunk",
+            "ref": "baserock/morph",
             "build-depends": [
                 "python-coverage-test-runner"
             ]
@@ -78,7 +78,7 @@
         {
             "name": "cmake",
             "repo": "upstream:cmake",
-            "ref": "master",
+            "ref": "baserock/morph",
             "build-depends": []
         },
         {
@@ -92,7 +92,7 @@
         {
             "name": "distcc",
             "repo": "upstream:distcc",
-            "ref": "master",
+            "ref": "baserock/morph",
             "build-depends": [
                 "lzo"
             ]
@@ -100,25 +100,25 @@
         {
             "name": "e2fsprogs",
             "repo": "upstream:e2fsprogs",
-            "ref": "master",
+            "ref": "baserock/morph",
             "build-depends": []
         },
         {
             "name": "gdb",
             "repo": "upstream:gdb",
-            "ref": "refs/heads/master",
+            "ref": "baserock/morph",
             "build-depends": []
         },
         {
             "name": "less",
             "repo": "upstream:less",
-            "ref": "master",
+            "ref": "baserock/morph",
             "build-depends": []
         },
         {
             "name": "linux-user-chroot",
             "repo": "upstream:linux-user-chroot",
-            "ref": "master",
+            "ref": "baserock/morph",
             "build-depends": []
         },
         {
@@ -141,7 +141,7 @@
         {
             "name": "pv",
             "repo": "upstream:pv",
-            "ref": "master",
+            "ref": "baserock/morph",
             "build-depends": []
         },
         {
@@ -153,7 +153,7 @@
         {
             "name": "strace",
             "repo": "upstream:strace",
-            "ref": "master",
+            "ref": "baserock/morph",
             "build-depends": []
         },
         {
-- 
cgit v1.2.1