From a3781d3ad5aaeda64b0771914a4e56d1f278465b Mon Sep 17 00:00:00 2001
From: Paul Sherwood <paul.sherwood@codethink.co.uk>
Date: Thu, 5 Mar 2015 08:49:36 +0000
Subject: Make stage2-linux-api-headers and stage2-gawk dependencies explicit

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

Change-Id: I28f6840f49e571cb3f51ed18729639104f8346e1
---
 strata/build-essential.morph | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 0758fee8..f4d865ac 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
-- 
cgit v1.2.1