summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2013-02-08 16:19:07 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2013-02-25 15:23:52 +0000
commitb0a92067a62a292dc3f3016acd97496d3750d373 (patch)
tree91b31e8df819f800367faa45d040c8531a98d99a
parentaddfb51bc4392ce3e7cc33913175b5665ac284f5 (diff)
downloadmorphs-b0a92067a62a292dc3f3016acd97496d3750d373.tar.gz
Update refs for system branch
-rw-r--r--base-system-armv7-versatile.morph8
-rw-r--r--base-system-x86_32-generic.morph8
-rw-r--r--base-system-x86_64-generic.morph8
-rw-r--r--bsp-armv7-versatile.morph2
-rw-r--r--bsp-imx53.morph2
-rw-r--r--bsp-x86_32-generic.morph2
-rw-r--r--bsp-x86_64-generic.morph2
-rw-r--r--build-essential.morph36
-rw-r--r--build-essential.morph.yaml36
-rw-r--r--core.morph2
-rw-r--r--devel-system-armv7-versatile.morph10
-rw-r--r--devel-system-x86_32-generic.morph10
-rw-r--r--devel-system-x86_64-generic.morph10
-rw-r--r--foundation.morph2
-rw-r--r--tools.morph2
15 files changed, 70 insertions, 70 deletions
diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph
index 04db502..155061f 100644
--- a/base-system-armv7-versatile.morph
+++ b/base-system-armv7-versatile.morph
@@ -9,22 +9,22 @@
{
"morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "bsp-armv7-versatile",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
}
]
}
diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph
index 2e29dbe..7e4440e 100644
--- a/base-system-x86_32-generic.morph
+++ b/base-system-x86_32-generic.morph
@@ -9,22 +9,22 @@
{
"morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "bsp-x86_32-generic",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
}
]
}
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index 4ae4e71..6927b3c 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/samthursfield/build-essential-2"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "bsp-x86_64-generic",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
}
]
}
diff --git a/bsp-armv7-versatile.morph b/bsp-armv7-versatile.morph
index 6f5e4a1..8a20ddb 100644
--- a/bsp-armv7-versatile.morph
+++ b/bsp-armv7-versatile.morph
@@ -5,7 +5,7 @@
"build-depends": [
{
"repo": "baserock:baserock/morphs",
- "ref": "master",
+ "ref": "baserock/samthursfield/build-essential-2",
"morph": "core"
}
],
diff --git a/bsp-imx53.morph b/bsp-imx53.morph
index d8c668d..6a60707 100644
--- a/bsp-imx53.morph
+++ b/bsp-imx53.morph
@@ -5,7 +5,7 @@
"build-depends": [
{
"repo": "baserock:baserock/morphs",
- "ref": "master",
+ "ref": "baserock/samthursfield/build-essential-2",
"morph": "core"
}
],
diff --git a/bsp-x86_32-generic.morph b/bsp-x86_32-generic.morph
index 0636f27..4b23dc7 100644
--- a/bsp-x86_32-generic.morph
+++ b/bsp-x86_32-generic.morph
@@ -5,7 +5,7 @@
"build-depends": [
{
"repo": "baserock:baserock/morphs",
- "ref": "master",
+ "ref": "baserock/samthursfield/build-essential-2",
"morph": "core"
}
],
diff --git a/bsp-x86_64-generic.morph b/bsp-x86_64-generic.morph
index b984a13..655f16b 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/samthursfield/build-essential-2",
"morph": "core"
}
],
diff --git a/build-essential.morph b/build-essential.morph
index b44f51f..e53ead3 100644
--- a/build-essential.morph
+++ b/build-essential.morph
@@ -6,7 +6,7 @@
{
"name": "stage1-binutils",
"repo": "upstream:binutils-redhat",
- "ref": "baserock/build-essential",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "bootstrap",
"build-depends": [],
"prefix": "/toolchain"
@@ -14,7 +14,7 @@
{
"name": "stage1-gcc",
"repo": "upstream:gcc-tarball",
- "ref": "baserock/build-essential",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "bootstrap",
"build-depends": [],
"prefix": "/toolchain"
@@ -22,7 +22,7 @@
{
"name": "stage2-binutils",
"repo": "upstream:binutils-redhat",
- "ref": "baserock/build-essential",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "bootstrap",
"build-depends": [
"stage1-binutils",
@@ -32,7 +32,7 @@
{
"name": "stage2-busybox",
"repo": "upstream:busybox",
- "ref": "baserock/build-essential",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "bootstrap",
"build-depends": [
"stage1-binutils",
@@ -42,7 +42,7 @@
{
"name": "stage2-eglibc",
"repo": "upstream:eglibc2",
- "ref": "baserock/2.15-build-essential",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "bootstrap",
"build-depends": [
"stage1-binutils",
@@ -52,7 +52,7 @@
{
"name": "stage2-fhs-dirs",
"repo": "baserock:baserock/fhs-dirs",
- "ref": "master",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "bootstrap",
"build-depends": [
"stage1-binutils",
@@ -62,7 +62,7 @@
{
"name": "stage2-gawk",
"repo": "upstream:gawk",
- "ref": "baserock/build-essential",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "bootstrap",
"build-depends": [
"stage1-binutils",
@@ -72,7 +72,7 @@
{
"name": "stage2-gcc",
"repo": "upstream:gcc-tarball",
- "ref": "baserock/build-essential",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "bootstrap",
"build-depends": [
"stage1-binutils",
@@ -82,7 +82,7 @@
{
"name": "stage2-linux-api-headers",
"repo": "upstream:linux",
- "ref": "baserock/build-essential",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "bootstrap",
"build-depends": [
"stage1-binutils",
@@ -92,7 +92,7 @@
{
"name": "stage2-make",
"repo": "upstream:make",
- "ref": "baserock/build-essential",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "bootstrap",
"build-depends": [
"stage1-binutils",
@@ -102,7 +102,7 @@
{
"name": "binutils",
"repo": "upstream:binutils-redhat",
- "ref": "baserock/build-essential",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "staging",
"build-depends": [
"stage2-binutils",
@@ -118,7 +118,7 @@
{
"name": "busybox",
"repo": "upstream:busybox",
- "ref": "baserock/build-essential",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "staging",
"build-depends": [
"stage2-binutils",
@@ -150,7 +150,7 @@
{
"name": "fhs-dirs",
"repo": "baserock:baserock/fhs-dirs",
- "ref": "master",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "staging",
"build-depends": [
"stage2-binutils",
@@ -166,7 +166,7 @@
{
"name": "gawk",
"repo": "upstream:gawk",
- "ref": "baserock/build-essential",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "staging",
"build-depends": [
"stage2-binutils",
@@ -182,7 +182,7 @@
{
"name": "gcc",
"repo": "upstream:gcc-tarball",
- "ref": "baserock/build-essential",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "staging",
"build-depends": [
"stage2-binutils",
@@ -198,7 +198,7 @@
{
"name": "linux-api-headers",
"repo": "upstream:linux",
- "ref": "baserock/build-essential",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "staging",
"build-depends": [
"stage2-binutils",
@@ -214,7 +214,7 @@
{
"name": "make",
"repo": "upstream:make",
- "ref": "baserock/build-essential",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "staging",
"build-depends": [
"stage2-binutils",
@@ -230,7 +230,7 @@
{
"name": "ccache",
"repo": "upstream:ccache",
- "ref": "baserock/build-essential",
+ "ref": "baserock/samthursfield/build-essential-2",
"build-mode": "staging",
"build-depends": [
"binutils",
diff --git a/build-essential.morph.yaml b/build-essential.morph.yaml
index 469347b..b9cc1fb 100644
--- a/build-essential.morph.yaml
+++ b/build-essential.morph.yaml
@@ -11,14 +11,14 @@ chunks:
- name: stage1-binutils
repo: upstream:binutils-redhat
- ref: baserock/build-essential
+ ref: baserock/samthursfield/build-essential-2
build-mode: bootstrap
build-depends: []
prefix: /toolchain
- name: stage1-gcc
repo: upstream:gcc-tarball
- ref: baserock/build-essential
+ ref: baserock/samthursfield/build-essential-2
build-mode: bootstrap
build-depends: []
prefix: /toolchain
@@ -28,7 +28,7 @@ chunks:
- name: stage2-binutils
repo: upstream:binutils-redhat
- ref: baserock/build-essential
+ ref: baserock/samthursfield/build-essential-2
build-mode: bootstrap
build-depends:
- stage1-binutils
@@ -36,7 +36,7 @@ chunks:
- name: stage2-busybox
repo: upstream:busybox
- ref: baserock/build-essential
+ ref: baserock/samthursfield/build-essential-2
build-mode: bootstrap
build-depends:
- stage1-binutils
@@ -44,7 +44,7 @@ chunks:
- name: stage2-eglibc
repo: upstream:eglibc2
- ref: baserock/2.15-build-essential
+ ref: baserock/samthursfield/build-essential-2
build-mode: bootstrap
build-depends:
- stage1-binutils
@@ -52,7 +52,7 @@ chunks:
- name: stage2-fhs-dirs
repo: baserock:baserock/fhs-dirs
- ref: master
+ ref: baserock/samthursfield/build-essential-2
build-mode: bootstrap
build-depends:
- stage1-binutils
@@ -60,7 +60,7 @@ chunks:
- name: stage2-gawk
repo: upstream:gawk
- ref: baserock/build-essential
+ ref: baserock/samthursfield/build-essential-2
build-mode: bootstrap
build-depends:
- stage1-binutils
@@ -68,7 +68,7 @@ chunks:
- name: stage2-gcc
repo: upstream:gcc-tarball
- ref: baserock/build-essential
+ ref: baserock/samthursfield/build-essential-2
build-mode: bootstrap
build-depends:
- stage1-binutils
@@ -76,7 +76,7 @@ chunks:
- name: stage2-linux-api-headers
repo: upstream:linux
- ref: baserock/build-essential
+ ref: baserock/samthursfield/build-essential-2
build-mode: bootstrap
build-depends:
- stage1-binutils
@@ -84,7 +84,7 @@ chunks:
- name: stage2-make
repo: upstream:make
- ref: baserock/build-essential
+ ref: baserock/samthursfield/build-essential-2
build-mode: bootstrap
build-depends:
- stage1-binutils
@@ -96,7 +96,7 @@ chunks:
- name: binutils
repo: upstream:binutils-redhat
- ref: baserock/build-essential
+ ref: baserock/samthursfield/build-essential-2
build-mode: staging
build-depends:
- stage2-binutils
@@ -110,7 +110,7 @@ chunks:
- name: busybox
repo: upstream:busybox
- ref: baserock/build-essential
+ ref: baserock/samthursfield/build-essential-2
build-mode: staging
build-depends:
- stage2-binutils
@@ -138,7 +138,7 @@ chunks:
- name: fhs-dirs
repo: baserock:baserock/fhs-dirs
- ref: master
+ ref: baserock/samthursfield/build-essential-2
build-mode: staging
build-depends:
- stage2-binutils
@@ -152,7 +152,7 @@ chunks:
- name: gawk
repo: upstream:gawk
- ref: baserock/build-essential
+ ref: baserock/samthursfield/build-essential-2
build-mode: staging
build-depends:
- stage2-binutils
@@ -166,7 +166,7 @@ chunks:
- name: gcc
repo: upstream:gcc-tarball
- ref: baserock/build-essential
+ ref: baserock/samthursfield/build-essential-2
build-mode: staging
build-depends:
- stage2-binutils
@@ -180,7 +180,7 @@ chunks:
- name: linux-api-headers
repo: upstream:linux
- ref: baserock/build-essential
+ ref: baserock/samthursfield/build-essential-2
build-mode: staging
build-depends:
- stage2-binutils
@@ -194,7 +194,7 @@ chunks:
- name: make
repo: upstream:make
- ref: baserock/build-essential
+ ref: baserock/samthursfield/build-essential-2
build-mode: staging
build-depends:
- stage2-binutils
@@ -210,7 +210,7 @@ chunks:
- name: ccache
repo: upstream:ccache
- ref: baserock/build-essential
+ ref: baserock/samthursfield/build-essential-2
build-mode: staging
build-depends:
- binutils
diff --git a/core.morph b/core.morph
index 0238f3d..b717919 100644
--- a/core.morph
+++ b/core.morph
@@ -5,7 +5,7 @@
"build-depends": [
{
"repo": "baserock:baserock/morphs",
- "ref": "master",
+ "ref": "baserock/samthursfield/build-essential-2",
"morph": "build-essential"
}
],
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
index b10a52f..5e8df6f 100644
--- a/devel-system-armv7-versatile.morph
+++ b/devel-system-armv7-versatile.morph
@@ -9,27 +9,27 @@
{
"morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "bsp-armv7-versatile",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "tools",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
}
]
}
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index c0f4b87..827dac2 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -9,27 +9,27 @@
{
"morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "bsp-x86_32-generic",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "tools",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
}
]
}
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index 4872961..942abbe 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -9,27 +9,27 @@
{
"morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "bsp-x86_64-generic",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
},
{
"morph": "tools",
"repo": "baserock:baserock/morphs",
- "ref": "master"
+ "ref": "baserock/samthursfield/build-essential-2"
}
]
}
diff --git a/foundation.morph b/foundation.morph
index 88a03c2..16fcd40 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -5,7 +5,7 @@
"build-depends": [
{
"repo": "baserock:baserock/morphs",
- "ref": "master",
+ "ref": "baserock/samthursfield/build-essential-2",
"morph": "core"
}
],
diff --git a/tools.morph b/tools.morph
index a094dcd..bc3beef 100644
--- a/tools.morph
+++ b/tools.morph
@@ -5,7 +5,7 @@
"build-depends": [
{
"repo": "baserock:baserock/morphs",
- "ref": "master",
+ "ref": "baserock/samthursfield/build-essential-2",
"morph": "foundation"
}
],