From 3174f8fc609a62908757eeb3a8dfcf5bd145934d Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richard.ipsum@codethink.co.uk>
Date: Tue, 20 Jan 2015 10:51:49 +0000
Subject: Move some tools into newly created devtools stratum

Collect tools which nothing build depends on into same stratum to reduce
unnecessary rebuilding.
---
 strata/devtools.morph        | 32 ++++++++++++++++++++++++++++++++
 strata/devtools/screen.morph | 11 +++++++++++
 strata/devtools/vim.morph    | 10 ++++++++++
 strata/tools.morph           | 24 +-----------------------
 strata/tools/screen.morph    | 11 -----------
 strata/tools/vim.morph       | 10 ----------
 6 files changed, 54 insertions(+), 44 deletions(-)
 create mode 100644 strata/devtools.morph
 create mode 100644 strata/devtools/screen.morph
 create mode 100644 strata/devtools/vim.morph
 delete mode 100644 strata/tools/screen.morph
 delete mode 100644 strata/tools/vim.morph

diff --git a/strata/devtools.morph b/strata/devtools.morph
new file mode 100644
index 00000000..b6e5daf7
--- /dev/null
+++ b/strata/devtools.morph
@@ -0,0 +1,32 @@
+name: devtools
+kind: stratum
+description: |
+  Extra development tools included in the devel system, this stratum
+  is here to help reduce unnecessary building, chunks added to this
+  stratum should not have any dependants (please don't build-depend on this
+  stratum)
+build-depends:
+- morph: strata/foundation.morph
+chunks:
+- name: vim
+  morph: strata/devtools/vim.morph
+  repo: upstream:vim
+  ref: 592b8c975bf83b4dcf608769bc664a80cb1daf9e
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: pv
+  repo: upstream:pv
+  ref: d6ce7cfec684fa72d7a919d7b1aa817a0ca6102a
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: screen
+  morph: strata/devtools/screen.morph
+  repo: upstream:screen
+  ref: 7dd4a9e5f385c96a77e8ee5c977a1dde4c0ff467
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: less
+  repo: upstream:less
+  ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04
+  unpetrify-ref: baserock/morph
+  build-depends: []
diff --git a/strata/devtools/screen.morph b/strata/devtools/screen.morph
new file mode 100644
index 00000000..0b23c5d4
--- /dev/null
+++ b/strata/devtools/screen.morph
@@ -0,0 +1,11 @@
+name: screen
+kind: chunk
+description: A terminal multiplexer and sanity tool for many
+max-jobs: 1
+configure-commands:
+- cd ./src && sh autogen.sh
+- cd ./src && ./configure --prefix="$PREFIX"
+build-commands:
+- cd ./src && make
+install-commands:
+- cd ./src && make DESTDIR="$DESTDIR" install
diff --git a/strata/devtools/vim.morph b/strata/devtools/vim.morph
new file mode 100644
index 00000000..58e1403f
--- /dev/null
+++ b/strata/devtools/vim.morph
@@ -0,0 +1,10 @@
+name: vim
+kind: chunk
+build-system: autotools
+configure-commands:
+- echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >>src/feature.h
+- ./configure --prefix="$PREFIX" --enable-multibyte
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- mkdir -p "$DESTDIR"/etc
+- install -m 644 runtime/vimrc_example.vim "$DESTDIR"/etc/vimrc
diff --git a/strata/tools.morph b/strata/tools.morph
index 20bc1d27..0c4771dc 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -1,6 +1,6 @@
 name: tools
 kind: stratum
-description: Extra development tools included in the devel system
+description: Various tools
 build-depends:
 - morph: strata/foundation.morph
 chunks:
@@ -26,11 +26,6 @@ chunks:
   ref: c4bf5268b1a32ec475b61d2fe90e9218780c03c8
   unpetrify-ref: baserock/morph
   build-depends: []
-- name: less
-  repo: upstream:less
-  ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04
-  unpetrify-ref: baserock/morph
-  build-depends: []
 - name: linux-user-chroot
   repo: upstream:linux-user-chroot
   ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b
@@ -42,11 +37,6 @@ chunks:
   ref: fffb8558208586338587027c265fd0eca44466be
   unpetrify-ref: baserock/morph
   build-depends: []
-- name: pv
-  repo: upstream:pv
-  ref: d6ce7cfec684fa72d7a919d7b1aa817a0ca6102a
-  unpetrify-ref: baserock/morph
-  build-depends: []
 - name: rsync
   morph: strata/tools/rsync.morph
   repo: upstream:rsync
@@ -64,18 +54,6 @@ chunks:
   ref: 4e4a02c03445336237b36723b23a91670ef7621b
   unpetrify-ref: baserock/bootstrap
   build-depends: []
-- name: vim
-  morph: strata/tools/vim.morph
-  repo: upstream:vim
-  ref: 592b8c975bf83b4dcf608769bc664a80cb1daf9e
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: screen
-  morph: strata/tools/screen.morph
-  repo: upstream:screen
-  ref: 7dd4a9e5f385c96a77e8ee5c977a1dde4c0ff467
-  unpetrify-ref: baserock/morph
-  build-depends: []
 - name: u-boot
   morph: strata/tools/u-boot.morph
   repo: upstream:u-boot
diff --git a/strata/tools/screen.morph b/strata/tools/screen.morph
deleted file mode 100644
index 0b23c5d4..00000000
--- a/strata/tools/screen.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: screen
-kind: chunk
-description: A terminal multiplexer and sanity tool for many
-max-jobs: 1
-configure-commands:
-- cd ./src && sh autogen.sh
-- cd ./src && ./configure --prefix="$PREFIX"
-build-commands:
-- cd ./src && make
-install-commands:
-- cd ./src && make DESTDIR="$DESTDIR" install
diff --git a/strata/tools/vim.morph b/strata/tools/vim.morph
deleted file mode 100644
index 58e1403f..00000000
--- a/strata/tools/vim.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: vim
-kind: chunk
-build-system: autotools
-configure-commands:
-- echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >>src/feature.h
-- ./configure --prefix="$PREFIX" --enable-multibyte
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- mkdir -p "$DESTDIR"/etc
-- install -m 644 runtime/vimrc_example.vim "$DESTDIR"/etc/vimrc
-- 
cgit v1.2.1