diff options
| -rw-r--r-- | clusters/example-distbuild-cluster.morph | 2 | ||||
| -rw-r--r-- | clusters/mason.morph | 2 | ||||
| -rwxr-xr-x | mason/mason-generator.sh | 2 | ||||
| -rw-r--r-- | systems/build-system-armv7lhf-highbank.morph (renamed from systems/distbuild-system-armv7lhf-highbank.morph) | 4 | ||||
| -rw-r--r-- | systems/build-system-armv7lhf-jetson.morph (renamed from systems/distbuild-system-armv7lhf-jetson.morph) | 4 | ||||
| -rw-r--r-- | systems/build-system-ppc64.morph (renamed from systems/distbuild-system-ppc64.morph) | 4 | ||||
| -rw-r--r-- | systems/build-system-x86_32.morph (renamed from systems/distbuild-system-x86_32.morph) | 4 | ||||
| -rw-r--r-- | systems/build-system-x86_64.morph (renamed from systems/distbuild-system-x86_64.morph) | 4 |
8 files changed, 13 insertions, 13 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/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/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/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 |