diff options
author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-01-22 17:03:05 +0000 |
---|---|---|
committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-01-22 17:03:05 +0000 |
commit | 904adf511bf2682bc8bef01de83191349dce2516 (patch) | |
tree | f78209cbc3cd688c4b4caadb54914d2f214090e0 | |
parent | 95c31140fced760a5f8c3392b86b54a117f1ac82 (diff) | |
parent | 4f5153568ce2575a7a5e90afa7370dcabfc4e7ce (diff) | |
download | definitions-904adf511bf2682bc8bef01de83191349dce2516.tar.gz |
Merge branch 'baserock/richardipsum/add-devtools-stratum'
Reviewed by:
Sam Thursfield <sam.thursfield@codethink.co.uk>
Paul Sherwood <paul.sherwood@codethink.co.uk>
29 files changed, 83 insertions, 23 deletions
diff --git a/strata/devtools.morph b/strata/devtools.morph new file mode 100644 index 00000000..73ebd783 --- /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: 07c2c06799e0579e6bfb1a7d98acf38e36a98f79 + 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/tools/screen.morph b/strata/devtools/screen.morph index 0b23c5d4..0b23c5d4 100644 --- a/strata/tools/screen.morph +++ b/strata/devtools/screen.morph diff --git a/strata/tools/vim.morph b/strata/devtools/vim.morph index 58e1403f..58e1403f 100644 --- a/strata/tools/vim.morph +++ b/strata/devtools/vim.morph 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/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index 8b92f267..3c41fa1e 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -23,6 +23,8 @@ strata: morph: strata/cloudinit-support.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index d28b94df..5a45c7c8 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -23,6 +23,8 @@ strata: morph: strata/cloudinit-support.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index 14762a6e..1f49c1a7 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -23,6 +23,8 @@ strata: morph: strata/cloudinit-support.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index 089a26c8..6e2c201e 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -21,6 +21,8 @@ strata: morph: strata/cloudinit-support.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index 35a86e11..87cda465 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -23,6 +23,8 @@ strata: morph: strata/cloudinit-support.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index db3a38db..d8eeb7f3 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -21,6 +21,8 @@ strata: morph: strata/cloudinit-support.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index 06868fed..cdfa65ce 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -23,6 +23,8 @@ strata: morph: strata/cloudinit-support.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index 466df31f..305f7a22 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -29,6 +29,8 @@ strata: morph: strata/baserock-import.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index ed111387..427dbb3f 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -32,6 +32,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index 6b24e603..1529522c 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -32,6 +32,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index 70c6f1cc..0f6aef58 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -32,6 +32,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index 1f5bf1cf..2b43bf65 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -23,6 +23,8 @@ strata: morph: strata/baserock-import.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 7e703134..2e342fc3 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -26,6 +26,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index 02358014..c50468a9 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -29,6 +29,8 @@ strata: morph: strata/baserock-import.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index 8fe3737b..4bae3ac8 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -33,6 +33,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index 550c361a..e542f067 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -33,6 +33,8 @@ strata: morph: strata/baserock-import.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index 9e8f0bc6..cda52c36 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -33,6 +33,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index a60f35fc..c4918572 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -27,6 +27,8 @@ strata: morph: strata/baserock-import.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index 6f7fd319..a53a6a56 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -30,6 +30,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index 52e64847..83e55316 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -31,6 +31,8 @@ strata: morph: strata/baserock-import.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index 8d484e81..3ad441ca 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -34,6 +34,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index e77aa5d1..569a00d8 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -31,6 +31,8 @@ strata: morph: strata/baserock-import.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index 143ceb82..32ddfc56 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -34,6 +34,8 @@ strata: morph: strata/nfs.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index a7731cad..7ffddc02 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -32,6 +32,8 @@ strata: morph: strata/baserock-import.morph - name: python-tools morph: strata/python-tools.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index e305c723..0d633f41 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -29,6 +29,8 @@ strata: morph: strata/ansible.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: devtools + morph: strata/devtools.morph configuration-extensions: - set-hostname - trove |