summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--base-system-x86_64-generic.morph8
-rw-r--r--build-essential.morph6
2 files changed, 7 insertions, 7 deletions
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index 3cd79ed6..3d5c45fa 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": "baserock/richardmaw/build-essential-changes-merge"
+ "ref": "master"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "baserock/richardmaw/build-essential-changes-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "baserock/richardmaw/build-essential-changes-merge"
+ "ref": "master"
},
{
"morph": "bsp-x86_64-generic",
"repo": "baserock:baserock/morphs",
- "ref": "baserock/richardmaw/build-essential-changes-merge"
+ "ref": "master"
}
],
"configuration-extensions": [
diff --git a/build-essential.morph b/build-essential.morph
index 631996d6..3fa11a15 100644
--- a/build-essential.morph
+++ b/build-essential.morph
@@ -47,7 +47,7 @@
{
"name": "stage2-zlib",
"repo": "upstream:zlib",
- "ref": "baserock/richardmaw/build-essential-changes-merge",
+ "ref": "baserock/build-essential",
"build-mode": "bootstrap",
"prefix": "/tools",
"build-depends": [
@@ -165,7 +165,7 @@
{
"name": "eglibc",
"repo": "upstream:eglibc2",
- "ref": "baserock/richardmaw/build-essential-changes-merge",
+ "ref": "baserock/2.15-build-essential",
"build-mode": "staging",
"prefix": "/usr",
"build-depends": [
@@ -261,7 +261,7 @@
{
"name": "gcc",
"repo": "upstream:gcc-tarball",
- "ref": "baserock/richardmaw/build-essential-changes-merge",
+ "ref": "baserock/build-essential",
"build-mode": "staging",
"prefix": "/usr",
"build-depends": [