diff options
| -rw-r--r-- | clusters/altera-socfpga-devkit-sd-image.morph.in (renamed from clusters/altera-socfpga-devkit-sd-image.morph) | 6 | ||||
| -rw-r--r-- | clusters/cephclient.morph.in (renamed from clusters/cephclient.morph) | 4 | ||||
| -rw-r--r-- | clusters/ci.morph.in (renamed from clusters/ci.morph) | 0 | ||||
| -rw-r--r-- | clusters/example-ceph-cluster-on-openstack.morph.in (renamed from clusters/example-ceph-cluster-on-openstack.morph) | 0 | ||||
| -rw-r--r-- | clusters/example-distbuild-cluster.morph.in (renamed from clusters/example-distbuild-cluster.morph) | 0 | ||||
| -rw-r--r-- | clusters/example-swift-storage-cluster.morph.in (renamed from clusters/example-swift-storage-cluster.morph) | 0 | ||||
| -rw-r--r-- | clusters/gdp-jetson-upgrade.morph.in (renamed from clusters/gdp-jetson-upgrade.morph) | 0 | ||||
| -rw-r--r-- | clusters/gnome-system-armv7lhf-jetson-deploy.morph.in (renamed from clusters/gnome-system-armv7lhf-jetson-deploy.morph) | 0 | ||||
| -rw-r--r-- | clusters/gnome-system-deploy.morph.in (renamed from clusters/gnome-system-x86_64-deploy.morph) | 0 | ||||
| -rw-r--r-- | clusters/hardware-deployment.morph.in (renamed from clusters/hardware-deployment.morph) | 0 | ||||
| -rw-r--r-- | clusters/image-package-example.morph.in (renamed from clusters/image-package-example.morph) | 0 | ||||
| -rw-r--r-- | clusters/initramfs-test.morph.in (renamed from clusters/initramfs-test.morph) | 0 | ||||
| -rw-r--r-- | clusters/installer-build-system-x86_64.morph.in (renamed from clusters/installer-build-system-x86_64.morph) | 0 | ||||
| -rw-r--r-- | clusters/ivi-system-armv7lhf-jetson-deploy.morph | 4 | ||||
| -rw-r--r-- | clusters/ivi-system-deploy.morph.in (renamed from clusters/ivi-system-x86_64-deploy.morph) | 10 | ||||
| -rw-r--r-- | clusters/jetson-upgrade.morph.in (renamed from clusters/jetson-upgrade.morph) | 0 | ||||
| -rw-r--r-- | clusters/mason-openstack.morph.in (renamed from clusters/mason-openstack.morph) | 0 | ||||
| -rw-r--r-- | clusters/mason.morph.in (renamed from clusters/mason.morph) | 0 | ||||
| -rw-r--r-- | clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph | 2 | ||||
| -rw-r--r-- | clusters/minimal-system-deploy.morph.in (renamed from clusters/minimal-system-deploy.morph) | 0 | ||||
| -rw-r--r-- | clusters/moonshot-m2-armv8b64.morph | 4 | ||||
| -rw-r--r-- | clusters/moonshot-pxe-armv8b64.morph | 2 | ||||
| -rw-r--r-- | clusters/moonshot-pxe-armv8l64.morph | 2 | ||||
| -rw-r--r-- | clusters/openstack-one-node-swift.morph.in (renamed from clusters/openstack-one-node-swift.morph) | 0 | ||||
| -rw-r--r-- | clusters/openstack-one-node.morph.in (renamed from clusters/openstack-one-node.morph) | 0 | ||||
| -rw-r--r-- | clusters/openstack-three-node-installer.morph.in (renamed from clusters/openstack-three-node-installer.morph) | 0 | ||||
| -rw-r--r-- | clusters/openstack-two-node-installer.morph.in (renamed from clusters/openstack-two-node-installer.morph) | 0 | ||||
| -rw-r--r-- | clusters/release-genivi-baseline.morph.in (renamed from clusters/release-genivi-baseline.morph) | 0 | ||||
| -rw-r--r-- | clusters/release.morph.in (renamed from clusters/release.morph) | 32 | ||||
| -rw-r--r-- | clusters/sdk-example-cluster.morph.in (renamed from clusters/sdk-example-cluster.morph) | 6 | ||||
| -rw-r--r-- | clusters/trove-example.morph.in (renamed from clusters/trove-example.morph) | 2 | ||||
| -rw-r--r-- | clusters/upgrade-devel.morph.in (renamed from clusters/upgrade-devel.morph) | 2 | ||||
| -rw-r--r-- | clusters/weston-qt5-system-deploy.morph.in (renamed from clusters/weston-qt5-system-x86_64-deploy.morph) | 10 | ||||
| -rw-r--r-- | clusters/weston-system-deploy.morph.in (renamed from clusters/weston-system-x86_64-generic-deploy.morph) | 10 | ||||
| -rw-r--r-- | clusters/xfce-system-deploy.morph.in (renamed from clusters/xfce-system-x86_64-deploy.morph) | 10 | ||||
| -rw-r--r-- | clusters/zookeeper.morph.in (renamed from clusters/zookeeper.morph) | 4 | ||||
| -rwxr-xr-x | configure | 330 | ||||
| -rw-r--r-- | strata/syslinux-group.morph (renamed from strata/bsp-x86_both-tools.morph) | 10 | ||||
| -rw-r--r-- | strata/syslinux-group/nasm.morph (renamed from strata/bsp-x86_both-tools/nasm.morph) | 0 | ||||
| -rw-r--r-- | strata/syslinux-group/syslinux.morph (renamed from strata/bsp-x86_both-tools/syslinux.morph) | 0 | ||||
| -rw-r--r-- | strata/virtualbox-guest-x86_64.morph.in (renamed from strata/virtualbox-guest-x86_64.morph) | 10 | ||||
| -rw-r--r-- | strata/virtualbox-guest/vboxguest.morph (renamed from strata/virtualbox-guest-x86_64/vboxguest.morph) | 0 | ||||
| -rw-r--r-- | strata/virtualbox-guest/yasm.morph (renamed from strata/virtualbox-guest-x86_64/yasm.morph) | 0 | ||||
| -rw-r--r-- | systems/armv7lhf-cross-toolchain-system-x86_64.morph | 19 | ||||
| -rw-r--r-- | systems/armv7lhf-cross-toolchain-system.morph.in (renamed from systems/armv7lhf-cross-toolchain-system-x86_32.morph) | 4 | ||||
| -rw-r--r-- | systems/base-system-armv7-highbank.morph | 20 | ||||
| -rw-r--r-- | systems/base-system-armv7-versatile.morph | 20 | ||||
| -rw-r--r-- | systems/base-system-armv7b-highbank.morph | 20 | ||||
| -rw-r--r-- | systems/base-system-armv7b-vexpress-tc2.morph | 19 | ||||
| -rw-r--r-- | systems/base-system-armv7l-altera-socfpga-devkit.morph | 21 | ||||
| -rw-r--r-- | systems/base-system-armv7lhf-highbank.morph | 20 | ||||
| -rw-r--r-- | systems/base-system-armv8b64.morph | 22 | ||||
| -rw-r--r-- | systems/base-system-armv8l64.morph | 22 | ||||
| -rw-r--r-- | systems/base-system-ppc64-generic.morph | 20 | ||||
| -rw-r--r-- | systems/base-system-x86_64-generic.morph | 20 | ||||
| -rw-r--r-- | systems/base-system.morph.in (renamed from systems/base-system-x86_32-generic.morph) | 13 | ||||
| -rw-r--r-- | systems/build-system-armv7l-altera-socfpga-devkit.morph | 51 | ||||
| -rw-r--r-- | systems/build-system-armv7lhf-highbank.morph | 61 | ||||
| -rw-r--r-- | systems/build-system-armv7lhf-jetson.morph | 59 | ||||
| -rw-r--r-- | systems/build-system-armv7lhf-rootfs.morph | 57 | ||||
| -rw-r--r-- | systems/build-system-armv8b64.morph | 61 | ||||
| -rw-r--r-- | systems/build-system-armv8l64.morph | 61 | ||||
| -rw-r--r-- | systems/build-system-ppc64.morph | 59 | ||||
| -rw-r--r-- | systems/build-system-x86_32-chroot.morph | 59 | ||||
| -rw-r--r-- | systems/build-system-x86_32.morph | 59 | ||||
| -rw-r--r-- | systems/build-system-x86_64-chroot.morph | 59 | ||||
| -rw-r--r-- | systems/build-system-x86_64.morph | 59 | ||||
| -rw-r--r-- | systems/build-system.morph.in (renamed from systems/build-system-armv5l-openbmc-aspeed.morph) | 19 | ||||
| -rw-r--r-- | systems/ceph-service.morph.in (renamed from systems/ceph-service-x86_64-generic.morph) | 14 | ||||
| -rw-r--r-- | systems/chef-system.morph.in (renamed from systems/chef-system-x86_64-container.morph) | 10 | ||||
| -rw-r--r-- | systems/cross-bootstrap-system-armv5l-generic.morph | 23 | ||||
| -rw-r--r-- | systems/cross-bootstrap-system-armv7lhf-generic.morph | 23 | ||||
| -rw-r--r-- | systems/cross-bootstrap-system-armv8b64-generic.morph | 23 | ||||
| -rw-r--r-- | systems/cross-bootstrap-system-armv8l64-generic.morph | 23 | ||||
| -rw-r--r-- | systems/cross-bootstrap-system-x86_64-generic.morph | 23 | ||||
| -rw-r--r-- | systems/cross-bootstrap-system.morph.in (renamed from systems/cross-bootstrap-system-ppc64-generic.morph) | 4 | ||||
| -rw-r--r-- | systems/cxmanage-system.morph.in (renamed from systems/cxmanage-system-x86_64-generic.morph) | 10 | ||||
| -rw-r--r-- | systems/devel-system-armv7-chroot.morph | 70 | ||||
| -rw-r--r-- | systems/devel-system-armv7-highbank.morph | 73 | ||||
| -rw-r--r-- | systems/devel-system-armv7-versatile.morph | 71 | ||||
| -rw-r--r-- | systems/devel-system-armv7-wandboard.morph | 71 | ||||
| -rw-r--r-- | systems/devel-system-armv7b-chroot.morph | 62 | ||||
| -rw-r--r-- | systems/devel-system-armv7b-highbank.morph | 69 | ||||
| -rw-r--r-- | systems/devel-system-armv7l-altera-socfpga-devkit.morph | 66 | ||||
| -rw-r--r-- | systems/devel-system-armv7lhf-chroot.morph | 70 | ||||
| -rw-r--r-- | systems/devel-system-armv7lhf-highbank.morph | 76 | ||||
| -rw-r--r-- | systems/devel-system-armv7lhf-jetson.morph | 74 | ||||
| -rw-r--r-- | systems/devel-system-armv7lhf-wandboard.morph | 74 | ||||
| -rw-r--r-- | systems/devel-system-armv8b64.morph | 75 | ||||
| -rw-r--r-- | systems/devel-system-armv8l64.morph | 76 | ||||
| -rw-r--r-- | systems/devel-system-ppc64-chroot.morph | 68 | ||||
| -rw-r--r-- | systems/devel-system-ppc64-generic.morph | 71 | ||||
| -rw-r--r-- | systems/devel-system-x86_32-chroot.morph | 70 | ||||
| -rw-r--r-- | systems/devel-system-x86_32-generic.morph | 76 | ||||
| -rw-r--r-- | systems/devel-system-x86_64-chroot.morph | 72 | ||||
| -rw-r--r-- | systems/devel-system-x86_64-vagrant.morph | 74 | ||||
| -rw-r--r-- | systems/devel-system.morph.in (renamed from systems/devel-system-x86_64-generic.morph) | 23 | ||||
| -rw-r--r-- | systems/genivi-baseline-system-armv7lhf-jetson.morph | 52 | ||||
| -rw-r--r-- | systems/genivi-baseline-system-armv7lhf-versatile.morph | 50 | ||||
| -rw-r--r-- | systems/genivi-baseline-system.morph.in (renamed from systems/genivi-baseline-system-x86_64-generic.morph) | 13 | ||||
| -rw-r--r-- | systems/genivi-demo-platform-armv7lhf-jetson.morph | 79 | ||||
| -rw-r--r-- | systems/genivi-demo-platform.morph.in (renamed from systems/genivi-demo-platform-x86_64-generic.morph) | 12 | ||||
| -rw-r--r-- | systems/gnome-system-armv7lhf-jetson.morph | 92 | ||||
| -rw-r--r-- | systems/gnome-system.morph.in (renamed from systems/gnome-system-x86_64.morph) | 19 | ||||
| -rw-r--r-- | systems/initramfs.morph.in (renamed from systems/initramfs-x86_64.morph) | 6 | ||||
| -rw-r--r-- | systems/installer-system-armv8b64.morph | 39 | ||||
| -rw-r--r-- | systems/installer-system.morph.in (renamed from systems/installer-system-x86_64.morph) | 10 | ||||
| -rw-r--r-- | systems/ivi-system-armv7lhf-jetson.morph | 90 | ||||
| -rw-r--r-- | systems/ivi-system.morph.in (renamed from systems/ivi-system-x86_64.morph) | 16 | ||||
| -rw-r--r-- | systems/java-build-system.morph.in (renamed from systems/java-build-system-x86_64-generic.morph) | 12 | ||||
| -rw-r--r-- | systems/minimal-system-armv5l-openbmc-aspeed.morph | 20 | ||||
| -rw-r--r-- | systems/minimal-system-x86_32-generic.morph | 21 | ||||
| -rw-r--r-- | systems/minimal-system.morph.in (renamed from systems/minimal-system-x86_64-generic.morph) | 16 | ||||
| -rw-r--r-- | systems/nodejs-system.morph.in (renamed from systems/nodejs-system-x86_64.morph) | 14 | ||||
| -rw-r--r-- | systems/ocaml-system.morph.in (renamed from systems/ocaml-system-x86_64.morph) | 10 | ||||
| -rw-r--r-- | systems/openstack-system.morph.in (renamed from systems/openstack-system-x86_64.morph) | 13 | ||||
| -rw-r--r-- | systems/qt4-devel-system.morph.in (renamed from systems/qt4-devel-system-x86_64-generic.morph) | 14 | ||||
| -rw-r--r-- | systems/qt5-devel-system.morph.in (renamed from systems/qt5-devel-system-x86_64-generic.morph) | 14 | ||||
| -rw-r--r-- | systems/swift-system.morph.in (renamed from systems/swift-system-x86_64.morph) | 13 | ||||
| -rw-r--r-- | systems/trove-system.morph.in (renamed from systems/trove-system-x86_64.morph) | 13 | ||||
| -rw-r--r-- | systems/web-system.morph.in (renamed from systems/web-system-x86_64-generic.morph) | 13 | ||||
| -rw-r--r-- | systems/weston-qt5-system.morph.in (renamed from systems/weston-qt5-system-x86_64.morph) | 14 | ||||
| -rw-r--r-- | systems/weston-system-armv7lhf-jetson.morph | 54 | ||||
| -rw-r--r-- | systems/weston-system.morph.in (renamed from systems/weston-system-x86_64-generic.morph) | 13 | ||||
| -rw-r--r-- | systems/xfce-system.morph.in (renamed from systems/xfce-system-x86_64.morph) | 13 | ||||
| -rw-r--r-- | systems/zookeeper-client.morph.in (renamed from systems/zookeeper-client-x86_64.morph) | 13 | ||||
| -rw-r--r-- | systems/zookeeper-server.morph.in (renamed from systems/zookeeper-server-x86_64.morph) | 13 |
127 files changed, 619 insertions, 3050 deletions
diff --git a/clusters/altera-socfpga-devkit-sd-image.morph b/clusters/altera-socfpga-devkit-sd-image.morph.in index 71d3da2d..d7b5255c 100644 --- a/clusters/altera-socfpga-devkit-sd-image.morph +++ b/clusters/altera-socfpga-devkit-sd-image.morph.in @@ -1,14 +1,14 @@ name: altera-socfpga-devkit-sd-image kind: cluster description: | - This cluster morph deploys a little endian Baserock system to + This cluster morph deploys a Baserock system to an SD image for the Altera Cyclone V development kit systems: -- morph: systems/build-system-armv7l-altera-socfpga-devkit.morph +- morph: systems/build-system.{{CONFIG}}.morph deploy: self: type: extensions/rawdisk - location: build-system-armv7l-altera-socfpga-devkit.img + location: build-system.{{CONFIG}}.img DISK_SIZE: 7G USE_PARTITIONING: yes PARTITION_FILE: partitioning/socfpga-devkit diff --git a/clusters/cephclient.morph b/clusters/cephclient.morph.in index 9eaf92ee..42ea33f7 100644 --- a/clusters/cephclient.morph +++ b/clusters/cephclient.morph.in @@ -1,11 +1,11 @@ name: ceph-cluster kind: cluster systems: -- morph: systems/ceph-service-x86_64-generic.morph +- morph: systems/ceph-service.{{CONFIG}}.morph deploy: ceph-node-virtualbox-image: type: extensions/virtualbox-ssh - SYSTEM: systems/ceph-service-x86_64-generic.morph + SYSTEM: systems/ceph-service.{{CONFIG}}.morph location: vbox+ssh://user@machine/ChefNode4/home/user/chefnode4.vdi # HOST_IPADDR and NETMASK should be set to the IP address and netmask of the virtualbox host on the host-only interface. #HOST_IPADDR: 10.0.100.100 diff --git a/clusters/ci.morph b/clusters/ci.morph.in index a7469512..a7469512 100644 --- a/clusters/ci.morph +++ b/clusters/ci.morph.in diff --git a/clusters/example-ceph-cluster-on-openstack.morph b/clusters/example-ceph-cluster-on-openstack.morph.in index 6ddabc90..6ddabc90 100644 --- a/clusters/example-ceph-cluster-on-openstack.morph +++ b/clusters/example-ceph-cluster-on-openstack.morph.in diff --git a/clusters/example-distbuild-cluster.morph b/clusters/example-distbuild-cluster.morph.in index 5208a5ca..5208a5ca 100644 --- a/clusters/example-distbuild-cluster.morph +++ b/clusters/example-distbuild-cluster.morph.in diff --git a/clusters/example-swift-storage-cluster.morph b/clusters/example-swift-storage-cluster.morph.in index ddab6481..ddab6481 100644 --- a/clusters/example-swift-storage-cluster.morph +++ b/clusters/example-swift-storage-cluster.morph.in diff --git a/clusters/gdp-jetson-upgrade.morph b/clusters/gdp-jetson-upgrade.morph.in index 33eb8ec1..33eb8ec1 100644 --- a/clusters/gdp-jetson-upgrade.morph +++ b/clusters/gdp-jetson-upgrade.morph.in diff --git a/clusters/gnome-system-armv7lhf-jetson-deploy.morph b/clusters/gnome-system-armv7lhf-jetson-deploy.morph.in index c74f1209..c74f1209 100644 --- a/clusters/gnome-system-armv7lhf-jetson-deploy.morph +++ b/clusters/gnome-system-armv7lhf-jetson-deploy.morph.in diff --git a/clusters/gnome-system-x86_64-deploy.morph b/clusters/gnome-system-deploy.morph.in index b3015ff2..b3015ff2 100644 --- a/clusters/gnome-system-x86_64-deploy.morph +++ b/clusters/gnome-system-deploy.morph.in diff --git a/clusters/hardware-deployment.morph b/clusters/hardware-deployment.morph.in index 674d6587..674d6587 100644 --- a/clusters/hardware-deployment.morph +++ b/clusters/hardware-deployment.morph.in diff --git a/clusters/image-package-example.morph b/clusters/image-package-example.morph.in index ca79ec97..ca79ec97 100644 --- a/clusters/image-package-example.morph +++ b/clusters/image-package-example.morph.in diff --git a/clusters/initramfs-test.morph b/clusters/initramfs-test.morph.in index a4ce7f32..a4ce7f32 100644 --- a/clusters/initramfs-test.morph +++ b/clusters/initramfs-test.morph.in diff --git a/clusters/installer-build-system-x86_64.morph b/clusters/installer-build-system-x86_64.morph.in index d9a2a28b..d9a2a28b 100644 --- a/clusters/installer-build-system-x86_64.morph +++ b/clusters/installer-build-system-x86_64.morph.in diff --git a/clusters/ivi-system-armv7lhf-jetson-deploy.morph b/clusters/ivi-system-armv7lhf-jetson-deploy.morph index fef89351..9e3e3cd6 100644 --- a/clusters/ivi-system-armv7lhf-jetson-deploy.morph +++ b/clusters/ivi-system-armv7lhf-jetson-deploy.morph @@ -1,8 +1,8 @@ name: ivi-system-armv7lhf-jetson-deploy kind: cluster -description: Deploy a IVI system. +description: Deploy a IVI system for an NVIDIA Jetson. systems: -- morph: systems/ivi-system-armv7lhf-jetson.morph +- morph: systems/ivi-system.armv7lhf-jetson.morph deploy: ivi-system-armv7lhf-jetson: type: extensions/rawdisk diff --git a/clusters/ivi-system-x86_64-deploy.morph b/clusters/ivi-system-deploy.morph.in index 0833ec8c..f5ed3340 100644 --- a/clusters/ivi-system-x86_64-deploy.morph +++ b/clusters/ivi-system-deploy.morph.in @@ -1,4 +1,4 @@ -name: ivi-system-x86_64-deploy +name: ivi-system-deploy kind: cluster description: | Deploy a stock IVI system. @@ -7,17 +7,17 @@ description: | as well as in a virtual machine. systems: -- morph: systems/ivi-system-x86_64.morph +- morph: systems/ivi-system.{{CONFIG}}.morph deploy: ivi-system-x86_64: type: extensions/rawdisk - location: /ivi-system-x86_64.img - HOSTNAME: ivi-system-x86-64 + location: /ivi-system.img + HOSTNAME: ivi-system DISK_SIZE: 6G KERNEL_ARGS: vga=788 INITRAMFS_PATH: boot/initramfs.gz subsystems: - - morph: systems/initramfs-x86_64.morph + - morph: systems/initramfs.morph deploy: initramfs: type: initramfs diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph.in index c8ac0681..c8ac0681 100644 --- a/clusters/jetson-upgrade.morph +++ b/clusters/jetson-upgrade.morph.in diff --git a/clusters/mason-openstack.morph b/clusters/mason-openstack.morph.in index cc7c1d4d..cc7c1d4d 100644 --- a/clusters/mason-openstack.morph +++ b/clusters/mason-openstack.morph.in diff --git a/clusters/mason.morph b/clusters/mason.morph.in index 376cf337..376cf337 100644 --- a/clusters/mason.morph +++ b/clusters/mason.morph.in diff --git a/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph b/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph index 3154fa26..931b9b11 100644 --- a/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph +++ b/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph @@ -1,7 +1,7 @@ name: minimal-system-armv5l-openbmc-aspeed-deploy kind: cluster systems: -- morph: systems/minimal-system-armv5l-openbmc-aspeed.morph +- morph: systems/minimal-system.armv5l-openbmc-aspeed.morph deploy: minimal-system-armv5l-openbmc-aspeed: type: extensions/jffs2 diff --git a/clusters/minimal-system-deploy.morph b/clusters/minimal-system-deploy.morph.in index cf8de54f..cf8de54f 100644 --- a/clusters/minimal-system-deploy.morph +++ b/clusters/minimal-system-deploy.morph.in diff --git a/clusters/moonshot-m2-armv8b64.morph b/clusters/moonshot-m2-armv8b64.morph index caa460c3..d14b4435 100644 --- a/clusters/moonshot-m2-armv8b64.morph +++ b/clusters/moonshot-m2-armv8b64.morph @@ -5,7 +5,7 @@ description: | Moonshot node, using a combination of the pxeboot.write extension and the installer system. systems: -- morph: systems/installer-system-armv8b64.morph +- morph: systems/installer-system.armv8b64.morph deploy: installer: type: extensions/pxeboot @@ -41,7 +41,7 @@ systems: INSTALL_FILES: install-files/moonshot/manifest MOONSHOT_KERNEL: true subsystems: - - morph: systems/devel-system-armv8b64.morph + - morph: systems/devel-system.armv8b64.morph deploy: to-install: type: extensions/sysroot diff --git a/clusters/moonshot-pxe-armv8b64.morph b/clusters/moonshot-pxe-armv8b64.morph index af59817a..2b723b11 100644 --- a/clusters/moonshot-pxe-armv8b64.morph +++ b/clusters/moonshot-pxe-armv8b64.morph @@ -6,7 +6,7 @@ description: | The system will be configured to boot through PXE from existing DHCP, TFTP and NFS servers. systems: -- morph: systems/devel-system-armv8b64.morph +- morph: systems/devel-system.armv8b64.morph deploy: netboot: type: extensions/pxeboot diff --git a/clusters/moonshot-pxe-armv8l64.morph b/clusters/moonshot-pxe-armv8l64.morph index 80771d52..def8a0bd 100644 --- a/clusters/moonshot-pxe-armv8l64.morph +++ b/clusters/moonshot-pxe-armv8l64.morph @@ -6,7 +6,7 @@ description: | The system will be configured to boot through PXE from existing DHCP, TFTP and NFS servers. systems: -- morph: systems/devel-system-armv8l64.morph +- morph: systems/devel-system.armv8l64.morph deploy: netboot: type: extensions/pxeboot diff --git a/clusters/openstack-one-node-swift.morph b/clusters/openstack-one-node-swift.morph.in index fc289538..fc289538 100644 --- a/clusters/openstack-one-node-swift.morph +++ b/clusters/openstack-one-node-swift.morph.in diff --git a/clusters/openstack-one-node.morph b/clusters/openstack-one-node.morph.in index 12985463..12985463 100644 --- a/clusters/openstack-one-node.morph +++ b/clusters/openstack-one-node.morph.in diff --git a/clusters/openstack-three-node-installer.morph b/clusters/openstack-three-node-installer.morph.in index 144f29f2..144f29f2 100644 --- a/clusters/openstack-three-node-installer.morph +++ b/clusters/openstack-three-node-installer.morph.in diff --git a/clusters/openstack-two-node-installer.morph b/clusters/openstack-two-node-installer.morph.in index 0c08bd4f..0c08bd4f 100644 --- a/clusters/openstack-two-node-installer.morph +++ b/clusters/openstack-two-node-installer.morph.in diff --git a/clusters/release-genivi-baseline.morph b/clusters/release-genivi-baseline.morph.in index f7e07042..f7e07042 100644 --- a/clusters/release-genivi-baseline.morph +++ b/clusters/release-genivi-baseline.morph.in diff --git a/clusters/release.morph b/clusters/release.morph.in index fe07665f..5af66ab0 100644 --- a/clusters/release.morph +++ b/clusters/release.morph.in @@ -7,50 +7,50 @@ description: | you can deploy the systems yourself, if you are making a Baserock release then the script should be used. systems: -- morph: systems/build-system-x86_32-chroot.morph +- morph: systems/build-system.x86_32-chroot.morph deploy: build-system-x86_32-chroot: type: extensions/tar - location: build-system-x86_32-chroot.tar - HOSTNAME: build-system-x86-32-chroot -- morph: systems/build-system-x86_32.morph + location: build-system.x86_32-chroot.tar + HOSTNAME: build-system.x86-32-chroot +- morph: systems/build-system.x86_32.morph deploy: build-system-x86_32: type: extensions/rawdisk - location: build-system-x86_32.img + location: build-system.x86_32.img DISK_SIZE: 6G - HOSTNAME: build-system-x86-32 -- morph: systems/build-system-x86_64-chroot.morph + HOSTNAME: build-system.x86-32 +- morph: systems/build-system.x86_64-chroot.morph deploy: build-system-x86_64-chroot: type: extensions/tar - location: build-system-x86_64-chroot.tar + location: build-system.x86_64-chroot.tar HOSTNAME: build-system-x86-64-chroot -- morph: systems/build-system-x86_64.morph +- morph: systems/build-system.x86_64.morph deploy: build-system-x86_64: type: extensions/rawdisk - location: build-system-x86_64.img + location: build-system.x86_64.img DISK_SIZE: 6G INITRAMFS_PATH: boot/initramfs.gz HOSTNAME: build-system-x86-64 subsystems: - - morph: systems/initramfs-x86_64.morph + - morph: systems/initramfs.x86_64.morph deploy: initramfs-build-system-x86_64: type: extensions/initramfs location: boot/initramfs.gz -- morph: systems/build-system-armv7lhf-rootfs.morph +- morph: systems/build-system.armv7lhf-rootfs.morph deploy: build-system-armv7lhf-rootfs: type: extensions/tar - location: build-system-armv7lhf-rootfs.tar - HOSTNAME: build-system-armv7lhf-rootfs -- morph: systems/build-system-armv7lhf-jetson.morph + location: build-system.armv7lhf-rootfs.tar + HOSTNAME: build-system.armv7lhf-rootfs +- morph: systems/build-system.armv7lhf-jetson.morph deploy: build-system-armv7lhf-jetson: type: extensions/rawdisk - location: build-system-armv7lhf-jetson.img + location: build-system.armv7lhf-jetson.img DISK_SIZE: 3G BOOT_DEVICE: /dev/mmcblk0p1 ROOT_DEVICE: /dev/mmcblk0p2 diff --git a/clusters/sdk-example-cluster.morph b/clusters/sdk-example-cluster.morph.in index a4413c3b..b1096423 100644 --- a/clusters/sdk-example-cluster.morph +++ b/clusters/sdk-example-cluster.morph.in @@ -31,15 +31,15 @@ description: | See the documentation of the sdk.write extension for more information. systems: -- morph: systems/armv7lhf-cross-toolchain-system-x86_64.morph +- morph: systems/armv7lhf-cross-toolchain-system.{{CONFIG}}.morph deploy: sdk: type: extensions/sdk - location: armv7lhf-cross-toolchain-system-x86_64.sh + location: armv7lhf-cross-toolchain-system.sh PREFIX: /usr TARGET: armv7lhf-baserock-linux-gnueabi subsystems: - - morph: systems/devel-system-armv7lhf-highbank.morph + - morph: systems/devel-system.armv7lhf.morph deploy: sysroot: type: extensions/sysroot diff --git a/clusters/trove-example.morph b/clusters/trove-example.morph.in index 81b1c901..fae234de 100644 --- a/clusters/trove-example.morph +++ b/clusters/trove-example.morph.in @@ -32,7 +32,7 @@ description: | You can find documentation for Trove at the following web address: http://wiki.baserock.org/Trove/ systems: -- morph: systems/trove-system-x86_64.morph +- morph: systems/trove-system.{{CONFIG}}.morph deploy-defaults: HOSTNAME: test-trove VCPUS: 2 diff --git a/clusters/upgrade-devel.morph b/clusters/upgrade-devel.morph.in index dcf1cd8d..63648f29 100644 --- a/clusters/upgrade-devel.morph +++ b/clusters/upgrade-devel.morph.in @@ -32,7 +32,7 @@ description: | On a base system, use 'diff -r' instead of 'git diff --no-index'. It will not be as colourful. systems: -- morph: systems/devel-system-x86_64-generic.morph +- morph: systems/devel-system.{{ CONFIG }}morph deploy: self: upgrade-type: extensions/ssh-rsync diff --git a/clusters/weston-qt5-system-x86_64-deploy.morph b/clusters/weston-qt5-system-deploy.morph.in index 64700314..539d590f 100644 --- a/clusters/weston-qt5-system-x86_64-deploy.morph +++ b/clusters/weston-qt5-system-deploy.morph.in @@ -1,22 +1,22 @@ -name: weston-qt5-system-x86_64 +name: weston-qt5-system-deploy kind: cluster description: | - Deploy a stock weston system. + Deploy a stock Weston system with Qt5. The resulting image can be copied to a USB and booted from there, as well as in a virtual machine. systems: -- morph: systems/weston-qt5-system-x86_64.morph +- morph: systems/weston-qt5-system.{{CONFIG}}.morph deploy: weston-qt5-system-x86_64: type: extensions/rawdisk - location: /weston-qt5-system-x86_64.img + location: /weston-qt5-system.img DISK_SIZE: 4G KERNEL_ARGS: vga=788 INITRAMFS_PATH: boot/initramfs.gz subsystems: - - morph: systems/initramfs-x86_64.morph + - morph: systems/initramfs.{{CONFIG}}.morph deploy: initramfs: type: initramfs diff --git a/clusters/weston-system-x86_64-generic-deploy.morph b/clusters/weston-system-deploy.morph.in index 65e35bd7..09f35a6d 100644 --- a/clusters/weston-system-x86_64-generic-deploy.morph +++ b/clusters/weston-system-deploy.morph.in @@ -1,4 +1,4 @@ -name: weston-system-x86_64-generic-deploy +name: weston-system-deploy kind: cluster description: | Deploy a stock weston system. @@ -7,16 +7,16 @@ description: | as well as in a virtual machine. systems: -- morph: systems/weston-system-x86_64-generic.morph +- morph: systems/weston-system.{{CONFIG}}.morph deploy: - weston-system-x86_64-generic: + weston-system: type: extensions/rawdisk - location: /weston-system-x86_64-generic.img + location: /weston-system.img DISK_SIZE: 4G KERNEL_ARGS: vga=788 INITRAMFS_PATH: boot/initramfs.gz subsystems: - - morph: systems/initramfs-x86_64.morph + - morph: systems/initramfs.{{CONFIG}}.morph deploy: initramfs: type: extensions/initramfs diff --git a/clusters/xfce-system-x86_64-deploy.morph b/clusters/xfce-system-deploy.morph.in index e8bfe1e9..839892b6 100644 --- a/clusters/xfce-system-x86_64-deploy.morph +++ b/clusters/xfce-system-deploy.morph.in @@ -1,4 +1,4 @@ -name: xfce-system-x86_64-deploy +name: xfce-system-deploy kind: cluster description: | Deploy a stock XFCE system. @@ -7,16 +7,16 @@ description: | as well as in a virtual machine. systems: -- morph: systems/xfce-system-x86_64.morph +- morph: systems/xfce-system.{{ ARCH }}.morph deploy: - xfce-system-x86_64: + xfce-system: type: extensions/rawdisk - location: /xfce-system-x86_64.img + location: /xfce-system.img DISK_SIZE: 6G KERNEL_ARGS: vga=788 INITRAMFS_PATH: boot/initramfs.gz subsystems: - - morph: systems/initramfs-x86_64.morph + - morph: systems/initramfs.{{ ARCH }}.morph deploy: initramfs: type: extensions/initramfs diff --git a/clusters/zookeeper.morph b/clusters/zookeeper.morph.in index 80197726..778c7d92 100644 --- a/clusters/zookeeper.morph +++ b/clusters/zookeeper.morph.in @@ -1,7 +1,7 @@ name: zookeeper kind: cluster systems: -- morph: systems/zookeeper-client-x86_64.morph +- morph: systems/zookeeper-client.{{CONFIG}}.morph deploy: my-client-system: type: extensions/kvm @@ -10,7 +10,7 @@ systems: RAM_SIZE: 1G VCPUS: 1 HOSTNAME: zkclient -- morph: systems/zookeeper-server-x86_64.morph +- morph: systems/zookeeper-server.{{CONFIG}}.morph deploy: my-server-system: type: extensions/kvm diff --git a/configure b/configure new file mode 100755 index 00000000..e1d3e176 --- /dev/null +++ b/configure @@ -0,0 +1,330 @@ +#!/usr/bin/env python +# Copyright (C) 2016 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. + +'''Baserock Definitions configuration script. + +This generates various .morph files from corresponding .morph.in files. The +.morph.in files should use Jinja2 syntax to use the configuration parameters. + +There are predefined configurations you can use, for example 'x86_64-generic': + + ./configure x86_64-generic + +Run `./configure --list-configs` for a full list of these. + +You can also define your own configuration, but the name must not clash with +any of the built-in ones. For example: + + ./configure jetson-be --arch=armv7b + +The generated .morph files are named like `name.{{CONFIG}}.morph`; for example +`build-system.x86_64-generic.morph`. This means you can have as many +configurations set up in parallel as you want, as long as the names don't +clash. + +The 'configure' tool saves your configurations to a hidden file, and will +point out when you change an existing configuration. + +For information on the Jinja2 templating language, see: + + <http://jinja.pocoo.org/docs/dev/templates/> + +To add a new config setting, add it to the PARAMETERS dictionary, and possibly +add a new named configuration that uses it in the NAMED_CONFIGS list. + +''' + +import jinja2 + +import argparse +import json +import os +import sys +import tempfile + + +DEFAULT_ARCH = os.uname()[-1] + + +# All known configuration parameters. Names should be uppercase with _ to +# separate words. Each one is converted to a commandline option, these will +# be lowercase and use - to separate words. Properties are the same as for +# the 'argparse' module. +PARAMETERS = { + 'ARCH': dict( + type=str, default=DEFAULT_ARCH, + help="set architecture (default: %(default)s)", + ), + 'BSP': dict( + type=str, default=os.uname()[-1], + help="set 'board support' stratum (default: %(default)s)", + ), + 'ENABLE_VAGRANT_BASEBOX': dict( + type=bool, default=False, + help="configure systems that support it to work as Vagrant baseboxes", + ), +} + + +def compare_configs(a, b): + '''Compare two configuration dicts. + + Unset values are filled in from the defaults in PARAMETERS. + + ''' + for key in set(a.keys()).union(set(b.keys())): + default = PARAMETERS[key].get('default') + if a.get(key, default) != b.get(key, default): + return False + return True + + +# A list of predefined configurations. Users aren't allowed to use these names +# for other configurations. The idea of this is that users can report a failure +# in a specific config ('jetson', for example) and we will know exactly what +# the generated .morph file they are building should contain. +# +# Bear in mind that the Baserock reference systems are examples. Configurations +# listed here probably worked at some point, but they may not work now without +NAMED_CONFIGS = { + 'armv7b-highbank': dict( + ARCH='armv7b', BSP='armv7b-highbank'), + 'armv7b-vexpress-tc2': dict( + ARCH='armv7b', BSP='armv7b-vexpress-tc2'), + 'armv7l-altera-socfpga-devkit': dict( + ARCH='armv7l', BSP='armv7l-altera-socfpga-devkit'), + 'armv7l-versatile': dict( + ARCH='armv7l', BSP='armv7-versatile'), + 'armv7lhf-chroot': dict( + ARCH='armv7lhf', BSP=None), + 'armv7lhf-highbank': dict( + ARCH='armv7lhf', BSP='armv7-highbank'), + 'armv8b64-generic': dict( + ARCH='armv8b64', BSP='armv8b64-generic'), + 'armv8l64-generic': dict( + ARCH='armv8l64', BSP='armv8l64-generic'), + 'jetson': dict( + ARCH='armv7lhf', BSP='jetson'), + 'openbmc-aspeed': dict( + ARCH='armv5l', BSP='armv5l-openbmc-aspeed'), + 'ppc64-chroot': dict( + ARCH='ppc64', BSP=None), + 'ppc64-generic': dict( + ARCH='ppc64', BSP='ppc64-generic'), + 'wandboard': dict( + ARCH='armv7lhf', BSP='wandboard'), + 'x86_32-chroot': dict( + ARCH='x86_32', BSP=None), + 'x86_32-generic': dict( + ARCH='x86_32', BSP='x86_32-generic'), + 'x86_64-chroot': dict( + ARCH='x86_64', BSP=None), + 'x86_64-generic': dict( + ARCH='x86_64', BSP='x86_64-generic'), + 'x86_64-vagrant': dict( + ARCH='x86_64', BSP='x86_64-vagrant', ENABLE_VAGRANT_BASEBOX=True), +} + + +def argument_parser(): + '''Generate a commandline argument parser for `configure`. + + The values from PARAMETERS are turned into proper commandline arguments. + + ''' + parser = argparse.ArgumentParser( + description="Baserock Definitions configure script") + + parser.add_argument( + 'name', nargs='?', + help="name of this configuration") + + class list_all_configs_and_exit(argparse.Action): + def __call__(*args, **kwargs): + sys.stdout.write('Built-in configurations:\n ') + sys.stdout.write('\n '.join(sorted(name for name in NAMED_CONFIGS))) + sys.stdout.write('\n') + sys.exit(0) + + parser.add_argument( + '--list-configs', '-l', nargs=0, action=list_all_configs_and_exit, + help="list all named configurations") + + parser.add_argument( + '--output-dir', '-o', + help="directory to output generated files to (default: current dir)", + default='.', metavar='DIR') + + def config_var_to_arg(name): + return '--' + name.lower().replace('_', '-') + + for name, settings in PARAMETERS.iteritems(): + if settings['type'] == bool: + # argparse handles true/false parameters in a 'special' way. + argparse_settings = settings.copy() + del argparse_settings['type'] + if settings['default'] == True: + argparse_settings['action'] = 'store_false' + elif settings['default'] == False: + argparse_settings['action'] = 'store_true' + parser.add_argument( + config_var_to_arg(name), **argparse_settings) + else: + parser.add_argument( + config_var_to_arg(name), **settings) + + return parser + + +class SaveFile(file): + '''Save files with a temporary name and rename when they're ready.''' + + def __init__(self, filename, *args, **kwargs): + self.real_filename = filename + dirname = os.path.dirname(filename) + fd, self._savefile_tempname = tempfile.mkstemp(dir=dirname) + os.close(fd) + file.__init__(self, self._savefile_tempname, *args, **kwargs) + + def abort(self): + os.remove(self._savefile_tempname) + return file.close(self) + + def close(self): + ret = file.close(self) + os.rename(self._savefile_tempname, self.real_filename) + return ret + + +def status(message, *args): + print(message % args) + + +def get_jinja_vars(args): + '''Work out the actual configuration values we should be using. + + If a named configuration was specified, we use that. + + ''' + if args.name and args.name in NAMED_CONFIGS: + jinja_vars = NAMED_CONFIGS[args.name] + + # We don't allow customising these configurations. + for param_name, param_settings in PARAMETERS.items(): + value = getattr(args, param_name.lower()) + expected_value = param_settings.get('default') + if value != expected_value: + raise RuntimeError( + "Please specify a custom name for this configuration, or " + "use the expected value for %s: %s" % ( + param_name, NAMED_CONFIGS[args.name][param_name])) + if param_name not in jinja_vars: + jinja_vars[param_name] = expected_value + + jinja_vars['CONFIG'] = args.name + else: + jinja_vars = {} + + for param_name, param_settings in PARAMETERS.items(): + value = getattr(args, param_name.lower()) + jinja_vars[param_name] = value + + if args.name: + jinja_vars['CONFIG'] = args.name + else: + # If this config matches a built-in one, use that name + for name, config in NAMED_CONFIGS.items(): + if jinja_vars == config: + jinja_vars['CONFIG'] = name + break + else: + raise RuntimeError( + "Please specify a name for this configuration, or use one of " + "the built-in configurations (use `-l` to get a list).") + + return jinja_vars + + +def generate(environment, input_path, output_dir, jinja_vars): + '''Generate a .morph file from a .morph.in file, using Jinja2.''' + base_name = os.path.basename(input_path[:-len('.morph.in')]) + output_name = base_name + '.' + jinja_vars['CONFIG'] + '.morph' + output_path = os.path.join(output_dir, output_name) + + try: + input_file = environment.get_template(input_path) + except jinja2.exceptions.TemplateSyntaxError as e: + raise RuntimeError("%s:%i: %s" % (e.filename, e.lineno, e)) + + with SaveFile(output_path, 'w') as f: + f.write('# Generated from %s\n' % input_path) + f.write(input_file.render(**jinja_vars) + '\n') + f.write('# Generated from %s\n' % input_path) + + +def main(): + args = argument_parser().parse_args() + + output_dir = args.output_dir or '.' + + jinja_vars = get_jinja_vars(args) + config_name = jinja_vars['CONFIG'] + + if not os.path.isdir(output_dir): + os.mkdir(output_dir) + + configs_file = os.path.join(output_dir, '.configurations') + try: + with open(configs_file, 'r') as f: + existing_configs = json.load(f) + except (IOError, ValueError) as e: + existing_configs = dict() + + loader = jinja2.FileSystemLoader('.') + environment = jinja2.Environment(loader=loader) + + if config_name in existing_configs: + status("Regenerating '%s' configuration:" % config_name) + existing_config = existing_configs[config_name] + else: + status("Generating '%s' configuration:" % config_name) + existing_configs = None + + for var, value in jinja_vars.items(): + if var != 'CONFIG': + if var in existing_config and existing_config[var] != value: + status(" %s: %s (was: %s)" % (var, value, + existing_config[var])) + else: + status(" %s: %s" % (var, value)) + + for dirpath, dirnames, filenames in os.walk('.'): + for f in filenames: + if f.endswith('.morph.in'): + input_path = os.path.join(dirpath, f) + + generate (environment, input_path, + os.path.join(output_dir, dirpath), jinja_vars) + + existing_configs[config_name] = jinja_vars + with SaveFile(configs_file, 'w') as f: + json.dump(existing_configs, f) + + +try: + main() +except RuntimeError as e: + sys.stderr.write("%s\n" % e) + sys.exit(1) diff --git a/strata/bsp-x86_both-tools.morph b/strata/syslinux-group.morph index 0d159ce6..a7f5afca 100644 --- a/strata/bsp-x86_both-tools.morph +++ b/strata/syslinux-group.morph @@ -1,19 +1,19 @@ -name: bsp-x86_both-tools +name: syslinux-group kind: stratum -description: The set of platform specific components required for configuring a bootable - x86 based system. +description: + The SYSLINUX bootloader. build-depends: # nasm wants asciidoc and xmlto for generating its docs # so include docutils here - morph: strata/docutils.morph chunks: - name: nasm - morph: strata/bsp-x86_both-tools/nasm.morph + morph: strata/syslinux-group/nasm.morph repo: upstream:nasm ref: 8fa0fe16408afc76ce1ae4387e1a9d46893cfda6 unpetrify-ref: nasm-2.11.08 - name: syslinux - morph: strata/bsp-x86_both-tools/syslinux.morph + morph: strata/syslinux-group/syslinux.morph repo: upstream:syslinux ref: d715b39c0801ecea5e52f9029cea7c76320f93cf unpetrify-ref: baserock/morph diff --git a/strata/bsp-x86_both-tools/nasm.morph b/strata/syslinux-group/nasm.morph index 0ab1a629..0ab1a629 100644 --- a/strata/bsp-x86_both-tools/nasm.morph +++ b/strata/syslinux-group/nasm.morph diff --git a/strata/bsp-x86_both-tools/syslinux.morph b/strata/syslinux-group/syslinux.morph index 4570865b..4570865b 100644 --- a/strata/bsp-x86_both-tools/syslinux.morph +++ b/strata/syslinux-group/syslinux.morph diff --git a/strata/virtualbox-guest-x86_64.morph b/strata/virtualbox-guest-x86_64.morph.in index fadcec92..610c795a 100644 --- a/strata/virtualbox-guest-x86_64.morph +++ b/strata/virtualbox-guest-x86_64.morph.in @@ -1,20 +1,20 @@ -name: virtualbox-guest-x86_64 +name: virtualbox-guest kind: stratum description: | - VirtualBox Guest Additions for x86_64 + VirtualBox Guest Additions build-depends: - morph: strata/tools.morph -- morph: strata/bsp-x86_64-generic.morph +- morph: strata/bsp-{{BSP}}.morph - morph: strata/x-common.morph - morph: strata/x-generic.morph chunks: - name: yasm - morph: strata/virtualbox-guest-x86_64/yasm.morph + morph: strata/virtualbox-guest/yasm.morph repo: upstream:yasm ref: fefefe262eb29081f0bcb4d48f2d476ce5730562 unpetrify-ref: baserock/morph - name: vboxguest - morph: strata/virtualbox-guest-x86_64/vboxguest.morph + morph: strata/virtualbox-guest/vboxguest.morph repo: upstream:VirtualBox ref: 617aeb5a3c13f4a46423e8c2fb560449403ad56d unpetrify-ref: baserock/morph diff --git a/strata/virtualbox-guest-x86_64/vboxguest.morph b/strata/virtualbox-guest/vboxguest.morph index f31c9944..f31c9944 100644 --- a/strata/virtualbox-guest-x86_64/vboxguest.morph +++ b/strata/virtualbox-guest/vboxguest.morph diff --git a/strata/virtualbox-guest-x86_64/yasm.morph b/strata/virtualbox-guest/yasm.morph index 437ae97d..437ae97d 100644 --- a/strata/virtualbox-guest-x86_64/yasm.morph +++ b/strata/virtualbox-guest/yasm.morph diff --git a/systems/armv7lhf-cross-toolchain-system-x86_64.morph b/systems/armv7lhf-cross-toolchain-system-x86_64.morph deleted file mode 100644 index 1bd1adc1..00000000 --- a/systems/armv7lhf-cross-toolchain-system-x86_64.morph +++ /dev/null @@ -1,19 +0,0 @@ -name: armv7lhf-cross-toolchain-system-x86_64 -kind: system -description: A system that contains an ARM cross compiler, intended to be used as - a sysroot. -arch: x86_64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: armv7lhf-cross-toolchain - morph: strata/armv7lhf-cross-toolchain.morph -- name: cross-tools - morph: strata/cross-tools.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/simple-network -- extensions/nfsboot -- extensions/install-files -- extensions/install-essential-files diff --git a/systems/armv7lhf-cross-toolchain-system-x86_32.morph b/systems/armv7lhf-cross-toolchain-system.morph.in index b0ac9cfe..3d6d90ef 100644 --- a/systems/armv7lhf-cross-toolchain-system-x86_32.morph +++ b/systems/armv7lhf-cross-toolchain-system.morph.in @@ -1,8 +1,8 @@ -name: armv7lhf-cross-toolchain-system-x86_32 +name: armv7lhf-cross-toolchain-system.{{CONFIG}} kind: system description: A system that contains an ARM cross compiler, intended to be used as a sysroot. -arch: x86_32 +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph diff --git a/systems/base-system-armv7-highbank.morph b/systems/base-system-armv7-highbank.morph deleted file mode 100644 index 32d773e8..00000000 --- a/systems/base-system-armv7-highbank.morph +++ /dev/null @@ -1,20 +0,0 @@ -name: base-system-armv7-highbank -kind: system -description: The set of strata required to have a minimal system for an ARM highbank - system. -arch: armv7l -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 -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/install-essential-files diff --git a/systems/base-system-armv7-versatile.morph b/systems/base-system-armv7-versatile.morph deleted file mode 100644 index 4f039c02..00000000 --- a/systems/base-system-armv7-versatile.morph +++ /dev/null @@ -1,20 +0,0 @@ -name: base-system-armv7-versatile -kind: system -description: The set of strata required to have a minimal system for an ARM versatile - system. -arch: armv7l -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-armv7-versatile - morph: strata/bsp-armv7-versatile.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/install-essential-files diff --git a/systems/base-system-armv7b-highbank.morph b/systems/base-system-armv7b-highbank.morph deleted file mode 100644 index 969967b5..00000000 --- a/systems/base-system-armv7b-highbank.morph +++ /dev/null @@ -1,20 +0,0 @@ -name: base-system-armv7b-highbank -kind: system -description: The set of strata required to have a minimal system for an ARM highbank - system. -arch: armv7b -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-armv7b-highbank - morph: strata/bsp-armv7b-highbank.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/install-essential-files diff --git a/systems/base-system-armv7b-vexpress-tc2.morph b/systems/base-system-armv7b-vexpress-tc2.morph deleted file mode 100644 index cbfedd89..00000000 --- a/systems/base-system-armv7b-vexpress-tc2.morph +++ /dev/null @@ -1,19 +0,0 @@ -name: base-system-armv7b-vexpress-tc2 -kind: system -description: A small system for Versatile TC2 boards system. -arch: armv7b -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-armv7b-vexpress-tc2 - morph: strata/bsp-armv7b-vexpress-tc2.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/install-essential-files diff --git a/systems/base-system-armv7l-altera-socfpga-devkit.morph b/systems/base-system-armv7l-altera-socfpga-devkit.morph deleted file mode 100644 index b8fe4c28..00000000 --- a/systems/base-system-armv7l-altera-socfpga-devkit.morph +++ /dev/null @@ -1,21 +0,0 @@ -name: base-system-armv7l-altera-socfpga-devkit -kind: system -description: | - The set of strata required to have a minimal system for use on Altera SoCFPGA - development kit, using little-endian word order. -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-armv7l-altera-socfpga-devkit - morph: strata/bsp-armv7l-altera-socfpga-devkit.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/install-essential-files diff --git a/systems/base-system-armv7lhf-highbank.morph b/systems/base-system-armv7lhf-highbank.morph deleted file mode 100644 index 399931a5..00000000 --- a/systems/base-system-armv7lhf-highbank.morph +++ /dev/null @@ -1,20 +0,0 @@ -name: base-system-armv7lhf-highbank -kind: system -description: The set of strata required to have a minimal system for an ARM highbank - system. -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 -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/install-essential-files diff --git a/systems/base-system-armv8b64.morph b/systems/base-system-armv8b64.morph deleted file mode 100644 index d23bde9b..00000000 --- a/systems/base-system-armv8b64.morph +++ /dev/null @@ -1,22 +0,0 @@ -name: base-system-armv8b64 -kind: system -description: | - The set of strata required to have a minimal - system for big endian 64-bit ARMv8 computers. -arch: armv8b64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-armv8b64-generic - morph: strata/bsp-armv8b64-generic.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/moonshot-kernel -- extensions/install-essential-files diff --git a/systems/base-system-armv8l64.morph b/systems/base-system-armv8l64.morph deleted file mode 100644 index 24104a8b..00000000 --- a/systems/base-system-armv8l64.morph +++ /dev/null @@ -1,22 +0,0 @@ -name: base-system-armv8l64 -kind: system -description: | - The set of strata required to have a minimal - system for little endian 64-bit ARMv8 computers. -arch: armv8l64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-armv8l64-generic - morph: strata/bsp-armv8l64-generic.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/moonshot-kernel -- extensions/install-essential-files diff --git a/systems/base-system-ppc64-generic.morph b/systems/base-system-ppc64-generic.morph deleted file mode 100644 index 6da852e3..00000000 --- a/systems/base-system-ppc64-generic.morph +++ /dev/null @@ -1,20 +0,0 @@ -name: base-system-ppc64-generic -kind: system -description: The set of strata required to have a minimal system for a 64-bit ppc64 - system. -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 -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/install-essential-files diff --git a/systems/base-system-x86_64-generic.morph b/systems/base-system-x86_64-generic.morph deleted file mode 100644 index aa1659b3..00000000 --- a/systems/base-system-x86_64-generic.morph +++ /dev/null @@ -1,20 +0,0 @@ -name: base-system-x86_64-generic -kind: system -description: The set of strata required to have a minimal system for a 64-bit x86 - system. -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 -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/install-essential-files diff --git a/systems/base-system-x86_32-generic.morph b/systems/base-system.morph.in index d89fd913..c448041e 100644 --- a/systems/base-system-x86_32-generic.morph +++ b/systems/base-system.morph.in @@ -1,7 +1,8 @@ -name: base-system-x86_32-generic +name: base-system.{{CONFIG}} kind: system -description: The set of strata required to have a basic system for a 32-bit x86 system. -arch: x86_32 +description: | + Example Baserock system that can boot to a Bash console. +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -9,8 +10,10 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: bsp-x86_32-generic - morph: strata/bsp-x86_32-generic.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/build-system-armv7l-altera-socfpga-devkit.morph b/systems/build-system-armv7l-altera-socfpga-devkit.morph deleted file mode 100644 index 5d83cb6a..00000000 --- a/systems/build-system-armv7l-altera-socfpga-devkit.morph +++ /dev/null @@ -1,51 +0,0 @@ -name: build-system-armv7l-altera-socfpga-devkit -kind: system -description: | - The system that should be used for building other Baserock systems. For - use on Altera SoCFPGA development kit, using little-endian word order. -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-armv7l-altera-socfpga-devkit - morph: strata/bsp-armv7l-altera-socfpga-devkit.morph -- name: python2-core - morph: strata/python2-core.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: nfs - morph: strata/nfs.morph -- name: python-common - morph: strata/python-common.morph -- name: ansible - morph: strata/ansible.morph -- name: devtools - morph: strata/devtools.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/distbuild -- extensions/fstab -- extensions/mason -- extensions/install-essential-files -- extensions/hosts diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph deleted file mode 100644 index afb35fec..00000000 --- a/systems/build-system-armv7lhf-highbank.morph +++ /dev/null @@ -1,61 +0,0 @@ -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: python2-core - morph: strata/python2-core.morph -- name: bsp-armv7-highbank - morph: strata/bsp-armv7-highbank.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: nfs - morph: strata/nfs.morph -- name: python-common - morph: strata/python-common.morph -- name: ansible - morph: strata/ansible.morph -- name: cloudinit-support - morph: strata/cloudinit-support.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: devtools - morph: strata/devtools.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: unionfs-fuse-group - morph: strata/unionfs-fuse-group.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/distbuild -- extensions/fstab -- extensions/mason -- extensions/cloud-init -- extensions/install-essential-files -- extensions/hosts diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph deleted file mode 100644 index 16c8a7d6..00000000 --- a/systems/build-system-armv7lhf-jetson.morph +++ /dev/null @@ -1,59 +0,0 @@ -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: python2-core - morph: strata/python2-core.morph -- name: bsp-jetson - morph: strata/bsp-jetson.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: nfs - morph: strata/nfs.morph -- name: python-common - morph: strata/python-common.morph -- name: ansible - morph: strata/ansible.morph -- name: cloudinit-support - morph: strata/cloudinit-support.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: devtools - morph: strata/devtools.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/distbuild -- extensions/fstab -- extensions/mason -- extensions/cloud-init -- extensions/install-essential-files -- extensions/hosts diff --git a/systems/build-system-armv7lhf-rootfs.morph b/systems/build-system-armv7lhf-rootfs.morph deleted file mode 100644 index 7a614c62..00000000 --- a/systems/build-system-armv7lhf-rootfs.morph +++ /dev/null @@ -1,57 +0,0 @@ -name: build-system-armv7lhf-rootfs -kind: system -description: The system that should be used for building all other Baserock systems - for ARMv7 little-endian hard-float, rootfs variant. -arch: armv7lhf -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: python2-core - morph: strata/python2-core.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: nfs - morph: strata/nfs.morph -- name: python-common - morph: strata/python-common.morph -- name: ansible - morph: strata/ansible.morph -- name: cloudinit-support - morph: strata/cloudinit-support.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: devtools - morph: strata/devtools.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/distbuild -- extensions/fstab -- extensions/mason -- extensions/cloud-init -- extensions/install-essential-files -- extensions/hosts diff --git a/systems/build-system-armv8b64.morph b/systems/build-system-armv8b64.morph deleted file mode 100644 index 9d7a69f6..00000000 --- a/systems/build-system-armv8b64.morph +++ /dev/null @@ -1,61 +0,0 @@ -name: build-system-armv8b64 -kind: system -description: | - The system that should be used for building all other Baserock systems - for 64-bit ARMv8 computers running in big-endian mode. -arch: armv8b64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-armv8b64-generic - morph: strata/bsp-armv8b64-generic.morph -- name: python2-core - morph: strata/python2-core.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: nfs - morph: strata/nfs.morph -- name: python-common - morph: strata/python-common.morph -- name: ansible - morph: strata/ansible.morph -- name: cloudinit-support - morph: strata/cloudinit-support.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: devtools - morph: strata/devtools.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/distbuild -- extensions/fstab -- extensions/mason -- extensions/cloud-init -- extensions/moonshot-kernel -- extensions/install-essential-files -- extensions/hosts diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph deleted file mode 100644 index d5c2a7e7..00000000 --- a/systems/build-system-armv8l64.morph +++ /dev/null @@ -1,61 +0,0 @@ -name: build-system-armv8l64 -kind: system -description: | - The system that should be used for building all other Baserock systems - for little endian 64-bit ARMv8 computers. -arch: armv8l64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: python2-core - morph: strata/python2-core.morph -- name: bsp-armv8l64-generic - morph: strata/bsp-armv8l64-generic.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: nfs - morph: strata/nfs.morph -- name: python-common - morph: strata/python-common.morph -- name: ansible - morph: strata/ansible.morph -- name: cloudinit-support - morph: strata/cloudinit-support.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: devtools - morph: strata/devtools.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/distbuild -- extensions/fstab -- extensions/mason -- extensions/cloud-init -- extensions/moonshot-kernel -- extensions/install-essential-files -- extensions/hosts diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph deleted file mode 100644 index fcedcdb0..00000000 --- a/systems/build-system-ppc64.morph +++ /dev/null @@ -1,59 +0,0 @@ -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: python2-core - morph: strata/python2-core.morph -- name: bsp-ppc64-generic - morph: strata/bsp-ppc64-generic.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: nfs - morph: strata/nfs.morph -- name: python-common - morph: strata/python-common.morph -- name: ansible - morph: strata/ansible.morph -- name: cloudinit-support - morph: strata/cloudinit-support.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: devtools - morph: strata/devtools.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/distbuild -- extensions/fstab -- extensions/mason -- extensions/cloud-init -- extensions/install-essential-files -- extensions/hosts diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph deleted file mode 100644 index 6421e5ec..00000000 --- a/systems/build-system-x86_32-chroot.morph +++ /dev/null @@ -1,59 +0,0 @@ -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: python2-core - morph: strata/python2-core.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: nfs - morph: strata/nfs.morph -- name: python-common - morph: strata/python-common.morph -- name: ansible - morph: strata/ansible.morph -- name: cloudinit-support - morph: strata/cloudinit-support.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: devtools - morph: strata/devtools.morph -- name: bsp-x86_both-tools - morph: strata/bsp-x86_both-tools.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/distbuild -- extensions/fstab -- extensions/mason -- extensions/cloud-init -- extensions/install-essential-files -- extensions/hosts diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph deleted file mode 100644 index 14959d5d..00000000 --- a/systems/build-system-x86_32.morph +++ /dev/null @@ -1,59 +0,0 @@ -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: python2-core - morph: strata/python2-core.morph -- name: bsp-x86_32-generic - morph: strata/bsp-x86_32-generic.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: nfs - morph: strata/nfs.morph -- name: python-common - morph: strata/python-common.morph -- name: ansible - morph: strata/ansible.morph -- name: cloudinit-support - morph: strata/cloudinit-support.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: devtools - morph: strata/devtools.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/distbuild -- extensions/fstab -- extensions/mason -- extensions/cloud-init -- extensions/install-essential-files -- extensions/hosts diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph deleted file mode 100644 index 55efdf3f..00000000 --- a/systems/build-system-x86_64-chroot.morph +++ /dev/null @@ -1,59 +0,0 @@ -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: python2-core - morph: strata/python2-core.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: nfs - morph: strata/nfs.morph -- name: python-common - morph: strata/python-common.morph -- name: ansible - morph: strata/ansible.morph -- name: cloudinit-support - morph: strata/cloudinit-support.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: devtools - morph: strata/devtools.morph -- name: bsp-x86_both-tools - morph: strata/bsp-x86_both-tools.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/distbuild -- extensions/fstab -- extensions/mason -- extensions/cloud-init -- extensions/install-essential-files -- extensions/hosts diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph deleted file mode 100644 index 58f6f20d..00000000 --- a/systems/build-system-x86_64.morph +++ /dev/null @@ -1,59 +0,0 @@ -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: python2-core - morph: strata/python2-core.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: nfs - morph: strata/nfs.morph -- name: python-common - morph: strata/python-common.morph -- name: ansible - morph: strata/ansible.morph -- name: cloudinit-support - morph: strata/cloudinit-support.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: devtools - morph: strata/devtools.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/distbuild -- extensions/fstab -- extensions/mason -- extensions/cloud-init -- extensions/install-essential-files -- extensions/hosts diff --git a/systems/build-system-armv5l-openbmc-aspeed.morph b/systems/build-system.morph.in index f9524161..7eaba027 100644 --- a/systems/build-system-armv5l-openbmc-aspeed.morph +++ b/systems/build-system.morph.in @@ -1,9 +1,8 @@ -name: build-system-armv5l-openbmc-aspeed +name: build-system.{{CONFIG}} kind: system description: | - The system that should be used for building other Baserock systems - for little endian ARMv5 computers. -arch: armv5l + The system that should be used for building other Baserock systems. +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -13,8 +12,6 @@ strata: morph: strata/foundation.morph - name: python2-core morph: strata/python2-core.morph -- name: bsp-armv5l-openbmc-aspeed - morph: strata/bsp-armv5l-openbmc-aspeed.morph - name: tools morph: strata/tools.morph - name: python-cliapp @@ -37,6 +34,16 @@ strata: morph: strata/mtd-utilities.morph - name: sandboxing morph: strata/sandboxing.morph + +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% elif ARCH == x86_64 or ARCH == x86_32 %} +# We still need syslinux, because it's used by some of the deploy extensions. +- name: syslinux-group + morph: strata/syslinux-group.morph +{% endif %} + configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service.morph.in index 0e263556..bfa25f55 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service.morph.in @@ -1,8 +1,8 @@ -name: ceph-service-x86_64-generic +name: ceph-service.{{CONFIG}} kind: system -description: The set of strata required to have a minimal system for a 64-bit x86 - system + the service daemons for ceph object, block and file storage. -arch: x86_64 +description: | + An example system containing the service daemons for Ceph object, block and file storage. +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -12,8 +12,6 @@ strata: morph: strata/cpp-common-libs.morph - name: foundation morph: strata/foundation.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: network-security morph: strata/network-security.morph - name: ceph-service @@ -58,6 +56,10 @@ strata: morph: strata/python-common.morph - name: chef morph: strata/chef.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/chef-system-x86_64-container.morph b/systems/chef-system.morph.in index 889eabea..2e7e1fd7 100644 --- a/systems/chef-system-x86_64-container.morph +++ b/systems/chef-system.morph.in @@ -1,7 +1,7 @@ -name: chef-system-x86_64-container +name: chef-system.{{CONFIG}} kind: system -arch: x86_64 -description: Minimal chef system suitable for running in a container +arch: {{ ARCH }} +description: Minimal Chef system configuration-extensions: - extensions/set-hostname - extensions/simple-network @@ -30,3 +30,7 @@ strata: morph: strata/chef.morph artifacts: - chef-runtime +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} diff --git a/systems/cross-bootstrap-system-armv5l-generic.morph b/systems/cross-bootstrap-system-armv5l-generic.morph deleted file mode 100644 index e479d150..00000000 --- a/systems/cross-bootstrap-system-armv5l-generic.morph +++ /dev/null @@ -1,23 +0,0 @@ -name: cross-bootstrap-system-armv5l-generic -kind: system -description: A system that produces the minimum needed to build a devel system -arch: armv5l -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: cross-bootstrap - morph: strata/cross-bootstrap.morph diff --git a/systems/cross-bootstrap-system-armv7lhf-generic.morph b/systems/cross-bootstrap-system-armv7lhf-generic.morph deleted file mode 100644 index 280b1e0e..00000000 --- a/systems/cross-bootstrap-system-armv7lhf-generic.morph +++ /dev/null @@ -1,23 +0,0 @@ -name: cross-bootstrap-system-armv7lhf-generic -kind: system -description: A system that produces the minimum needed to build a devel system -arch: armv7lhf -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: cross-bootstrap - morph: strata/cross-bootstrap.morph diff --git a/systems/cross-bootstrap-system-armv8b64-generic.morph b/systems/cross-bootstrap-system-armv8b64-generic.morph deleted file mode 100644 index 53e9f46b..00000000 --- a/systems/cross-bootstrap-system-armv8b64-generic.morph +++ /dev/null @@ -1,23 +0,0 @@ -name: cross-bootstrap-system-armv8b64-generic -kind: system -description: A system that produces the minimum needed to build a devel system -arch: armv8b64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: cross-bootstrap - morph: strata/cross-bootstrap.morph diff --git a/systems/cross-bootstrap-system-armv8l64-generic.morph b/systems/cross-bootstrap-system-armv8l64-generic.morph deleted file mode 100644 index 1214362f..00000000 --- a/systems/cross-bootstrap-system-armv8l64-generic.morph +++ /dev/null @@ -1,23 +0,0 @@ -name: cross-bootstrap-system-armv8l64-generic -kind: system -description: A system that produces the minimum needed to build a devel system -arch: armv8l64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: cross-bootstrap - morph: strata/cross-bootstrap.morph diff --git a/systems/cross-bootstrap-system-x86_64-generic.morph b/systems/cross-bootstrap-system-x86_64-generic.morph deleted file mode 100644 index ef8912ad..00000000 --- a/systems/cross-bootstrap-system-x86_64-generic.morph +++ /dev/null @@ -1,23 +0,0 @@ -name: cross-bootstrap-system-x86_64-generic -kind: system -description: A system that produces the minimum needed to build a devel system -arch: x86_64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: cross-bootstrap - morph: strata/cross-bootstrap.morph diff --git a/systems/cross-bootstrap-system-ppc64-generic.morph b/systems/cross-bootstrap-system.morph.in index 297f862b..9f1c7cbe 100644 --- a/systems/cross-bootstrap-system-ppc64-generic.morph +++ b/systems/cross-bootstrap-system.morph.in @@ -1,7 +1,7 @@ -name: cross-bootstrap-system-ppc64-generic +name: cross-bootstrap-system.{{CONFIG}} kind: system description: A system that produces the minimum needed to build a devel system -arch: ppc64 +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph diff --git a/systems/cxmanage-system-x86_64-generic.morph b/systems/cxmanage-system.morph.in index 85f74e4c..07340280 100644 --- a/systems/cxmanage-system-x86_64-generic.morph +++ b/systems/cxmanage-system.morph.in @@ -1,7 +1,7 @@ -name: cxmanage-system-x86_64-generic +name: cxmanage-system.{{CONFIG}} kind: system description: A baserock development system with calxeda management tools added -arch: x86_64 +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -9,14 +9,16 @@ strata: 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: glib-common morph: strata/glib-common.morph - name: cxmanage morph: strata/cxmanage.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph deleted file mode 100644 index b5310590..00000000 --- a/systems/devel-system-armv7-chroot.morph +++ /dev/null @@ -1,70 +0,0 @@ -name: devel-system-armv7-chroot -kind: system -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 - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: nodejs - morph: strata/nodejs.morph -- name: ruby - morph: strata/ruby.morph -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph deleted file mode 100644 index dd98ab71..00000000 --- a/systems/devel-system-armv7-highbank.morph +++ /dev/null @@ -1,73 +0,0 @@ -name: devel-system-armv7-highbank -kind: system -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 - 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: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - 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 -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: nfs - morph: strata/nfs.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: unionfs-fuse-group - morph: strata/unionfs-fuse-group.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph deleted file mode 100644 index cb533696..00000000 --- a/systems/devel-system-armv7-versatile.morph +++ /dev/null @@ -1,71 +0,0 @@ -name: devel-system-armv7-versatile -kind: system -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 - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-armv7-versatile - morph: strata/bsp-armv7-versatile.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - 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 -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: nfs - morph: strata/nfs.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph deleted file mode 100644 index c37b599d..00000000 --- a/systems/devel-system-armv7-wandboard.morph +++ /dev/null @@ -1,71 +0,0 @@ -name: devel-system-armv7-wandboard -kind: system -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 - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-wandboard - morph: strata/bsp-wandboard.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - 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 -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: nfs - morph: strata/nfs.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph deleted file mode 100644 index 87579a97..00000000 --- a/systems/devel-system-armv7b-chroot.morph +++ /dev/null @@ -1,62 +0,0 @@ -name: devel-system-armv7b-chroot -kind: system -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 - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph deleted file mode 100644 index a4f8664e..00000000 --- a/systems/devel-system-armv7b-highbank.morph +++ /dev/null @@ -1,69 +0,0 @@ -name: devel-system-armv7b-highbank -kind: system -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 - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-armv7b-highbank - morph: strata/bsp-armv7b-highbank.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: nfs - morph: strata/nfs.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: unionfs-fuse-group - morph: strata/unionfs-fuse-group.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-armv7l-altera-socfpga-devkit.morph b/systems/devel-system-armv7l-altera-socfpga-devkit.morph deleted file mode 100644 index f4e74723..00000000 --- a/systems/devel-system-armv7l-altera-socfpga-devkit.morph +++ /dev/null @@ -1,66 +0,0 @@ -name: devel-system-armv7l-altera-socfpga-devkit -kind: system -description: | - A system with useful tools for doing Baserock development. - - For use on Altera SoCFPGA development kit, using little-endian word - order. -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-armv7l-altera-socfpga-devkit - morph: strata/bsp-armv7l-altera-socfpga-devkit.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: nodejs - morph: strata/nodejs.morph -- name: ruby - morph: strata/ruby.morph -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: nfs - morph: strata/nfs.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph deleted file mode 100644 index 90825ffe..00000000 --- a/systems/devel-system-armv7lhf-chroot.morph +++ /dev/null @@ -1,70 +0,0 @@ -name: devel-system-armv7lhf-chroot -kind: system -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 - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: nodejs - morph: strata/nodejs.morph -- name: ruby - morph: strata/ruby.morph -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph deleted file mode 100644 index 0bbe9acd..00000000 --- a/systems/devel-system-armv7lhf-highbank.morph +++ /dev/null @@ -1,76 +0,0 @@ -name: devel-system-armv7lhf-highbank -kind: system -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 - 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: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: nodejs - morph: strata/nodejs.morph -- name: ruby - morph: strata/ruby.morph -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: nfs - morph: strata/nfs.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: unionfs-fuse-group - morph: strata/unionfs-fuse-group.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph deleted file mode 100644 index 3f8ba53c..00000000 --- a/systems/devel-system-armv7lhf-jetson.morph +++ /dev/null @@ -1,74 +0,0 @@ -name: devel-system-armv7lhf-jetson -kind: system -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 - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: nfs - morph: strata/nfs.morph -- name: bsp-jetson - morph: strata/bsp-jetson.morph -- name: nodejs - morph: strata/nodejs.morph -- name: ruby - morph: strata/ruby.morph -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph deleted file mode 100644 index ae745525..00000000 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ /dev/null @@ -1,74 +0,0 @@ -name: devel-system-armv7lhf-wandboard -kind: system -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 - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-wandboard - morph: strata/bsp-wandboard.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: nodejs - morph: strata/nodejs.morph -- name: ruby - morph: strata/ruby.morph -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: nfs - morph: strata/nfs.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-armv8b64.morph b/systems/devel-system-armv8b64.morph deleted file mode 100644 index 339ae230..00000000 --- a/systems/devel-system-armv8b64.morph +++ /dev/null @@ -1,75 +0,0 @@ -name: devel-system-armv8b64 -kind: system -description: | - A system with useful tools for doing Baserock development. - - For use on 64-bit ARMv8 computers using big-endian word. -arch: armv8b64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-armv8b64-generic - morph: strata/bsp-armv8b64-generic.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - 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 -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: nfs - morph: strata/nfs.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/simple-network -- extensions/nfsboot -- extensions/install-files -- extensions/cloud-init -- extensions/moonshot-kernel -- extensions/install-essential-files diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph deleted file mode 100644 index 53b55569..00000000 --- a/systems/devel-system-armv8l64.morph +++ /dev/null @@ -1,76 +0,0 @@ -name: devel-system-armv8l64 -kind: system -description: | - A system with useful tools for doing Baserock development. - - For use on 64-bit ARMv8 computers using little-endian word. -arch: armv8l64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-armv8l64-generic - morph: strata/bsp-armv8l64-generic.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: cloudinit-support - morph: strata/cloudinit-support.morph -- name: ruby - morph: strata/ruby.morph -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: nfs - morph: strata/nfs.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/simple-network -- extensions/nfsboot -- extensions/install-files -- extensions/cloud-init -- extensions/moonshot-kernel -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph deleted file mode 100644 index 5b6ad771..00000000 --- a/systems/devel-system-ppc64-chroot.morph +++ /dev/null @@ -1,68 +0,0 @@ -name: devel-system-ppc64-chroot -kind: system -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 - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: ruby - morph: strata/ruby.morph -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph deleted file mode 100644 index f06d23f7..00000000 --- a/systems/devel-system-ppc64-generic.morph +++ /dev/null @@ -1,71 +0,0 @@ -name: devel-system-ppc64-generic -kind: system -description: | - A system with useful tools for doing Baserock development. - - For use on 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: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - morph: strata/openstack-clients.morph -- name: ruby - morph: strata/ruby.morph -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: nfs - morph: strata/nfs.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph deleted file mode 100644 index acbf9a2d..00000000 --- a/systems/devel-system-x86_32-chroot.morph +++ /dev/null @@ -1,70 +0,0 @@ -name: devel-system-x86_32-chroot -kind: system -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 - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-clients - 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 -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph deleted file mode 100644 index fe376fcd..00000000 --- a/systems/devel-system-x86_32-generic.morph +++ /dev/null @@ -1,76 +0,0 @@ -name: devel-system-x86_32-generic -kind: system -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 - 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: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - 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 -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: nfs - morph: strata/nfs.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/cloud-init -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph deleted file mode 100644 index 47e3d123..00000000 --- a/systems/devel-system-x86_64-chroot.morph +++ /dev/null @@ -1,72 +0,0 @@ -name: devel-system-x86_64-chroot -kind: system -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 - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: foundation - morph: strata/foundation.morph -- name: tools - morph: strata/tools.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-common - morph: strata/openstack-common.morph -- name: openstack-clients - 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 -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph deleted file mode 100644 index fb1e7e9f..00000000 --- a/systems/devel-system-x86_64-vagrant.morph +++ /dev/null @@ -1,74 +0,0 @@ -name: devel-system-x86_64-vagrant -kind: system -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 - 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: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: openstack-common - morph: strata/openstack-common.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 -- name: lorry - morph: strata/lorry.morph -- name: baserock-import - morph: strata/baserock-import.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python-tools - morph: strata/python-tools.morph -- name: python-common - morph: strata/python-common.morph -- name: devtools - morph: strata/devtools.morph -- name: ansible - morph: strata/ansible.morph -- name: swift - morph: strata/swift.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: perl-common - morph: strata/perl-common.morph -- name: CPAN-Mini-Inject - morph: strata/CPAN-Mini-Inject.morph -- name: sandboxing - morph: strata/sandboxing.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/vagrant -- extensions/fstab -- extensions/install-essential-files diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system.morph.in index 91c416c6..d2944880 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system.morph.in @@ -1,10 +1,8 @@ -name: devel-system-x86_64-generic +name: devel-system.{{CONFIG}} kind: system description: | A system with useful tools for doing Baserock development. - - For use on 64-bit Intel x86 computers. -arch: x86_64 +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -12,8 +10,6 @@ strata: 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: python-cliapp @@ -70,6 +66,18 @@ strata: morph: strata/elixir.morph - name: sandboxing morph: strata/sandboxing.morph +{% if ENABLE_VAGRANT_BASEBOX %} +- name: virtualbox-guest + morph: strata/virtualbox-guest.morph +{% endif %} +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% elif ARCH == x86_64 or ARCH == x86_32 %} +# We still need syslinux, because it's used by some of the deploy extensions. +- name: syslinux-group + morph: strata/syslinux-group.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files @@ -79,3 +87,6 @@ configuration-extensions: - extensions/cloud-init - extensions/fstab - extensions/install-essential-files +{% if ENABLE_VAGRANT_BASEBOX %} +- extensions/vagrant +{% endif %} diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph deleted file mode 100644 index ccf59f81..00000000 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ /dev/null @@ -1,52 +0,0 @@ -name: genivi-baseline-system-armv7lhf-jetson -kind: system -description: A GENIVI baseline system for a Jetson TK. -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 - morph: strata/bsp-jetson.morph -- name: connectivity - morph: strata/connectivity.morph -- name: connman-common - morph: strata/connman-common.morph -- name: device-management - morph: strata/device-management.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph -- name: glib-common - morph: strata/glib-common.morph -- name: libdrm-common - morph: strata/libdrm-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph -- name: genivi - morph: strata/genivi.morph -- name: wayland-generic - morph: strata/wayland-generic.morph -- name: graphics-common - morph: strata/graphics-common.morph -- name: input-common - morph: strata/input-common.morph -- name: mesa-common - morph: strata/mesa-common.morph -- name: x-common - morph: strata/x-common.morph -- name: weston-genivi - morph: strata/weston-genivi.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/strip-gplv3 -- extensions/fstab -- extensions/install-essential-files -- extensions/genivi diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph deleted file mode 100644 index 74493383..00000000 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ /dev/null @@ -1,50 +0,0 @@ -name: genivi-baseline-system-armv7lhf-versatile -kind: system -description: A GENIVI baseline system for an ARMv7 system. -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-versatile - morph: strata/bsp-armv7-versatile.morph -- name: connectivity - morph: strata/connectivity.morph -- name: connman-common - morph: strata/connman-common.morph -- name: device-management - morph: strata/device-management.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph -- name: glib-common - morph: strata/glib-common.morph -- name: libdrm-common - morph: strata/libdrm-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph -- name: genivi - morph: strata/genivi.morph -- name: wayland-generic - morph: strata/wayland-generic.morph -- name: graphics-common - morph: strata/graphics-common.morph -- name: input-common - morph: strata/input-common.morph -- name: x-common - morph: strata/x-common.morph -- name: weston-genivi - morph: strata/weston-genivi.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/strip-gplv3 -- extensions/fstab -- extensions/install-essential-files -- extensions/genivi diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system.morph.in index bbef3ee3..2269219f 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system.morph.in @@ -1,7 +1,8 @@ -name: genivi-baseline-system-x86_64-generic +name: genivi-baseline-system.{{CONFIG}} kind: system -description: A GENIVI baseline system for a 64-bit x86 system. -arch: x86_64 +description: + An example Baserock system that is a GENIVI-compliant GENIVI Baseline. +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -9,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: connectivity morph: strata/connectivity.morph - name: connman-common @@ -43,6 +42,10 @@ strata: morph: strata/x-common.morph - name: weston-genivi morph: strata/weston-genivi.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/genivi-demo-platform-armv7lhf-jetson.morph b/systems/genivi-demo-platform-armv7lhf-jetson.morph deleted file mode 100644 index 08700b8f..00000000 --- a/systems/genivi-demo-platform-armv7lhf-jetson.morph +++ /dev/null @@ -1,79 +0,0 @@ -name: genivi-demo-platform-armv7lhf-jetson -kind: system -description: A GENIVI demo platform for a 64-bit x86 system. -arch: armv7lhf -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: cpp-common-libs - morph: strata/cpp-common-libs.morph -- name: python2-core - morph: strata/python2-core.morph -- name: glib-common - morph: strata/glib-common.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-jetson - morph: strata/bsp-jetson.morph -- name: connectivity - morph: strata/connectivity.morph -- name: connman-common - morph: strata/connman-common.morph -- name: device-management - morph: strata/device-management.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph -- name: libdrm-common - morph: strata/libdrm-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph -- name: navigation - morph: strata/navigation.morph -- name: genivi - morph: strata/genivi.morph -- name: wayland-generic - morph: strata/wayland-generic.morph -- name: graphics-common - morph: strata/graphics-common.morph -- name: input-common - morph: strata/input-common.morph -- name: ivi-common - morph: strata/ivi-common.morph -- name: mesa-common - morph: strata/mesa-common.morph -- name: x-common - morph: strata/x-common.morph -- name: weston-genivi - morph: strata/weston-genivi.morph -- name: ruby - morph: strata/ruby.morph -- name: icu-common - morph: strata/icu-common.morph -- name: qt5-tools - morph: strata/qt5-tools.morph -- name: qt5-tools-qtmultimedia - morph: strata/qt5-tools-qtmultimedia.morph -- name: qt5-tools-qtwebkit - morph: strata/qt5-tools-qtwebkit.morph -- name: qt5-tools-qtwayland - morph: strata/qt5-tools-qtwayland.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: genivi-demo-platform-libs - morph: strata/genivi-demo-platform-libs.morph -- name: genivi-demo-platform - morph: strata/genivi-demo-platform.morph -- name: tools - morph: strata/tools.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/fstab -- extensions/install-essential-files -- extensions/genivi diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform.morph.in index cfdb5c82..2f39074e 100644 --- a/systems/genivi-demo-platform-x86_64-generic.morph +++ b/systems/genivi-demo-platform.morph.in @@ -1,7 +1,7 @@ -name: genivi-demo-platform-x86_64-generic +name: genivi-demo-platform.{{CONFIG}} kind: system -description: A GENIVI demo platform for a 64-bit x86 system. -arch: x86_64 +description: The GENIVI demo platform +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -15,8 +15,6 @@ strata: morph: strata/glib-common.morph - name: foundation morph: strata/foundation.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: connectivity morph: strata/connectivity.morph - name: connman-common @@ -71,6 +69,10 @@ strata: morph: strata/genivi-demo-platform.morph - name: tools morph: strata/tools.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/gnome-system-armv7lhf-jetson.morph b/systems/gnome-system-armv7lhf-jetson.morph deleted file mode 100644 index c64b03f5..00000000 --- a/systems/gnome-system-armv7lhf-jetson.morph +++ /dev/null @@ -1,92 +0,0 @@ -name: gnome-system-armv7lhf-jetson -kind: system -description: A GNOME system system. -arch: armv7lhf -strata: -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph -- name: bsp-jetson - morph: strata/bsp-jetson.morph -- name: build-essential - morph: strata/build-essential.morph -- name: NetworkManager-common - morph: strata/NetworkManager-common.morph -- name: core - morph: strata/core.morph -- name: data-indexing-management - morph: strata/data-indexing-management.morph -- name: device-management - morph: strata/device-management.morph -- name: dlna-services - morph: strata/dlna-services.morph -- name: foundation - morph: strata/foundation.morph -- name: geolocation - morph: strata/geolocation.morph -- name: glib-common - morph: strata/glib-common.morph -- name: gnome - morph: strata/gnome.morph -- name: graphics-common - morph: strata/graphics-common.morph -- name: gtk-deps - morph: strata/gtk-deps.morph -- name: gtk2 - morph: strata/gtk2.morph -- name: gtk3 - morph: strata/gtk3.morph -- name: input-common - morph: strata/input-common.morph -- name: llvm-common - morph: strata/llvm-common.morph -- name: mesa-common - morph: strata/mesa-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python3-gobject - morph: strata/python3-gobject.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: ruby - morph: strata/ruby.morph -- name: libdrm-common - morph: strata/libdrm-common.morph -- name: wayland-generic - morph: strata/wayland-generic.morph -- name: weston-common - morph: strata/weston-common.morph -- name: x-common - morph: strata/x-common.morph -- name: x-drivers - morph: strata/x-drivers.morph -- name: x-generic - morph: strata/x-generic.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: xdg-app-common - morph: strata/xdg-app-common.morph -- name: network-security - morph: strata/network-security.morph -- name: icu-common - morph: strata/icu-common.morph -- name: samba - morph: strata/samba.morph -- name: secret-service - morph: strata/secret-service.morph -- name: spell-checking - morph: strata/spell-checking.morph -- name: storage-management - morph: strata/storage-management.morph -- name: cups - morph: strata/cups.morph -- name: WebKitGtk1-common - morph: strata/WebKitGtk1-common.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/install-files -- extensions/install-essential-files diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system.morph.in index 431da3b0..85c0cb5d 100644 --- a/systems/gnome-system-x86_64.morph +++ b/systems/gnome-system.morph.in @@ -1,12 +1,11 @@ -name: gnome-system-x86_64 +name: gnome-system.{{CONFIG}} kind: system -description: A GNOME system system. -arch: x86_64 +description: | + A system that boots to the GNOME graphical desktop envirionment. +arch: {{ ARCH }} strata: - name: audio-bluetooth morph: strata/audio-bluetooth.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: build-essential morph: strata/build-essential.morph - name: NetworkManager-common @@ -43,8 +42,6 @@ strata: morph: strata/mesa-common.morph - name: multimedia-common morph: strata/multimedia-common.morph -- name: multimedia-hardware-codecs-x86 - morph: strata/multimedia-hardware-codecs-x86.morph - name: multimedia-gstreamer morph: strata/multimedia-gstreamer.morph - name: multimedia-gstreamer-openmax-generic @@ -93,6 +90,14 @@ strata: morph: strata/cups.morph - name: WebKitGtk1-common morph: strata/WebKitGtk1-common.morph +{% if ARCH == 'x86_64' or ARCH == 'x86_32' %} +- name: multimedia-hardware-codecs-x86 + morph: strata/multimedia-hardware-codecs-x86.morph +{% endif %} +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/initramfs-x86_64.morph b/systems/initramfs.morph.in index 4bb0020d..73ce14fc 100644 --- a/systems/initramfs-x86_64.morph +++ b/systems/initramfs.morph.in @@ -1,7 +1,7 @@ -name: initramfs-x86_64 +name: initramfs.{{CONFIG}} kind: system -description: Initramfs for x86_64 -arch: x86_64 +description: Initramfs +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph diff --git a/systems/installer-system-armv8b64.morph b/systems/installer-system-armv8b64.morph deleted file mode 100644 index 824e2dab..00000000 --- a/systems/installer-system-armv8b64.morph +++ /dev/null @@ -1,39 +0,0 @@ -name: installer-system-armv8b64 -kind: system -description: The system that should be used as an Installer to install other Baserock - systems. -arch: armv8b64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: python2-core - morph: strata/python2-core.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-armv8b64-generic - morph: strata/bsp-armv8b64-generic.morph -- name: python-cliapp - morph: strata/python-cliapp.morph -- name: python-pygobject - morph: strata/python-pygobject.morph -- name: python-wsgi - morph: strata/python-wsgi.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: glib-common - morph: strata/glib-common.morph -- name: ostree-core - morph: strata/ostree-core.morph -- name: morph-utils - morph: strata/morph-utils.morph -- name: installer-utils - morph: strata/installer-utils.morph -configuration-extensions: -- extensions/set-hostname -- extensions/install-files -- extensions/fstab -- extensions/installer -- extensions/moonshot-kernel -- extensions/install-essential-files diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system.morph.in index aa102c15..e48266d3 100644 --- a/systems/installer-system-x86_64.morph +++ b/systems/installer-system.morph.in @@ -1,8 +1,8 @@ -name: installer-system-x86_64 +name: installer-system.{{CONFIG}} kind: system description: The system that should be used as an Installer to install other Baserock systems. -arch: x86_64 +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -12,8 +12,6 @@ strata: morph: strata/python2-core.morph - name: foundation morph: strata/foundation.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: python-cliapp morph: strata/python-cliapp.morph - name: python-pygobject @@ -30,6 +28,10 @@ strata: morph: strata/morph-utils.morph - name: installer-utils morph: strata/installer-utils.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/install-files diff --git a/systems/ivi-system-armv7lhf-jetson.morph b/systems/ivi-system-armv7lhf-jetson.morph deleted file mode 100644 index 5e10db6d..00000000 --- a/systems/ivi-system-armv7lhf-jetson.morph +++ /dev/null @@ -1,90 +0,0 @@ -name: ivi-system-armv7lhf-jetson -kind: system -description: A generic IVI system with components from GENIVI and AGL -arch: armv7lhf -strata: -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: cpp-common-libs - morph: strata/cpp-common-libs.morph -- name: data-indexing-management - morph: strata/data-indexing-management.morph -- name: device-management - morph: strata/device-management.morph -- name: dlna-services - morph: strata/dlna-services.morph -- name: foundation - morph: strata/foundation.morph -- name: geolocation - morph: strata/geolocation.morph -- name: glib-common - morph: strata/glib-common.morph -- name: graphics-common - morph: strata/graphics-common.morph -- name: icu-common - morph: strata/icu-common.morph -- name: input-common - morph: strata/input-common.morph -- name: ivi-common - morph: strata/ivi-common.morph -- name: libdrm-common - morph: strata/libdrm-common.morph -- name: libsoup-common - morph: strata/libsoup-common.morph -- name: llvm-common - morph: strata/llvm-common.morph -- name: mesa-common - morph: strata/mesa-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph -- name: multimedia-gstreamer-openmax-generic - morph: strata/multimedia-gstreamer-openmax-generic.morph -- name: navigation - morph: strata/navigation.morph -- name: network-security - morph: strata/network-security.morph -- name: NetworkManager-common - morph: strata/NetworkManager-common.morph -- name: privileges-management - morph: strata/privileges-management.morph -- name: python2-core - morph: strata/python2-core.morph -- name: python3-gobject - morph: strata/python3-gobject.morph -- name: qt5-tools - morph: strata/qt5-tools.morph -- name: qt5-tools-qtmultimedia - morph: strata/qt5-tools-qtmultimedia.morph -- name: qt5-tools-qtwebengine - morph: strata/qt5-tools-qtwebengine.morph -- name: qt5-tools-qtwayland - morph: strata/qt5-tools-qtwayland.morph -- name: ruby - morph: strata/ruby.morph -- name: samba - morph: strata/samba.morph -- name: secret-service - morph: strata/secret-service.morph -- name: spell-checking - morph: strata/spell-checking.morph -- name: storage-management - morph: strata/storage-management.morph -- name: vala-common - morph: strata/vala-common.morph -- name: wayland-generic - morph: strata/wayland-generic.morph -- name: weston-common - morph: strata/weston-common.morph -- name: x-common - morph: strata/x-common.morph -configuration-extensions: -- extensions/set-hostname -- extensions/install-essential-files diff --git a/systems/ivi-system-x86_64.morph b/systems/ivi-system.morph.in index 53d4f488..513f76a9 100644 --- a/systems/ivi-system-x86_64.morph +++ b/systems/ivi-system.morph.in @@ -1,12 +1,10 @@ -name: ivi-system-x86_64 +name: ivi-system.{{CONFIG}} kind: system description: A generic IVI system with components from GENIVI and AGL -arch: x86_64 +arch: {{ ARCH }} strata: - name: audio-bluetooth morph: strata/audio-bluetooth.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: build-essential morph: strata/build-essential.morph - name: core @@ -43,8 +41,6 @@ strata: morph: strata/mesa-common.morph - name: multimedia-common morph: strata/multimedia-common.morph -- name: multimedia-hardware-codecs-x86 - morph: strata/multimedia-hardware-codecs-x86.morph - name: multimedia-gstreamer morph: strata/multimedia-gstreamer.morph - name: multimedia-gstreamer-openmax-generic @@ -87,6 +83,14 @@ strata: morph: strata/weston-common.morph - name: x-common morph: strata/x-common.morph +{% if ARCH == 'x86_64' or ARCH == 'x86_32' %} +- name: multimedia-hardware-codecs-x86 + morph: strata/multimedia-hardware-codecs-x86.morph +{% endif %} +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/install-essential-files diff --git a/systems/java-build-system-x86_64-generic.morph b/systems/java-build-system.morph.in index b60637ba..cdae66d4 100644 --- a/systems/java-build-system-x86_64-generic.morph +++ b/systems/java-build-system.morph.in @@ -1,13 +1,11 @@ -name: java-build-system-x86_64-generic +name: java-build-system.{{CONFIG}} kind: system description: | A superset of devel-system which can build OpenJDK. There are instruction on using and testing java-build-system at: https://wiki.baserock.org/Java. - - For use on 64-bit Intel x86 computers. -arch: x86_64 +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -15,8 +13,6 @@ strata: 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: python-cliapp @@ -75,6 +71,10 @@ strata: morph: strata/graphics-common.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/minimal-system-armv5l-openbmc-aspeed.morph b/systems/minimal-system-armv5l-openbmc-aspeed.morph deleted file mode 100644 index 602e05c7..00000000 --- a/systems/minimal-system-armv5l-openbmc-aspeed.morph +++ /dev/null @@ -1,20 +0,0 @@ -name: minimal-system-armv5l-openbmc-aspeed -kind: system -description: The set of strata required to have a minimal system for armv5l -arch: armv5l -strata: -- name: build-essential - morph: strata/build-essential.morph - artifacts: - - build-essential-minimal -- name: bsp-armv5l-openbmc-aspeed - morph: strata/bsp-armv5l-openbmc-aspeed.morph - artifacts: - - bsp-armv5l-openbmc-aspeed-runtime -configuration-extensions: -- extensions/set-hostname -- extensions/simple-network -- extensions/nfsboot -- extensions/install-files -- extensions/busybox-init -- extensions/install-essential-files diff --git a/systems/minimal-system-x86_32-generic.morph b/systems/minimal-system-x86_32-generic.morph deleted file mode 100644 index 2e9f79c5..00000000 --- a/systems/minimal-system-x86_32-generic.morph +++ /dev/null @@ -1,21 +0,0 @@ -name: minimal-system-x86_32-generic -kind: system -description: The set of strata required to have a minimal system for a 32-bit x86 - system. -arch: x86_32 -strata: -- name: build-essential - morph: strata/build-essential.morph - artifacts: - - build-essential-minimal -- name: bsp-x86_32-generic - morph: strata/bsp-x86_32-generic.morph - artifacts: - - bsp-x86_32-generic-runtime -configuration-extensions: -- extensions/set-hostname -- extensions/simple-network -- extensions/nfsboot -- extensions/install-files -- extensions/busybox-init -- extensions/install-essential-files diff --git a/systems/minimal-system-x86_64-generic.morph b/systems/minimal-system.morph.in index afd9460c..019d2c8b 100644 --- a/systems/minimal-system-x86_64-generic.morph +++ b/systems/minimal-system.morph.in @@ -1,17 +1,19 @@ -name: minimal-system-x86_64-generic +name: minimal-system.{{CONFIG}} kind: system -description: The set of strata required to have a minimal system for a 64-bit x86 - system. -arch: x86_64 +description: | + An example Baserock system with a minimal disk space footprint. +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph artifacts: - build-essential-minimal -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph artifacts: - - bsp-x86_64-generic-runtime + - bsp-{{ BSP }}-runtime +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/simple-network diff --git a/systems/nodejs-system-x86_64.morph b/systems/nodejs-system.morph.in index 7fba330b..87c3c20d 100644 --- a/systems/nodejs-system-x86_64.morph +++ b/systems/nodejs-system.morph.in @@ -1,8 +1,8 @@ -name: nodejs-system-x86_64 +name: nodejs-system.{{CONFIG}} kind: system -description: A system that is able to build other systems based on the 64-bit x86 - architecture. -arch: x86_64 +description: | + Example system containing the Node.js Javascript runtime +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -10,12 +10,14 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: python2-core morph: strata/python2-core.morph - name: nodejs morph: strata/nodejs.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/ocaml-system-x86_64.morph b/systems/ocaml-system.morph.in index 9ac35d6f..1b482831 100644 --- a/systems/ocaml-system-x86_64.morph +++ b/systems/ocaml-system.morph.in @@ -1,7 +1,7 @@ -name: ocaml-system-x86_64 +name: ocaml-system.{{CONFIG}} kind: system description: OCaml base system -arch: x86_64 +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -9,10 +9,12 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: ocaml-language morph: strata/ocaml-language.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/openstack-system-x86_64.morph b/systems/openstack-system.morph.in index 7cb8c20f..35dc05dc 100644 --- a/systems/openstack-system-x86_64.morph +++ b/systems/openstack-system.morph.in @@ -1,7 +1,8 @@ -name: openstack-system-x86_64 +name: openstack-system.{{CONFIG}} kind: system -description: Openstack system in baserock for the x86_64 architecture -arch: x86_64 +description: | + OpenStack infrastructure-as-a-service provider. +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -15,8 +16,6 @@ strata: morph: strata/python-common.morph - name: foundation morph: strata/foundation.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: coreutils-common morph: strata/coreutils-common.morph - name: devtools @@ -67,6 +66,10 @@ strata: morph: strata/swift.morph - name: python-tools morph: strata/python-tools.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system.morph.in index d6a84fd6..e69f9d56 100644 --- a/systems/qt4-devel-system-x86_64-generic.morph +++ b/systems/qt4-devel-system.morph.in @@ -1,8 +1,8 @@ -name: qt4-devel-system-x86_64-generic +name: qt4-devel-system.{{CONFIG}} kind: system -description: A system that is able to build other systems based on the 64-bit x86 - architecture. -arch: x86_64 +description: + A system with the Qt4 libraries available. +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -16,8 +16,6 @@ strata: morph: strata/multimedia-common.morph - name: multimedia-gstreamer-0.10 morph: strata/multimedia-gstreamer-0.10.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: tools morph: strata/tools.morph - name: glib-common @@ -40,6 +38,10 @@ strata: morph: strata/enlightenment.morph - name: icu-common morph: strata/icu-common.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system.morph.in index eb393f12..79bb94cc 100644 --- a/systems/qt5-devel-system-x86_64-generic.morph +++ b/systems/qt5-devel-system.morph.in @@ -1,8 +1,8 @@ -name: qt5-devel-system-x86_64-generic +name: qt5-devel-system.{{CONFIG}} kind: system -description: A system that is able to build other systems based on the 64-bit x86 - architecture. -arch: x86_64 +description: | + A system with the Qt5 libraries available. +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -16,8 +16,6 @@ strata: morph: strata/multimedia-common.morph - name: multimedia-gstreamer morph: strata/multimedia-gstreamer.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: tools morph: strata/tools.morph - name: glib-common @@ -42,6 +40,10 @@ strata: morph: strata/enlightenment.morph - name: icu-common morph: strata/icu-common.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/swift-system-x86_64.morph b/systems/swift-system.morph.in index f850ec45..4ad5a28a 100644 --- a/systems/swift-system-x86_64.morph +++ b/systems/swift-system.morph.in @@ -1,7 +1,8 @@ -name: swift-system-x86_64 +name: swift-system.{{CONFIG}} kind: system -description: A base system for deploying swift nodes -arch: x86_64 +description: | + A base system for deploying OpenStack Swift nodes. +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -9,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: swift morph: strata/swift.morph - name: ntpd @@ -23,6 +22,10 @@ strata: morph: strata/ansible.morph - name: openstack-common morph: strata/openstack-common.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system.morph.in index 09838777..120d25bb 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system.morph.in @@ -1,12 +1,11 @@ -name: trove-system-x86_64 +name: trove-system.{{CONFIG}} kind: system -description: Trove server -arch: x86_64 +description: | + Trove source code hosting server +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: foundation morph: strata/foundation.morph - name: core @@ -55,6 +54,10 @@ strata: morph: strata/fail2ban-common.morph - name: connectivity morph: strata/connectivity.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/trove diff --git a/systems/web-system-x86_64-generic.morph b/systems/web-system.morph.in index 090abcbe..cfbc6493 100644 --- a/systems/web-system-x86_64-generic.morph +++ b/systems/web-system.morph.in @@ -1,12 +1,11 @@ -name: web-system-x86_64-generic +name: web-system.{{CONFIG}} kind: system -description: system with web tools -arch: x86_64 +description: | + Example system with "web" tools +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: foundation morph: strata/foundation.morph - name: core @@ -35,6 +34,10 @@ strata: morph: strata/nodejs.morph - name: icu-common morph: strata/icu-common.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/weston-qt5-system-x86_64.morph b/systems/weston-qt5-system.morph.in index 7ac315c1..e79534d5 100644 --- a/systems/weston-qt5-system-x86_64.morph +++ b/systems/weston-qt5-system.morph.in @@ -1,8 +1,8 @@ -name: weston-qt5-system-x86_64.morph +name: weston-qt5-system.{{CONFIG}} kind: system -description: A system that is able to build other systems based on the 64-bit x86 - architecture. -arch: x86_64 +description: | + A system with the Weston display server. +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -22,8 +22,6 @@ strata: morph: strata/multimedia-common.morph - name: multimedia-gstreamer morph: strata/multimedia-gstreamer.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: tools morph: strata/tools.morph - name: glib-common @@ -60,6 +58,10 @@ strata: morph: strata/connman-common.morph - name: icu-common morph: strata/icu-common.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph deleted file mode 100644 index 5b25ebd0..00000000 --- a/systems/weston-system-armv7lhf-jetson.morph +++ /dev/null @@ -1,54 +0,0 @@ -name: weston-system-armv7lhf-jetson -kind: system -description: A weston system 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: coreutils-common - morph: strata/coreutils-common.morph -- name: device-management - morph: strata/device-management.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-jetson - morph: strata/bsp-jetson.morph -- name: connectivity - morph: strata/connectivity.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph -- name: libdrm-common - morph: strata/libdrm-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph -- name: wayland-generic - morph: strata/wayland-generic.morph -- name: graphics-common - morph: strata/graphics-common.morph -- name: input-common - morph: strata/input-common.morph -- name: llvm-common - morph: strata/llvm-common.morph -- name: mesa-common - morph: strata/mesa-common.morph -- name: weston-common - morph: strata/weston-common.morph -- name: x-common - morph: strata/x-common.morph -- name: x-generic - morph: strata/x-generic.morph -- name: tools - morph: strata/tools.morph -- name: glib-common - morph: strata/glib-common.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/install-essential-files diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system.morph.in index 5e91fb71..c27c05bb 100644 --- a/systems/weston-system-x86_64-generic.morph +++ b/systems/weston-system.morph.in @@ -1,7 +1,8 @@ -name: weston-system-x86_64-generic +name: weston-system.{{CONFIG}} kind: system -description: A weston system for a 64-bit x86 system. -arch: x86_64 +description: | + A system containing the Weston display server. +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -13,8 +14,6 @@ strata: morph: strata/device-management.morph - name: foundation morph: strata/foundation.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: connectivity morph: strata/connectivity.morph - name: audio-bluetooth @@ -45,6 +44,10 @@ strata: morph: strata/tools.morph - name: glib-common morph: strata/glib-common.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/xfce-system-x86_64.morph b/systems/xfce-system.morph.in index 62616000..c7424d83 100644 --- a/systems/xfce-system-x86_64.morph +++ b/systems/xfce-system.morph.in @@ -1,7 +1,8 @@ -name: xfce-system +name: xfce-system.{{CONFIG}} kind: system -description: A system with the XFCE desktop -arch: x86_64 +description: | + A system with the XFCE desktop +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -15,8 +16,6 @@ strata: morph: strata/python2-core.morph - name: foundation morph: strata/foundation.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: connectivity morph: strata/connectivity.morph - name: connman-common @@ -67,6 +66,10 @@ strata: morph: strata/morph-utils.morph - name: xfce morph: strata/xfce.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/zookeeper-client-x86_64.morph b/systems/zookeeper-client.morph.in index 9b720f50..f662ad37 100644 --- a/systems/zookeeper-client-x86_64.morph +++ b/systems/zookeeper-client.morph.in @@ -1,9 +1,8 @@ -name: zookeeper-client-x86_64 +name: zookeeper-client.{{CONFIG}} kind: system description: | - A system that is able to build other systems based on the 64-bit x86 - architecture. includes the installation of zookeeper and a test client. -arch: x86_64 + Example of a system that can act as an Apache Zookeeper client. +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -11,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: zookeeper morph: strata/zookeeper.morph - name: zookeeper-client @@ -21,6 +18,10 @@ strata: morph: strata/test-tools.morph - name: java morph: strata/java.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/zookeeper-server-x86_64.morph b/systems/zookeeper-server.morph.in index 37a60ae2..292c4029 100644 --- a/systems/zookeeper-server-x86_64.morph +++ b/systems/zookeeper-server.morph.in @@ -1,9 +1,8 @@ -name: zookeeper-server-X86_64 +name: zookeeper-server.{{CONFIG}} kind: system description: | - A system that is able to build other systems based on the 64-bit x86 - architecture. includes the zookeeper server and setup for basic tests -arch: x86_64 + Example of a system that can act as an Apache Zookeeper server. +arch: {{ ARCH }} strata: - name: build-essential morph: strata/build-essential.morph @@ -11,8 +10,6 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph - name: zookeeper morph: strata/zookeeper.morph - name: zookeeper-server @@ -21,6 +18,10 @@ strata: morph: strata/test-tools.morph - name: java morph: strata/java.morph +{% if BSP %} +- name: bsp-{{ BSP }} + morph: strata/bsp-{{ BSP }}.morph +{% endif %} configuration-extensions: - extensions/set-hostname - extensions/add-config-files |