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 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'clusters') 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 -- 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(-) (limited to 'clusters') 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