summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2013-05-20 17:07:41 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2013-05-22 10:51:31 +0000
commite0aa44348d6cd81f430e0ecf55bd2850727964fd (patch)
treeb8af6b463270dffda750c72eba381e771a50ad03
parentaf5d7e48dab76f7686f446905df02eafe0413901 (diff)
downloadmorphs-e0aa44348d6cd81f430e0ecf55bd2850727964fd.tar.gz
Branch the base system
-rw-r--r--base-system-x86_64-generic.morph8
-rw-r--r--bsp-x86_64-generic.morph2
-rw-r--r--build-essential.morph6
-rw-r--r--core.morph2
-rw-r--r--foundation.morph2
5 files changed, 10 insertions, 10 deletions
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index 3d5c45f..3cd79ed 100644
--- a/base-system-x86_64-generic.morph
+++ b/base-system-x86_64-generic.morph
@@ -9,22 +9,22 @@
{
"morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/richardmaw/build-essential-changes-merge"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/richardmaw/build-essential-changes-merge"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/richardmaw/build-essential-changes-merge"
},
{
"morph": "bsp-x86_64-generic",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/richardmaw/build-essential-changes-merge"
}
],
"configuration-extensions": [
diff --git a/bsp-x86_64-generic.morph b/bsp-x86_64-generic.morph
index b984a13..50f3c74 100644
--- a/bsp-x86_64-generic.morph
+++ b/bsp-x86_64-generic.morph
@@ -5,7 +5,7 @@
"build-depends": [
{
"repo": "baserock:baserock/morphs",
- "ref": "master",
+ "ref": "baserock/richardmaw/build-essential-changes-merge",
"morph": "core"
}
],
diff --git a/build-essential.morph b/build-essential.morph
index 3fa11a1..631996d 100644
--- a/build-essential.morph
+++ b/build-essential.morph
@@ -47,7 +47,7 @@
{
"name": "stage2-zlib",
"repo": "upstream:zlib",
- "ref": "baserock/build-essential",
+ "ref": "baserock/richardmaw/build-essential-changes-merge",
"build-mode": "bootstrap",
"prefix": "/tools",
"build-depends": [
@@ -165,7 +165,7 @@
{
"name": "eglibc",
"repo": "upstream:eglibc2",
- "ref": "baserock/2.15-build-essential",
+ "ref": "baserock/richardmaw/build-essential-changes-merge",
"build-mode": "staging",
"prefix": "/usr",
"build-depends": [
@@ -261,7 +261,7 @@
{
"name": "gcc",
"repo": "upstream:gcc-tarball",
- "ref": "baserock/build-essential",
+ "ref": "baserock/richardmaw/build-essential-changes-merge",
"build-mode": "staging",
"prefix": "/usr",
"build-depends": [
diff --git a/core.morph b/core.morph
index 30dc161..83cb956 100644
--- a/core.morph
+++ b/core.morph
@@ -5,7 +5,7 @@
"build-depends": [
{
"repo": "baserock:baserock/morphs",
- "ref": "master",
+ "ref": "baserock/richardmaw/build-essential-changes-merge",
"morph": "build-essential"
}
],
diff --git a/foundation.morph b/foundation.morph
index 0e2a803..e22ad46 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -5,7 +5,7 @@
"build-depends": [
{
"repo": "baserock:baserock/morphs",
- "ref": "master",
+ "ref": "baserock/richardmaw/build-essential-changes-merge",
"morph": "core"
}
],