From 42852ef0fb4bec172d84c2253a7fba15ecea4150 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 22 Oct 2014 11:18:24 +0000 Subject: Rename 'distbuild' system to 'build', and fix descriptions It's better to have one type of system that can do either distributed or local builds than to have separate ones that must both be kept up to date with changes. The need for a separate 'distbuild' stratum went already: commit 1a7fbedf56a4c7a6afb683851dde5d34bbb48b86 Author: Richard Maw Date: Thu Oct 2 14:16:00 2014 +0000 Split morph out of tools morph now contains distbuild and morph-cache-server, so the distbuild stratum can go away, and anything that needs it can now use morph. --- clusters/example-distbuild-cluster.morph | 2 +- clusters/mason.morph | 2 +- mason/mason-generator.sh | 2 +- systems/build-system-armv7lhf-highbank.morph | 33 ++++++++++++++++++++++++ systems/build-system-armv7lhf-jetson.morph | 33 ++++++++++++++++++++++++ systems/build-system-ppc64.morph | 33 ++++++++++++++++++++++++ systems/build-system-x86_32.morph | 33 ++++++++++++++++++++++++ systems/build-system-x86_64.morph | 33 ++++++++++++++++++++++++ systems/distbuild-system-armv7lhf-highbank.morph | 33 ------------------------ systems/distbuild-system-armv7lhf-jetson.morph | 33 ------------------------ systems/distbuild-system-ppc64.morph | 33 ------------------------ systems/distbuild-system-x86_32.morph | 33 ------------------------ systems/distbuild-system-x86_64.morph | 33 ------------------------ 13 files changed, 168 insertions(+), 168 deletions(-) create mode 100644 systems/build-system-armv7lhf-highbank.morph create mode 100644 systems/build-system-armv7lhf-jetson.morph create mode 100644 systems/build-system-ppc64.morph create mode 100644 systems/build-system-x86_32.morph create mode 100644 systems/build-system-x86_64.morph delete mode 100644 systems/distbuild-system-armv7lhf-highbank.morph delete mode 100644 systems/distbuild-system-armv7lhf-jetson.morph delete mode 100644 systems/distbuild-system-ppc64.morph delete mode 100644 systems/distbuild-system-x86_32.morph delete mode 100644 systems/distbuild-system-x86_64.morph 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/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/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph new file mode 100644 index 00000000..43e701b5 --- /dev/null +++ b/systems/build-system-armv7lhf-highbank.morph @@ -0,0 +1,33 @@ +name: build-system-armv7lhf-highbank +kind: system +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 + morph: strata/build-essential.morph +- name: core + morph: strata/core.morph +- name: foundation + morph: strata/foundation.morph +- name: bsp-armv7-highbank + morph: strata/bsp-armv7-highbank.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/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph new file mode 100644 index 00000000..db0b36e9 --- /dev/null +++ b/systems/build-system-armv7lhf-jetson.morph @@ -0,0 +1,33 @@ +name: build-system-armv7lhf-jetson +kind: system +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 + morph: strata/build-essential.morph +- name: core + morph: strata/core.morph +- name: foundation + morph: strata/foundation.morph +- name: bsp-jetson-devel + morph: strata/bsp-jetson-devel.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/build-system-ppc64.morph b/systems/build-system-ppc64.morph new file mode 100644 index 00000000..a317c696 --- /dev/null +++ b/systems/build-system-ppc64.morph @@ -0,0 +1,33 @@ +name: build-system-ppc64 +kind: system +description: The system that should be used for building all other Baserock systems for 64-bit POWER computers. +arch: ppc64 +strata: +- name: build-essential + morph: strata/build-essential.morph +- name: core + morph: strata/core.morph +- name: foundation + morph: strata/foundation.morph +- name: bsp-ppc64-generic + morph: strata/bsp-ppc64-generic.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/build-system-x86_32.morph b/systems/build-system-x86_32.morph new file mode 100644 index 00000000..e336d2ec --- /dev/null +++ b/systems/build-system-x86_32.morph @@ -0,0 +1,33 @@ +name: build-system-x86_32 +kind: system +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 + morph: strata/build-essential.morph +- name: core + morph: strata/core.morph +- name: foundation + morph: strata/foundation.morph +- name: bsp-x86_32-generic + morph: strata/bsp-x86_32-generic.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/build-system-x86_64.morph b/systems/build-system-x86_64.morph new file mode 100644 index 00000000..6db657a1 --- /dev/null +++ b/systems/build-system-x86_64.morph @@ -0,0 +1,33 @@ +name: build-system-x86_64 +kind: system +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 + morph: strata/build-essential.morph +- name: core + morph: strata/core.morph +- name: foundation + morph: strata/foundation.morph +- name: bsp-x86_64-generic + morph: strata/bsp-x86_64-generic.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-armv7lhf-highbank.morph b/systems/distbuild-system-armv7lhf-highbank.morph deleted file mode 100644 index c4ac80ad..00000000 --- a/systems/distbuild-system-armv7lhf-highbank.morph +++ /dev/null @@ -1,33 +0,0 @@ -name: distbuild-system-armv7lhf-highbank -kind: system -description: Morph distributed build node for armv7lhf highbank -arch: armv7lhf -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-armv7-highbank - morph: strata/bsp-armv7-highbank.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-armv7lhf-jetson.morph b/systems/distbuild-system-armv7lhf-jetson.morph deleted file mode 100644 index f4147b9e..00000000 --- a/systems/distbuild-system-armv7lhf-jetson.morph +++ /dev/null @@ -1,33 +0,0 @@ -name: distbuild-system-armv7lhf-jetson -kind: system -description: Morph distributed build node for armv7lhf jetson -arch: armv7lhf -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-jetson-devel - morph: strata/bsp-jetson-devel.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-ppc64.morph b/systems/distbuild-system-ppc64.morph deleted file mode 100644 index 6d77c261..00000000 --- a/systems/distbuild-system-ppc64.morph +++ /dev/null @@ -1,33 +0,0 @@ -name: distbuild-system-ppc64 -kind: system -description: Morph distributed build node for ppc64 -arch: ppc64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-ppc64-generic - morph: strata/bsp-ppc64-generic.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/distbuild-system-x86_32.morph deleted file mode 100644 index aaa85170..00000000 --- a/systems/distbuild-system-x86_32.morph +++ /dev/null @@ -1,33 +0,0 @@ -name: distbuild-system-x86_32 -kind: system -description: Morph distributed build node for x86_32 -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: bsp-x86_32-generic - morph: strata/bsp-x86_32-generic.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/distbuild-system-x86_64.morph deleted file mode 100644 index c42cb553..00000000 --- a/systems/distbuild-system-x86_64.morph +++ /dev/null @@ -1,33 +0,0 @@ -name: distbuild-system-x86_64 -kind: system -description: Morph distributed build node for x86_64 -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: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.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 -- cgit v1.2.1 From a95c9fdcf3ae245f6c6f22969b92465ee74444d4 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 22 Oct 2014 14:42:29 +0000 Subject: Change descriptions of devel systems The 'build' system is now the recommended way of building other systems, with 'devel' being a larger variant of 'build' that may be useful when doing development and integration, in addition to building and deployment. --- systems/devel-system-armv7-chroot.morph | 7 +++++-- systems/devel-system-armv7-highbank.morph | 6 ++++-- systems/devel-system-armv7-versatile.morph | 6 ++++-- systems/devel-system-armv7-wandboard.morph | 5 ++++- systems/devel-system-armv7b-chroot.morph | 6 +++++- systems/devel-system-armv7b-highbank.morph | 6 ++++-- systems/devel-system-armv7lhf-chroot.morph | 6 +++++- systems/devel-system-armv7lhf-highbank.morph | 7 +++++-- systems/devel-system-armv7lhf-jetson.morph | 7 +++++-- systems/devel-system-armv7lhf-wandboard.morph | 6 +++++- systems/devel-system-ppc64-chroot.morph | 7 +++++-- systems/devel-system-ppc64-generic.morph | 6 ++++-- systems/devel-system-x86_32-chroot.morph | 7 +++++-- systems/devel-system-x86_32-generic.morph | 6 ++++-- systems/devel-system-x86_64-chroot.morph | 7 +++++-- systems/devel-system-x86_64-generic.morph | 6 ++++-- systems/devel-system-x86_64-vagrant.morph | 7 ++++--- 17 files changed, 77 insertions(+), 31 deletions(-) diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index b063673c..5f903418 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 diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index 3e86b737..5ad9e3e5 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 diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index 43f7a118..7aef7a2c 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 diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index 11bccaf0..bc208414 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 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..faf5a63d 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 diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index bb5c01b4..d93993a7 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 diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index ffcf1766..466416df 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 diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index 8f15033a..2eed3343 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 diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index 344aa812..f2f75045 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 diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index 7ccff388..f0a69797 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 diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index dc884223..162e516c 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 diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index d9264ac4..e8212382 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 diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index 34ccf31f..19cd2ebd 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 diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index 64133058..6debce48 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 diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index 43f68e7f..d79ac982 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 -- cgit v1.2.1 From fa42e9a28e636d93f8a2f4b3d1445a6d5cfeee6a Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 22 Oct 2014 15:15:55 +0000 Subject: Add chroot variants of the build-systems These take the place of the devel system chroots that we released previously, and should be functionally equivalent. --- systems/build-system-x86_32-chroot.morph | 31 +++++++++++++++++++++++++++++++ systems/build-system-x86_64-chroot.morph | 31 +++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 systems/build-system-x86_32-chroot.morph create mode 100644 systems/build-system-x86_64-chroot.morph 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/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 -- cgit v1.2.1 From c6057851915e40132e6524d5b6500e422c5dc639 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 22 Oct 2014 15:08:04 +0000 Subject: Release build-system rather than devel-system The build-system is equivalent in functionality to the current devel-system that we release, but this change allows us to add more components to the devel-system without increasing the amount of bytes we have to arrange and transfer when making a release. --- clusters/release.morph | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/clusters/release.morph b/clusters/release.morph index 5beee3e2..a21a2690 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: release: type: rawdisk - location: devel-system-armv7lhf-jetson.img + location: build-system-armv7lhf-jetson.img DISK_SIZE: 4G ROOT_DEVICE: "/dev/mmcblk0p1" KERNEL_ARGS: cma=256M console=ttyS0,115200n8 no_console_suspend=1 lp0_vec=2064@0xf46ff000 video=tegrafb mem=1862M@2048M memtype=255 ddr_die=2048M@2048M section=256M pmuboard=0x0177:0x0000:0x02:0x43:0x00 vpr=151M@3945M tsec=32M@3913M otf_key=c75e5bb91eb3bd94560357b64422f85 usbcore.old_scheme_first=1 core_edp_mv=1150 core_edp_ma=4000 tegraid=40.1.1.0.0 debug_uartport=lsport,3 power_supply=Adapter audio_codec=rt5640 modem_id=0 android.kerneltype=normal usb_port_owner_info=0 fbcon=map:1 commchip_id=0 usb_port_owner_info=0 lane_owner_info=6 emc_max_dvfs=0 touch_id=0@0 tegra_fbmem=32899072@0xad012000 board_info=0x0177:0x0000:0x02:0x43:0x00 tegraboot=sdmmc gpt -- cgit v1.2.1 From d5f96a53b9bd474ab9328c1a86baa4976134cb52 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 22 Oct 2014 15:21:01 +0000 Subject: Add node.js and Ruby to devel systems These are dependencies of the Baserock Import tool. The import tool will be added to the devel system later, in a separate branch. This increases the size of an x86_32 devel system from 1.1GB to 1.2GB. --- systems/devel-system-armv7-chroot.morph | 4 ++++ systems/devel-system-armv7-highbank.morph | 4 ++++ systems/devel-system-armv7-versatile.morph | 4 ++++ systems/devel-system-armv7-wandboard.morph | 4 ++++ systems/devel-system-armv7lhf-chroot.morph | 4 ++++ systems/devel-system-armv7lhf-highbank.morph | 4 ++++ systems/devel-system-armv7lhf-jetson.morph | 4 ++++ systems/devel-system-armv7lhf-wandboard.morph | 4 ++++ systems/devel-system-ppc64-chroot.morph | 4 ++++ systems/devel-system-ppc64-generic.morph | 4 ++++ systems/devel-system-x86_32-chroot.morph | 4 ++++ systems/devel-system-x86_32-generic.morph | 4 ++++ systems/devel-system-x86_64-chroot.morph | 4 ++++ systems/devel-system-x86_64-generic.morph | 4 ++++ systems/devel-system-x86_64-vagrant.morph | 4 ++++ 15 files changed, 60 insertions(+) diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index 5f903418..265f63fa 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -19,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 5ad9e3e5..919c800e 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -20,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 7aef7a2c..984e0b78 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -20,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 bc208414..5bc5e449 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -20,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-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index faf5a63d..4d106fba 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -19,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 d93993a7..5fbae184 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -21,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 466416df..7892056d 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -21,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 2eed3343..fb52e2ea 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -21,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 f2f75045..9073ebc4 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -19,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 f0a69797..f8a4d2ff 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -20,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 162e516c..cf3d6ad1 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -21,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 e8212382..c8bb4e92 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -22,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 19cd2ebd..c2da5e1a 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -21,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 6debce48..dcc39efb 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -22,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 d79ac982..77d6a67a 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -42,6 +42,10 @@ strata: 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 -- cgit v1.2.1 From 1a542e3e3d8831add80f2c1f5a4390fc0170e9e5 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 22 Oct 2014 16:48:40 +0000 Subject: Remove GENIVI devel system strata from x86_64 Vagrant devel system These strata used to be in all devel systems and were removed. The only extra component that a system needs to be a Vagrant basebox is the VirtualBox Guest Additions, which are in the virtualbox-guest-x86_64 stratum. --- systems/devel-system-x86_64-vagrant.morph | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index 77d6a67a..6a53d37b 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -16,28 +16,10 @@ 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 -- cgit v1.2.1