From e7ee5df7f5b3297a31e9814bde46ede032f98bf2 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Wed, 26 Mar 2014 15:15:26 +0000
Subject: Define a minimal x86_32 system

This minimal system is smaller than base, consisting of little more than
busybox, its dependent libraries and a kernel built with tools that
don't make it into the final system.
---
 base-system-x86_32-generic.morph    |  2 +-
 build-essential.morph               | 19 ++++++++++++++++---
 minimal-system-x86_32-generic.morph | 15 +++++++++++++++
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 minimal-system-x86_32-generic.morph

diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph
index a1eff551..e53b2d97 100644
--- a/base-system-x86_32-generic.morph
+++ b/base-system-x86_32-generic.morph
@@ -5,7 +5,7 @@ configuration-extensions:
 - simple-network
 - nfsboot
 - install-files
-description: The set of strata required to have a minimal system for a 32-bit x86
+description: The set of strata required to have a basic system for a 32-bit x86
   system.
 kind: system
 name: base-system-x86_32-generic
diff --git a/build-essential.morph b/build-essential.morph
index f4b46d9c..1c304dd8 100644
--- a/build-essential.morph
+++ b/build-essential.morph
@@ -31,6 +31,11 @@ description: |
   stage2-fhs-dirs.morph for details. Basically, /bin is a symlink to
   /tools/bin during stage 2 but in stage 3 it becomes a real directory
   again.
+products:
+- artifact: build-essential-minimal
+  include:
+  - fhs-dirs-.*
+  - busybox-.*
 chunks:
 - name: stage1-binutils
   repo: upstream:binutils-redhat
@@ -179,7 +184,7 @@ chunks:
   prefix: /usr
 - name: eglibc
   repo: upstream:eglibc2
-  ref: 43ee5d250ad47d2bee8ec17954efb7f22d2b804c
+  ref: baserock/richardmaw/S10786-finer-splitting
   unpetrify-ref: baserock/2.15-build-essential
   build-depends:
   - stage2-binutils
@@ -193,10 +198,14 @@ chunks:
   - stage2-reset-specs
   - linux-api-headers
   build-mode: staging
+  artifacts:
+    eglibc-gconv: build-essential-runtime
+    eglibc-libs: build-essential-minimal
+    eglibc-nss: build-essential-runtime
   prefix: /usr
 - name: zlib
   repo: upstream:zlib
-  ref: db3aed6856d7a23186844fdf93105cad2fcf2f2f
+  ref: baserock/richardmaw/S10786-finer-splitting
   unpetrify-ref: baserock/build-essential
   build-depends:
   - stage2-binutils
@@ -210,6 +219,8 @@ chunks:
   - stage2-reset-specs
   - eglibc
   build-mode: staging
+  artifacts:
+    zlib-libs: build-essential-minimal
   prefix: /usr
 - name: binutils
   repo: upstream:binutils-redhat
@@ -265,7 +276,7 @@ chunks:
   prefix: /usr
 - name: gcc
   repo: upstream:gcc-tarball
-  ref: dd78b627480ed8d3c135271cd627096ae76fa5fc
+  ref: baserock/richardmaw/S10786-finer-splitting
   unpetrify-ref: baserock/build-essential
   build-depends:
   - stage2-binutils
@@ -280,6 +291,8 @@ chunks:
   - eglibc
   - zlib
   build-mode: staging
+  artifacts:
+    gcc-libs: build-essential-minimal
   prefix: /usr
 - name: make
   repo: upstream:make
diff --git a/minimal-system-x86_32-generic.morph b/minimal-system-x86_32-generic.morph
new file mode 100644
index 00000000..f8e5d198
--- /dev/null
+++ b/minimal-system-x86_32-generic.morph
@@ -0,0 +1,15 @@
+arch: x86_32
+configuration-extensions:
+- set-hostname
+- simple-network
+- nfsboot
+- install-files
+description: The set of strata required to have a minimal system for a 32-bit x86
+  system.
+kind: system
+name: minimal-system-x86_32-generic
+strata:
+- morph: build-essential
+  artifacts:
+  - build-essential-minimal
+- morph: bsp-x86_32-generic
-- 
cgit v1.2.1