summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-03-26 15:15:26 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-03-26 15:15:26 (GMT)
commit817a4a98e5fdb14283e1e809a3ba28f884f79292 (patch)
tree34f32317da5e12122991049df9d0ad71d5ee727a
parent0ed129b7644d080ddab8447b183e666623563e6b (diff)
downloaddefinitions-baserock/richardmaw/S10786-finer-splitting.tar.gz
Define a minimal x86_32 systembaserock/richardmaw/S10786-finer-splitting
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.
-rw-r--r--base-system-x86_32-generic.morph2
-rw-r--r--build-essential.morph22
-rw-r--r--minimal-system-x86_32-generic.morph15
3 files changed, 35 insertions, 4 deletions
diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph
index a1eff55..e53b2d9 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 387f2b8..eefec3a 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
@@ -165,7 +170,8 @@ chunks:
prefix: /usr
- name: eglibc
repo: upstream:eglibc2
- ref: baserock/2.15-build-essential
+ ref: baserock/richardmaw/S10786-finer-splitting
+ unpetrify-ref: baserock/2.15-build-essential
build-depends:
- stage2-binutils
- stage2-busybox
@@ -178,10 +184,15 @@ 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: baserock/build-essential
+ ref: baserock/richardmaw/S10786-finer-splitting
+ unpetrify-ref: baserock/build-essential
build-depends:
- stage2-binutils
- stage2-busybox
@@ -194,6 +205,8 @@ chunks:
- stage2-reset-specs
- eglibc
build-mode: staging
+ artifacts:
+ zlib-libs: build-essential-minimal
prefix: /usr
- name: binutils
repo: upstream:binutils-redhat
@@ -246,7 +259,8 @@ chunks:
prefix: /usr
- name: gcc
repo: upstream:gcc-tarball
- ref: baserock/build-essential
+ ref: baserock/richardmaw/S10786-finer-splitting
+ unpetrify-ref: baserock/build-essential
build-depends:
- stage2-binutils
- stage2-busybox
@@ -260,6 +274,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 0000000..f8e5d19
--- /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