summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sherwood <paul.sherwood@codethink.co.uk>2015-03-05 08:49:36 (GMT)
committerPaul Sherwood <paul.sherwood@codethink.co.uk>2015-03-14 11:56:29 (GMT)
commit6ec4900e35b1cfdeec28d37f652fd171abd42e78 (patch)
treed6fa9c173e831389b1862eec8c353903f787a26e
parent3615cc776d0a926fc45ce280cfc6ee679d01366e (diff)
downloaddefinitions-baserock/ps/explicit-build-depends-in-build-essential.tar.gz
Make stage2-linux-api-headers and stage2-gawk dependencies explicitbaserock/ps/explicit-build-depends-in-build-essential
As discussed on the ML at [1] morph somehow infers that stage2-linux-api-headers is required for other stage2 components. This patch makes the inference explicit, which is more consistent, and should not affect any current builds or cache calculations. Also, it seems m4 requires stage2-gawk, so make that explicit too. [1] http://listmaster.pepperfish.net/pipermail/baserock-dev-baserock.org/2015-March/012425.html
-rw-r--r--strata/build-essential.morph9
1 files changed, 9 insertions, 0 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 0758fee..f4d865a 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -90,6 +90,7 @@ chunks:
build-depends:
- stage1-binutils
- stage1-gcc
+ - stage2-linux-api-headers
- stage2-glibc
build-mode: bootstrap
prefix: /tools
@@ -102,6 +103,7 @@ chunks:
build-depends:
- stage1-binutils
- stage1-gcc
+ - stage2-linux-api-headers
- stage2-glibc
build-mode: bootstrap
prefix: /tools
@@ -114,6 +116,7 @@ chunks:
build-depends:
- stage1-binutils
- stage1-gcc
+ - stage2-linux-api-headers
- stage2-glibc
build-mode: bootstrap
prefix: /tools
@@ -126,6 +129,7 @@ chunks:
build-depends:
- stage1-binutils
- stage1-gcc
+ - stage2-linux-api-headers
- stage2-glibc
- stage2-gcc-fixed-headers
- stage2-libstdc++
@@ -140,6 +144,7 @@ chunks:
build-depends:
- stage1-binutils
- stage1-gcc
+ - stage2-linux-api-headers
- stage2-glibc
build-mode: bootstrap
prefix: /tools
@@ -168,6 +173,7 @@ chunks:
build-depends:
- stage1-binutils
- stage1-gcc
+ - stage2-linux-api-headers
- stage2-glibc
build-mode: bootstrap
prefix: /tools
@@ -180,6 +186,7 @@ chunks:
build-depends:
- stage1-binutils
- stage1-gcc
+ - stage2-linux-api-headers
- stage2-glibc
build-mode: bootstrap
prefix: /tools
@@ -332,7 +339,9 @@ chunks:
- stage2-busybox
- stage2-glibc
- stage2-fhs-dirs
+ - stage2-gawk
- stage2-gcc
+ - stage2-linux-api-headers
- stage2-make
- stage2-reset-specs
- glibc