From 42852ef0fb4bec172d84c2253a7fba15ecea4150 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
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 <richard.maw@codethink.co.uk>
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.
---
 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 ------------------------
 10 files changed, 165 insertions(+), 165 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

(limited to 'systems')

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