From aed28005d38d2c0f5e64eaaf455bdd419d2453b2 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Thu, 25 Sep 2014 13:56:37 +0100
Subject: Use linux-api-headers from Linux 3.8

The 'make mrproper' command now requires GNU Bash, but since we start
from a clean Git checkout of linux.git we can just remove that from the
build command list.
---
 strata/armv7lhf-cross-toolchain.morph                             | 4 ++--
 .../armv7lhf-cross-linux-api-headers.morph                        | 1 -
 strata/build-essential.morph                                      | 8 ++++----
 strata/build-essential/linux-api-headers.morph                    | 1 -
 strata/build-essential/stage2-linux-api-headers.morph             | 1 -
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph
index 0e2f7922..c76ae537 100644
--- a/strata/armv7lhf-cross-toolchain.morph
+++ b/strata/armv7lhf-cross-toolchain.morph
@@ -13,8 +13,8 @@ chunks:
 - name: armv7lhf-cross-linux-api-headers
   morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
   repo: upstream:linux
-  ref: eff825d6e284eb0fb04b434429a3e3b2e10cabf8
-  unpetrify-ref: baserock/build-essential
+  ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
+  unpetrify-ref: baserock/v3.8
   build-depends: []
 - name: armv7lhf-cross-gcc-nolibc
   morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
index 351134b7..c2654419 100644
--- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
+++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
@@ -1,7 +1,6 @@
 name: armv7lhf-cross-linux-api-headers
 kind: chunk
 install-commands:
-- make mrproper
 - ARCH=arm make INSTALL_HDR_PATH=dest headers_install
 - |
   # Copy headers to the sysroot where the eglibc build will find them,
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 3918a13e..7886b610 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -58,8 +58,8 @@ chunks:
 - name: stage2-linux-api-headers
   morph: strata/build-essential/stage2-linux-api-headers.morph
   repo: upstream:linux
-  ref: eff825d6e284eb0fb04b434429a3e3b2e10cabf8
-  unpetrify-ref: baserock/build-essential
+  ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
+  unpetrify-ref: baserock/v3.8
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -181,8 +181,8 @@ chunks:
 - name: linux-api-headers
   morph: strata/build-essential/linux-api-headers.morph
   repo: upstream:linux
-  ref: eff825d6e284eb0fb04b434429a3e3b2e10cabf8
-  unpetrify-ref: baserock/build-essential
+  ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
+  unpetrify-ref: baserock/v3.8
   build-depends:
   - stage2-binutils
   - stage2-busybox
diff --git a/strata/build-essential/linux-api-headers.morph b/strata/build-essential/linux-api-headers.morph
index d28b0905..e1ff2638 100644
--- a/strata/build-essential/linux-api-headers.morph
+++ b/strata/build-essential/linux-api-headers.morph
@@ -1,7 +1,6 @@
 name: linux-api-headers
 kind: chunk
 install-commands:
-- make mrproper
 - ARCH=$(./morph-arch) make INSTALL_HDR_PATH=dest headers_install
 - install -d "$DESTDIR${PREFIX-/usr}/include"
 - cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
diff --git a/strata/build-essential/stage2-linux-api-headers.morph b/strata/build-essential/stage2-linux-api-headers.morph
index e7d1f8ed..5cbf2f05 100644
--- a/strata/build-essential/stage2-linux-api-headers.morph
+++ b/strata/build-essential/stage2-linux-api-headers.morph
@@ -1,7 +1,6 @@
 name: stage2-linux-api-headers
 kind: chunk
 install-commands:
-- make mrproper
 - |
   export ARCH=$(./morph-arch)
   make INSTALL_HDR_PATH=dest headers_install
-- 
cgit v1.2.1