summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@gmail.com>2015-03-04 11:28:15 (GMT)
committerRichard Maw <richard.maw@gmail.com>2015-03-04 11:28:15 (GMT)
commitd0ecc6cb2bd5a6420e5ddc2bb5e335a285995d26 (patch)
treee4c9d77a763c365687670595d99a3bc99665f7b6
parent4441782c2fa7e07198d5862ab6c73ea308c82f95 (diff)
parent399896b16e276f7c1a43c5c7efc71cf669cabb5f (diff)
downloaddefinitions-d0ecc6cb2bd5a6420e5ddc2bb5e335a285995d26.tar.gz
Merge branch 'baserock/richardmaw/shrink-initramfs'
Reviewed-by: Sam Thursfield Reviewed-by: Pedro Alvarez
-rw-r--r--strata/bsp-x86_32-generic/syslinux.morph8
-rw-r--r--strata/bsp-x86_64-generic/syslinux.morph4
-rw-r--r--strata/bsp-x86_both-tools/syslinux.morph8
-rw-r--r--strata/build-essential/gcc.morph16
4 files changed, 32 insertions, 4 deletions
diff --git a/strata/bsp-x86_32-generic/syslinux.morph b/strata/bsp-x86_32-generic/syslinux.morph
index c0f1580..4570865 100644
--- a/strata/bsp-x86_32-generic/syslinux.morph
+++ b/strata/bsp-x86_32-generic/syslinux.morph
@@ -1,8 +1,12 @@
name: syslinux
kind: chunk
+products:
+- artifact: syslinux-devel
+ include:
+ - (usr/)?share/syslinux/com32.*
build-commands:
- make clean
-- make
-- make installer
+- make NO_WERROR=1
+- make NO_WERROR=1 installer
install-commands:
- make INSTALLROOT="$DESTDIR" install
diff --git a/strata/bsp-x86_64-generic/syslinux.morph b/strata/bsp-x86_64-generic/syslinux.morph
index 43356e3..4570865 100644
--- a/strata/bsp-x86_64-generic/syslinux.morph
+++ b/strata/bsp-x86_64-generic/syslinux.morph
@@ -1,5 +1,9 @@
name: syslinux
kind: chunk
+products:
+- artifact: syslinux-devel
+ include:
+ - (usr/)?share/syslinux/com32.*
build-commands:
- make clean
- make NO_WERROR=1
diff --git a/strata/bsp-x86_both-tools/syslinux.morph b/strata/bsp-x86_both-tools/syslinux.morph
index c0f1580..4570865 100644
--- a/strata/bsp-x86_both-tools/syslinux.morph
+++ b/strata/bsp-x86_both-tools/syslinux.morph
@@ -1,8 +1,12 @@
name: syslinux
kind: chunk
+products:
+- artifact: syslinux-devel
+ include:
+ - (usr/)?share/syslinux/com32.*
build-commands:
- make clean
-- make
-- make installer
+- make NO_WERROR=1
+- make NO_WERROR=1 installer
install-commands:
- make INSTALLROOT="$DESTDIR" install
diff --git a/strata/build-essential/gcc.morph b/strata/build-essential/gcc.morph
index 02be4dd..345d3b0 100644
--- a/strata/build-essential/gcc.morph
+++ b/strata/build-essential/gcc.morph
@@ -1,6 +1,22 @@
name: gcc
kind: chunk
+products:
+- artifact: gcc-libs
+ include:
+ - (usr/)lib/lib.*\.so(\.\d+)*$
+- artifact: gcc-doc
+ include:
+ - (usr/)?share/doc/.*
+ - (usr/)?share/man/.*
+ - (usr/)?share/info/.*
+- artifact: gcc-devel
+ # devel includes everything which isn't documentation or libs, since
+ # everything else gcc produces is required for compiling
+ # this is the -devel artifact instead of -misc, since it goes in -devel
+ # stratum artifacts by default
+ include: [ .* ]
+
configure-commands:
- mkdir o