summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2013-08-23 14:49:45 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2013-08-23 14:49:45 +0000
commitb03b617cd879404eab1a4ce4ad851ba3d9f33de0 (patch)
tree1803c5abd87f52e575b4536c831b18140f6cd295
parent5af9cb51c4932583b57dd65d6055f0439ac2cb6a (diff)
parentdc673f69f81cf3bbd9422d746bd969fa86fe7e25 (diff)
downloaddefinitions-b03b617cd879404eab1a4ce4ad851ba3d9f33de0.tar.gz
Merge branch 'baserock/richardmaw/S8564/ro-staging-area'
Reviewed-by: Lars Wirzenius
-rw-r--r--build-essential.morph32
1 files changed, 32 insertions, 0 deletions
diff --git a/build-essential.morph b/build-essential.morph
index f4708e3d..a19963bb 100644
--- a/build-essential.morph
+++ b/build-essential.morph
@@ -62,6 +62,16 @@ chunks:
- stage1-gcc
- stage2-eglibc
+ - name: stage2-gcc-fixed-headers
+ repo: upstream:gcc-tarball
+ ref: baserock/build-essential
+ build-mode: bootstrap
+ prefix: /tools
+ build-depends:
+ - stage1-binutils
+ - stage1-gcc
+ - stage2-eglibc
+
- name: stage2-gcc
repo: upstream:gcc-tarball
ref: baserock/build-essential
@@ -71,6 +81,7 @@ chunks:
- stage1-binutils
- stage1-gcc
- stage2-eglibc
+ - stage2-gcc-fixed-headers
- name: stage2-busybox
repo: upstream:busybox
@@ -108,6 +119,17 @@ chunks:
- stage1-binutils
- stage1-gcc
- stage2-eglibc
+
+ - name: stage2-reset-specs
+ repo: upstream:eglibc2
+ ref: baserock/2.15-build-essential
+ build-mode: bootstrap
+ prefix: /tools
+ build-depends:
+ - stage1-binutils
+ - stage1-gcc
+ - stage2-linux-api-headers
+ - stage2-eglibc
# Stage 3: build the whole of build-essential again, this time using a
# staging area containing only the output of stage 2. The result of this
@@ -137,6 +159,7 @@ chunks:
- stage2-gcc
- stage2-linux-api-headers
- stage2-make
+ - stage2-reset-specs
- name: linux-api-headers
repo: upstream:linux
@@ -152,6 +175,7 @@ chunks:
- stage2-gcc
- stage2-linux-api-headers
- stage2-make
+ - stage2-reset-specs
- name: eglibc
repo: upstream:eglibc2
@@ -167,6 +191,7 @@ chunks:
- stage2-gcc
- stage2-linux-api-headers
- stage2-make
+ - stage2-reset-specs
- linux-api-headers
- name: zlib
@@ -183,6 +208,7 @@ chunks:
- stage2-gcc
- stage2-linux-api-headers
- stage2-make
+ - stage2-reset-specs
- eglibc
- name: binutils
@@ -199,6 +225,7 @@ chunks:
- stage2-gcc
- stage2-linux-api-headers
- stage2-make
+ - stage2-reset-specs
- eglibc
- zlib
@@ -216,6 +243,7 @@ chunks:
- stage2-gcc
- stage2-linux-api-headers
- stage2-make
+ - stage2-reset-specs
- eglibc
- name: gawk
@@ -232,6 +260,7 @@ chunks:
- stage2-gcc
- stage2-linux-api-headers
- stage2-make
+ - stage2-reset-specs
- eglibc
- name: gcc
@@ -248,6 +277,7 @@ chunks:
- stage2-gcc
- stage2-linux-api-headers
- stage2-make
+ - stage2-reset-specs
- eglibc
- zlib
@@ -265,6 +295,7 @@ chunks:
- stage2-gcc
- stage2-linux-api-headers
- stage2-make
+ - stage2-reset-specs
- eglibc
# Extras that need to be in build-essential but don't need bootstrapping.
@@ -283,5 +314,6 @@ chunks:
- stage2-gcc
- stage2-linux-api-headers
- stage2-make
+ - stage2-reset-specs
- eglibc
- zlib