diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-10-24 10:06:42 +0100 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-10-24 10:06:42 +0100 |
commit | 725b998aa023d6b04a7d8141609c8448d4d82098 (patch) | |
tree | 1b6822e4148dd746abd8a88a5adb3064884d739d | |
parent | 826f0cff22511204a1fde979e954469852227646 (diff) | |
parent | 1a542e3e3d8831add80f2c1f5a4390fc0170e9e5 (diff) | |
download | definitions-725b998aa023d6b04a7d8141609c8448d4d82098.tar.gz |
Merge remote-tracking branch 'origin/baserock/sam/build-and-devel-systems'
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Reviewed-By: Daniel Silverstone <daniel.silverstone@codethink.co.uk>
28 files changed, 226 insertions, 76 deletions
diff --git a/clusters/example-distbuild-cluster.morph b/clusters/example-distbuild-cluster.morph index 4c97d21f..513c16c5 100644 --- a/clusters/example-distbuild-cluster.morph +++ b/clusters/example-distbuild-cluster.morph @@ -10,7 +10,7 @@ description: | workers to authenticate with the Trove to give them read access to all source repositories. systems: -- morph: systems/distbuild-system-x86_64-generic.morph +- morph: systems/build-system-x86_64.morph deploy-defaults: CONTROLLERHOST: build-controller DISTBUILD_CONTROLLER: false diff --git a/clusters/mason.morph b/clusters/mason.morph index 8579f7e4..9717239d 100644 --- a/clusters/mason.morph +++ b/clusters/mason.morph @@ -30,7 +30,7 @@ systems: VCPUS: 2 VERSION_LABEL: 45 WORKER_SSH_PUBKEY: ssh_keys/worker.key.pub -- morph: systems/distbuild-system-x86_64.morph +- morph: systems/build-system-x86_64.morph deploy-defaults: ARTIFACT_CACHE_SERVER: red-box-v1-trove.example.com CONTROLLERHOST: red-box-v1-controller.example.com diff --git a/clusters/release.morph b/clusters/release.morph index 73ccfbc9..5466df22 100644 --- a/clusters/release.morph +++ b/clusters/release.morph @@ -7,33 +7,33 @@ description: | you can deploy the systems yourself, if you are making a Baserock release then the script should be used. systems: -- morph: systems/devel-system-x86_32-chroot.morph +- morph: systems/build-system-x86_32-chroot.morph deploy: - devel-system-x86_32-chroot: + build-system-x86_32-chroot: type: tar - location: devel-system-x86_32-chroot.tar -- morph: systems/devel-system-x86_32-generic.morph + location: build-system-x86_32-chroot.tar +- morph: systems/build-system-x86_32.morph deploy: - devel-system-x86_32-generic: + build-system-x86_32: type: rawdisk - location: devel-system-x86_32-generic.img + location: build-system-x86_32.img DISK_SIZE: 4G -- morph: systems/devel-system-x86_64-chroot.morph +- morph: systems/build-system-x86_64-chroot.morph deploy: - devel-system-x86_64-chroot: + build-system-x86_64-chroot: type: tar - location: devel-system-x86_64-chroot.tar -- morph: systems/devel-system-x86_64-generic.morph + location: build-system-x86_64-chroot.tar +- morph: systems/build-system-x86_64.morph deploy: - devel-system-x86_64-generic: + build-system-x86_64: type: rawdisk - location: devel-system-x86_64-generic.img + location: build-system-x86_64.img DISK_SIZE: 4G -- morph: systems/devel-system-armv7lhf-jetson.morph +- morph: systems/build-system-armv7lhf-jetson.morph deploy: devel-system-armv7lhf-jetson: type: rawdisk - location: devel-system-armv7lhf-jetson.img + location: build-system-armv7lhf-jetson.img DISK_SIZE: 4G ROOT_DEVICE: "/dev/mmcblk0p1" DTB_PATH: "boot/tegra124-pm375.dtb" diff --git a/mason/mason-generator.sh b/mason/mason-generator.sh index 1a2eccac..187db72c 100755 --- a/mason/mason-generator.sh +++ b/mason/mason-generator.sh @@ -84,7 +84,7 @@ sed -i "s/\.example\.com/$(sedescape "$HOST_POSTFIX")/g" "mason-$HOST_PREFIX.mor ############################################################################## morph build systems/trove-system-x86_64.morph -morph build systems/distbuild-system-x86_64.morph +morph build systems/build-system-x86_64.morph ############################################################################## diff --git a/systems/distbuild-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index c4ac80ad..43e701b5 100644 --- a/systems/distbuild-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -1,6 +1,6 @@ -name: distbuild-system-armv7lhf-highbank +name: build-system-armv7lhf-highbank kind: system -description: Morph distributed build node for armv7lhf highbank +description: The system that should be used for building all other Baserock systems for ARMv7 little-endian hard-float Calxeda Highbank computers. arch: armv7lhf strata: - name: build-essential diff --git a/systems/distbuild-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index f4147b9e..db0b36e9 100644 --- a/systems/distbuild-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -1,6 +1,6 @@ -name: distbuild-system-armv7lhf-jetson +name: build-system-armv7lhf-jetson kind: system -description: Morph distributed build node for armv7lhf jetson +description: The system that should be used for building all other Baserock systems for ARMv7 little-endian hard-float NVIDIA Jetson TK1 computers. arch: armv7lhf strata: - name: build-essential diff --git a/systems/distbuild-system-ppc64.morph b/systems/build-system-ppc64.morph index 6d77c261..a317c696 100644 --- a/systems/distbuild-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -1,6 +1,6 @@ -name: distbuild-system-ppc64 +name: build-system-ppc64 kind: system -description: Morph distributed build node for ppc64 +description: The system that should be used for building all other Baserock systems for 64-bit POWER computers. arch: ppc64 strata: - name: build-essential diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph new file mode 100644 index 00000000..776fa4ab --- /dev/null +++ b/systems/build-system-x86_32-chroot.morph @@ -0,0 +1,31 @@ +name: build-system-x86_32-chroot +kind: system +description: The system that should be used for building all other Baserock systems for 32-bit Intel x86 computers, chroot variant. +arch: x86_32 +strata: +- name: build-essential + morph: strata/build-essential.morph +- name: core + morph: strata/core.morph +- name: foundation + morph: strata/foundation.morph +- name: tools + morph: strata/tools.morph +- name: morph-utils + morph: strata/morph-utils.morph +- name: nfs + morph: strata/nfs.morph +- name: ansible + morph: strata/ansible.morph +- name: cloudinit-support + morph: strata/cloudinit-support.morph +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files +- distbuild +- fstab +- mason +- cloud-init diff --git a/systems/distbuild-system-x86_32.morph b/systems/build-system-x86_32.morph index aaa85170..e336d2ec 100644 --- a/systems/distbuild-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -1,6 +1,6 @@ -name: distbuild-system-x86_32 +name: build-system-x86_32 kind: system -description: Morph distributed build node for x86_32 +description: The system that should be used for building all other Baserock systems for 32-bit Intel x86 computers. arch: x86_32 strata: - name: build-essential diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph new file mode 100644 index 00000000..4cc66226 --- /dev/null +++ b/systems/build-system-x86_64-chroot.morph @@ -0,0 +1,31 @@ +name: build-system-x86_64-chroot +kind: system +description: The system that should be used for building all other Baserock systems for 64-bit Intel x86 computers, chroot variant. +arch: x86_64 +strata: +- name: build-essential + morph: strata/build-essential.morph +- name: core + morph: strata/core.morph +- name: foundation + morph: strata/foundation.morph +- name: tools + morph: strata/tools.morph +- name: morph-utils + morph: strata/morph-utils.morph +- name: nfs + morph: strata/nfs.morph +- name: ansible + morph: strata/ansible.morph +- name: cloudinit-support + morph: strata/cloudinit-support.morph +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files +- distbuild +- fstab +- mason +- cloud-init diff --git a/systems/distbuild-system-x86_64.morph b/systems/build-system-x86_64.morph index c42cb553..6db657a1 100644 --- a/systems/distbuild-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -1,6 +1,6 @@ -name: distbuild-system-x86_64 +name: build-system-x86_64 kind: system -description: Morph distributed build node for x86_64 +description: The system that should be used for building all other Baserock systems for 64-bit Intel x86 computers. arch: x86_64 strata: - name: build-essential diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index b063673c..265f63fa 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -1,7 +1,10 @@ name: devel-system-armv7-chroot kind: system -description: A system that is able to build other systems based on the ARM highbank - architecture. +description: | + A system with useful tools for doing Baserock development. + + For use as a chroot inside a Linux-based operating system on ARMv7 + computers using little-endian word order. arch: armv7l strata: - name: build-essential @@ -16,6 +19,10 @@ strata: morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: nodejs + morph: strata/nodejs.morph +- name: ruby + morph: strata/ruby.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 3e86b737..919c800e 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -1,7 +1,9 @@ name: devel-system-armv7-highbank kind: system -description: A system that is able to build other systems based on the ARM highbank - architecture. +description: | + A system with useful tools for doing Baserock development. + + For use on ARMv7 Calxeda Highbank computers using little-endian word order. arch: armv7l strata: - name: build-essential @@ -18,6 +20,10 @@ strata: morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: nodejs + morph: strata/nodejs.morph +- name: ruby + morph: strata/ruby.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 43f7a118..984e0b78 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -1,7 +1,9 @@ name: devel-system-armv7-versatile kind: system -description: A system that is able to build other systems based on the ARM versatile - architecture. +description: | + A system with useful tools for doing Baserock development. + + For use on generic ARMv7 versatile computers using little-endian word order. arch: armv7l strata: - name: build-essential @@ -18,6 +20,10 @@ strata: morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: nodejs + morph: strata/nodejs.morph +- name: ruby + morph: strata/ruby.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 11bccaf0..5bc5e449 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -1,6 +1,9 @@ name: devel-system-armv7-wandboard kind: system -description: A system that is able to build other systems based on the Wandboard. +description: | + A system with useful tools for doing Baserock development. + + For use on ARMv7 Wandboard computers using little-endian word order. arch: armv7l strata: - name: build-essential @@ -17,6 +20,10 @@ strata: morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: nodejs + morph: strata/nodejs.morph +- name: ruby + morph: strata/ruby.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 5081bd20..c74e52b3 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -1,6 +1,10 @@ name: devel-system-armv7b-chroot kind: system -description: A system that is able to build other systems based on the ARMv7b architecture. +description: | + A system with useful tools for doing Baserock development. + + For use as a chroot inside a Linux-based operating system on ARMv7 computers + using big-endian word order. arch: armv7b strata: - name: build-essential diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 9054135b..0ffcd0c6 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -1,7 +1,9 @@ name: devel-system-armv7b-highbank kind: system -description: A system that is able to build other systems based on the ARM highbank - architecture. +description: | + A system with useful tools for doing Baserock development. + + For use on ARMv7 Calxeda Highbank computers using big-endian word order. arch: armv7b strata: - name: build-essential diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index 090d4e6d..4d106fba 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -1,6 +1,10 @@ name: devel-system-armv7lhf-chroot kind: system -description: A system that is able to build other systems based on the ARMv7lhf architecture. +description: | + A system with useful tools for doing Baserock development. + + For use on ARMv7 computers using little-endian word order and hardware + floating point support. arch: armv7lhf strata: - name: build-essential @@ -15,6 +19,10 @@ strata: morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: nodejs + morph: strata/nodejs.morph +- name: ruby + morph: strata/ruby.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 bb5c01b4..5fbae184 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -1,7 +1,10 @@ name: devel-system-armv7lhf-highbank kind: system -description: A system that is able to build other systems based on the ARM highbank - architecture. +description: | + A system with useful tools for doing Baserock development. + + For use on ARMv7 Calxeda Highbank computers using little-endian word order + and hardware floating-point support. arch: armv7lhf strata: - name: build-essential @@ -18,6 +21,10 @@ strata: morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: nodejs + morph: strata/nodejs.morph +- name: ruby + morph: strata/ruby.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 ffcf1766..7892056d 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -1,7 +1,10 @@ name: devel-system-armv7lhf-jetson kind: system -description: A system that is able to build other systems based on the NVIDIA Jetson - TK1. +description: | + A system with useful tools for doing Baserock development. + + For use on ARMv7 NVIDIA Jetson TK1 computers using little-endian word order + and hardware floating-point support. arch: armv7lhf strata: - name: build-essential @@ -18,6 +21,10 @@ strata: morph: strata/openstack-clients.morph - name: bsp-jetson-devel morph: strata/bsp-jetson-devel.morph +- name: nodejs + morph: strata/nodejs.morph +- name: ruby + morph: strata/ruby.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 8f15033a..fb52e2ea 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -1,6 +1,10 @@ name: devel-system-armv7lhf-wandboard kind: system -description: A system that is able to build other systems based on the Wandboard. +description: | + A system with useful tools for doing Baserock development. + + For use on ARMv7 Wandboard computers using little-endian word order and + hardware floating point support. arch: armv7lhf strata: - name: build-essential @@ -17,6 +21,10 @@ strata: morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: nodejs + morph: strata/nodejs.morph +- name: ruby + morph: strata/ruby.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 344aa812..9073ebc4 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -1,7 +1,10 @@ name: devel-system-ppc64-chroot kind: system -description: A system that is able to build other systems based on the 64-bit PowerPc - architecture. +description: | + A system with useful tools for doing Baserock development. + + For use as a chroot inside a Linux operating system on 64-bit POWER + computers. arch: ppc64 strata: - name: build-essential @@ -16,6 +19,10 @@ strata: morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: nodejs + morph: strata/nodejs.morph +- name: ruby + morph: strata/ruby.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 7ccff388..f8a4d2ff 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -1,7 +1,9 @@ name: devel-system-ppc64-generic kind: system -description: A system that is able to build other systems based on the 64-bit PowerPc - architecture. +description: | + A system with useful tools for doing Baserock development. + + For use on 64-bit POWER computers. arch: ppc64 strata: - name: build-essential @@ -18,6 +20,10 @@ strata: morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph +- name: nodejs + morph: strata/nodejs.morph +- name: ruby + morph: strata/ruby.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 dc884223..cf3d6ad1 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -1,7 +1,10 @@ name: devel-system-x86_32-chroot kind: system -description: A system that is able to build other systems based on the 32-bit x86 - architecture. +description: | + A system with useful tools for doing Baserock development. + + For use as a chroot inside a Linux operating system on 32-bit Intel x86 + computers. arch: x86_32 strata: - name: build-essential @@ -18,6 +21,10 @@ strata: morph: strata/openstack-clients.morph - name: bsp-x86_both-tools morph: strata/bsp-x86_both-tools.morph +- name: nodejs + morph: strata/nodejs.morph +- name: ruby + morph: strata/ruby.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 d9264ac4..c8bb4e92 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -1,7 +1,9 @@ name: devel-system-x86_32-generic kind: system -description: A system that is able to build other systems based on the 32-bit x86 - architecture. +description: | + A system with useful tools for doing Baserock development. + + For use on 32-bit Intel x86 computers. arch: x86_32 strata: - name: build-essential @@ -20,6 +22,10 @@ strata: morph: strata/openstack-clients.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: nodejs + morph: strata/nodejs.morph +- name: ruby + morph: strata/ruby.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 34ccf31f..c2da5e1a 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -1,7 +1,10 @@ name: devel-system-x86_64-chroot kind: system -description: A system that is able to build other systems based on the 64-bit x86 - architecture. +description: | + A system with useful tools for doing Baserock development. + + For use as a chroot inside a Linux operating system on 64-bit Intel x86 + computers. arch: x86_64 strata: - name: build-essential @@ -18,6 +21,10 @@ strata: morph: strata/openstack-clients.morph - name: bsp-x86_both-tools morph: strata/bsp-x86_both-tools.morph +- name: nodejs + morph: strata/nodejs.morph +- name: ruby + morph: strata/ruby.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 64133058..dcc39efb 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -1,7 +1,9 @@ name: devel-system-x86_64-generic kind: system -description: A system that is able to build other systems based on the 64-bit x86 - architecture. +description: | + A system with useful tools for doing Baserock development. + + For use on 64-bit Intel x86 computers. arch: x86_64 strata: - name: build-essential @@ -20,6 +22,10 @@ strata: morph: strata/openstack-clients.morph - name: cloudinit-support morph: strata/cloudinit-support.morph +- name: nodejs + morph: strata/nodejs.morph +- name: ruby + morph: strata/ruby.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 43f68e7f..6a53d37b 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -1,8 +1,9 @@ name: devel-system-x86_64-vagrant kind: system -description: A system that is able to build other systems based on the 64-bit x86 - architecture. This adds the virtualbox guest additions and vagrant configuration - too +description: | + A system with useful tools for doing Baserock development, using Vagrant. + + For use with the Vagrant tool for x86_64 virtual machines. arch: x86_64 strata: - name: build-essential @@ -15,32 +16,18 @@ strata: morph: strata/genivi-foundation.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph -- name: connectivity - morph: strata/connectivity.morph -- name: connman-common - morph: strata/connman-common.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph -- name: x-common - morph: strata/x-common.morph -- name: x-generic - morph: strata/x-generic.morph -- name: multimedia - morph: strata/multimedia.morph -- name: genivi - morph: strata/genivi.morph -- name: genivi-x-generic - morph: strata/genivi-x-generic.morph - name: tools morph: strata/tools.morph - name: morph-utils morph: strata/morph-utils.morph -- name: virtualization - morph: strata/virtualization.morph - name: openstack-clients morph: strata/openstack-clients.morph - name: virtualbox-guest-x86_64 morph: strata/virtualbox-guest-x86_64.morph +- name: nodejs + morph: strata/nodejs.morph +- name: ruby + morph: strata/ruby.morph configuration-extensions: - set-hostname - add-config-files |