summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-09-21 10:02:30 +0000
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2012-09-21 10:02:30 +0000
commit864d85f9cbae53f90cd91d3aeeed234f7553069a (patch)
tree676ae6a69b2df8ebbd89d5e3d37f6c50e9f528b7
parent4e6e1f3cb5214b7cad4e4fefdd62d2f3d5342560 (diff)
parent349cc5b8d34b42bfede5c71c05457e13ee98eccc (diff)
downloadmorphs-864d85f9cbae53f90cd91d3aeeed234f7553069a.tar.gz
Merge branch 'baserock/radiofree/gdb' of file:///src/ws/baserock/radiofree/gdb/baserock:morphs
-rw-r--r--devel.morph6
-rw-r--r--x86_64-generic-devel-system.morph2
2 files changed, 7 insertions, 1 deletions
diff --git a/devel.morph b/devel.morph
index 910b6e6..0e13237 100644
--- a/devel.morph
+++ b/devel.morph
@@ -399,6 +399,12 @@
"repo": "upstream:rsync",
"ref": "v3.0.9",
"build-depends": [ "make" ]
+ },
+ {
+ "name": "gdb",
+ "repo": "upstream:gdb",
+ "ref": "refs/heads/master",
+ "build-depends": [ "make" ]
}
]
}
diff --git a/x86_64-generic-devel-system.morph b/x86_64-generic-devel-system.morph
index 54a771c..092c166 100644
--- a/x86_64-generic-devel-system.morph
+++ b/x86_64-generic-devel-system.morph
@@ -19,7 +19,7 @@
{
"morph": "devel",
"repo": "baserock:morphs",
- "ref": "master"
+ "ref": "baserock/radiofree/gdb"
}
]
}