summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-06-20 12:06:55 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-06-20 14:11:09 (GMT)
commit7055c080c937d60a198442a4c2d796ffca32acac (patch)
treef0759a9c145cd61d2371594eec79302975d56b0a
parent913147ff9f1e8cf6e8b80eb032dace635e24944f (diff)
downloaddefinitions-baserock/richardmaw/S11284/morphologies-by-path.tar.gz
Move systems and strata into subdirectoriesbaserock/richardmaw/S11284/morphologies-by-path
-rw-r--r--cxmanage-system-x86_64-generic.morph18
-rw-r--r--devel-system-armv7-highbank.morph18
-rw-r--r--devel-system-armv7-versatile.morph18
-rw-r--r--devel-system-armv7-wandboard.morph17
-rw-r--r--devel-system-armv7b-highbank.morph18
-rw-r--r--devel-system-armv7lhf-highbank.morph18
-rw-r--r--devel-system-armv7lhf-wandboard.morph17
-rw-r--r--devel-system-ppc64-generic.morph18
-rw-r--r--devel-system-x86_32-chroot.morph18
-rw-r--r--devel-system-x86_32-generic.morph18
-rw-r--r--devel-system-x86_64-chroot.morph18
-rw-r--r--devel-system-x86_64-generic.morph18
-rw-r--r--devel-system-x86_64-vagrant.morph29
-rw-r--r--distbuild-system-armv7lhf-highbank.morph20
-rw-r--r--distbuild-system-x86_32.morph20
-rw-r--r--distbuild-system-x86_64.morph20
-rw-r--r--example-distbuild-cluster.morph2
-rw-r--r--genivi-baseline-system-armv7lhf-versatile.morph24
-rw-r--r--genivi-baseline-system-x86_64-generic.morph23
-rw-r--r--gitlab-ci-runner-cluster.morph2
-rw-r--r--gitlab-ci-runner.morph31
-rw-r--r--gitlab-cluster.morph4
-rw-r--r--gitlab-server-cluster.morph2
-rw-r--r--gitlab-server.morph22
-rw-r--r--image-package-example.morph2
-rw-r--r--initramfs-test.morph4
-rw-r--r--minimal-system-deploy.morph2
-rw-r--r--nodejs-system-x86_64.morph28
-rw-r--r--qt4-devel-system-x86_64-generic.morph26
-rw-r--r--qt5-devel-system-x86_64-generic.morph26
-rw-r--r--release.morph10
-rw-r--r--sdk-example-cluster.morph4
-rw-r--r--strata/armv7lhf-cross-toolchain (renamed from armv7lhf-cross-toolchain.morph)3
-rw-r--r--strata/audio-bluetooth (renamed from audio-bluetooth.morph)3
-rw-r--r--strata/bsp-armv7-highbank (renamed from bsp-armv7-highbank.morph)3
-rw-r--r--strata/bsp-armv7-versatile (renamed from bsp-armv7-versatile.morph)3
-rw-r--r--strata/bsp-armv7b-highbank (renamed from bsp-armv7b-highbank.morph)3
-rw-r--r--strata/bsp-armv7b-vexpress-tc2 (renamed from bsp-armv7b-vexpress-tc2.morph)3
-rw-r--r--strata/bsp-ppc64-generic (renamed from bsp-ppc64-generic.morph)3
-rw-r--r--strata/bsp-wandboard (renamed from bsp-wandboard.morph)3
-rw-r--r--strata/bsp-x86_32-generic (renamed from bsp-x86_32-generic.morph)3
-rw-r--r--strata/bsp-x86_64-generic (renamed from bsp-x86_64-generic.morph)3
-rw-r--r--strata/bsp-x86_both-tools (renamed from bsp-x86_both-tools.morph)3
-rw-r--r--strata/build-essential (renamed from build-essential.morph)2
-rw-r--r--strata/ceph-service (renamed from ceph-service.morph)3
-rw-r--r--strata/cloudinit-support (renamed from cloudinit-support.morph)9
-rw-r--r--strata/connectivity (renamed from connectivity.morph)3
-rw-r--r--strata/core (renamed from core.morph)3
-rw-r--r--strata/cross-bootstrap (renamed from cross-bootstrap.morph)3
-rw-r--r--strata/cross-tools (renamed from cross-tools.morph)3
-rw-r--r--strata/cxmanage (renamed from cxmanage.morph)3
-rw-r--r--strata/databases (renamed from databases.morph)6
-rw-r--r--strata/distbuild (renamed from distbuild.morph)9
-rw-r--r--strata/enlightenment (renamed from enlightenment.morph)18
-rw-r--r--strata/erlang (renamed from erlang.morph)3
-rw-r--r--strata/foundation (renamed from foundation.morph)3
-rw-r--r--strata/genivi (renamed from genivi.morph)3
-rw-r--r--strata/genivi-foundation (renamed from genivi-foundation.morph)3
-rw-r--r--strata/genivi-wayland-armv7-versatile (renamed from genivi-wayland-armv7-versatile.morph)15
-rw-r--r--strata/genivi-wayland-x86_64-generic (renamed from genivi-wayland-x86_64-generic.morph)15
-rw-r--r--strata/genivi-x-armv7-versatile (renamed from genivi-x-armv7-versatile.morph)6
-rw-r--r--strata/genivi-x-ppc64-generic (renamed from genivi-x-ppc64-generic.morph)6
-rw-r--r--strata/genivi-x-x86_64-generic (renamed from genivi-x-x86_64-generic.morph)6
-rw-r--r--strata/gitlab (renamed from gitlab.morph)3
-rw-r--r--strata/gtk2 (renamed from gtk2.morph)9
-rw-r--r--strata/initramfs-utils (renamed from initramfs-utils.morph)3
-rw-r--r--strata/lua (renamed from lua.morph)3
-rw-r--r--strata/multimedia (renamed from multimedia.morph)3
-rw-r--r--strata/multimedia-gstreamer-0.10 (renamed from multimedia-gstreamer-0.10.morph)9
-rw-r--r--strata/nfs (renamed from nfs.morph)3
-rw-r--r--strata/nodejs (renamed from nodejs.morph)3
-rw-r--r--strata/openstack-clients (renamed from openstack-clients.morph)3
-rw-r--r--strata/qt4-sdk (renamed from qt4-sdk.morph)3
-rw-r--r--strata/qt4-tools (renamed from qt4-tools.morph)9
-rw-r--r--strata/qt5-sdk (renamed from qt5-sdk.morph)3
-rw-r--r--strata/qt5-tools (renamed from qt5-tools.morph)9
-rw-r--r--strata/ruby (renamed from ruby.morph)3
-rw-r--r--strata/tools (renamed from tools.morph)3
-rw-r--r--strata/trove (renamed from trove.morph)3
-rw-r--r--strata/virtualbox-guest-x86_64 (renamed from virtualbox-guest-x86_64.morph)12
-rw-r--r--strata/virtualization (renamed from virtualization.morph)3
-rw-r--r--strata/wayland-armv7-versatile (renamed from wayland-armv7-versatile.morph)3
-rw-r--r--strata/wayland-x86_64-generic (renamed from wayland-x86_64-generic.morph)3
-rw-r--r--strata/webtools (renamed from webtools.morph)3
-rw-r--r--strata/x-armv7-versatile (renamed from x-armv7-versatile.morph)3
-rw-r--r--strata/x-common (renamed from x-common.morph)3
-rw-r--r--strata/x-ppc64-generic (renamed from x-ppc64-generic.morph)3
-rw-r--r--strata/x-x86_64-generic (renamed from x-x86_64-generic.morph)3
-rw-r--r--strata/xfce (renamed from xfce.morph)9
-rw-r--r--systems/armv7lhf-cross-toolchain-system-x86_32-generic (renamed from armv7lhf-cross-toolchain-system-x86_32-generic.morph)9
-rw-r--r--systems/armv7lhf-cross-toolchain-system-x86_64-generic (renamed from armv7lhf-cross-toolchain-system-x86_64-generic.morph)9
-rw-r--r--systems/base-system-armv7-highbank (renamed from base-system-armv7-highbank.morph)12
-rw-r--r--systems/base-system-armv7-versatile (renamed from base-system-armv7-versatile.morph)12
-rw-r--r--systems/base-system-armv7b-highbank (renamed from base-system-armv7b-highbank.morph)12
-rw-r--r--systems/base-system-armv7b-vexpress-tc2 (renamed from base-system-armv7b-vexpress-tc2.morph)12
-rw-r--r--systems/base-system-armv7lhf-highbank (renamed from base-system-armv7lhf-highbank.morph)12
-rw-r--r--systems/base-system-ppc64-generic (renamed from base-system-ppc64-generic.morph)12
-rw-r--r--systems/base-system-x86_32-generic (renamed from base-system-x86_32-generic.morph)12
-rw-r--r--systems/base-system-x86_64-generic (renamed from base-system-x86_64-generic.morph)12
-rw-r--r--systems/ceph-service-x86_64-generic (renamed from ceph-service-x86_64-generic.morph)15
-rw-r--r--systems/cross-bootstrap-system-armv7lhf-generic (renamed from cross-bootstrap-system-armv7lhf-generic.morph)9
-rw-r--r--systems/cross-bootstrap-system-ppc64-generic (renamed from cross-bootstrap-system-ppc64-generic.morph)9
-rw-r--r--systems/cross-bootstrap-system-x86_64-generic (renamed from cross-bootstrap-system-x86_64-generic.morph)9
-rw-r--r--systems/cxmanage-system-x86_64-generic24
-rw-r--r--systems/devel-system-armv7-chroot (renamed from devel-system-armv7-chroot.morph)15
-rw-r--r--systems/devel-system-armv7-highbank24
-rw-r--r--systems/devel-system-armv7-versatile24
-rw-r--r--systems/devel-system-armv7-wandboard23
-rw-r--r--systems/devel-system-armv7b-chroot (renamed from devel-system-armv7b-chroot.morph)15
-rw-r--r--systems/devel-system-armv7b-highbank24
-rw-r--r--systems/devel-system-armv7lhf-chroot (renamed from devel-system-armv7lhf-chroot.morph)15
-rw-r--r--systems/devel-system-armv7lhf-highbank24
-rw-r--r--systems/devel-system-armv7lhf-wandboard23
-rw-r--r--systems/devel-system-ppc64-chroot (renamed from devel-system-ppc64-chroot.morph)15
-rw-r--r--systems/devel-system-ppc64-generic24
-rw-r--r--systems/devel-system-x86_32-chroot24
-rw-r--r--systems/devel-system-x86_32-generic24
-rw-r--r--systems/devel-system-x86_64-chroot24
-rw-r--r--systems/devel-system-x86_64-generic24
-rw-r--r--systems/devel-system-x86_64-vagrant45
-rw-r--r--systems/distbuild-system-armv7lhf-highbank27
-rw-r--r--systems/distbuild-system-x86_3227
-rw-r--r--systems/distbuild-system-x86_6427
-rw-r--r--systems/genivi-baseline-system-armv7lhf-versatile35
-rw-r--r--systems/genivi-baseline-system-x86_64-generic34
-rw-r--r--systems/gitlab-ci-runner50
-rw-r--r--systems/gitlab-server32
-rw-r--r--systems/initramfs-x86_64 (renamed from initramfs-x86_64.morph)6
-rw-r--r--systems/minimal-system-x86_32-generic (renamed from minimal-system-x86_32-generic.morph)6
-rw-r--r--systems/minimal-system-x86_64-generic (renamed from minimal-system-x86_64-generic.morph)8
-rw-r--r--systems/nodejs-system-x86_6444
-rw-r--r--systems/openstack-client-base-system-x86_32-generic (renamed from openstack-client-base-system-x86_32-generic.morph)15
-rw-r--r--systems/openstack-client-base-system-x86_64-generic (renamed from openstack-client-base-system-x86_64-generic.morph)15
-rw-r--r--systems/qt4-devel-system-x86_64-generic40
-rw-r--r--systems/qt5-devel-system-x86_64-generic40
-rw-r--r--systems/trove-system-x86_6427
-rw-r--r--systems/web-system-x86_64-generic33
-rw-r--r--systems/xfce-system41
-rw-r--r--trove-system-x86_64.morph20
-rw-r--r--trove.baserock.org-upgrade.morph2
-rw-r--r--upgrade-devel.morph4
-rw-r--r--web-system-x86_64-generic.morph22
-rw-r--r--xfce-system.morph26
143 files changed, 1166 insertions, 749 deletions
diff --git a/cxmanage-system-x86_64-generic.morph b/cxmanage-system-x86_64-generic.morph
deleted file mode 100644
index cf9ac80..0000000
--- a/cxmanage-system-x86_64-generic.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-name: cxmanage-system-x86_64-generic
-description: A baserock development system with calxeda management tools added
-kind: system
-arch: x86_64
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_64-generic
-- morph: tools
-- morph: cxmanage
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- fstab
diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph
deleted file mode 100644
index a4ebd37..0000000
--- a/devel-system-armv7-highbank.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: armv7l
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the ARM highbank
- architecture.
-kind: system
-name: devel-system-armv7-highbank
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7-highbank
-- morph: tools
-- morph: openstack-clients
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
deleted file mode 100644
index 2fc3e58..0000000
--- a/devel-system-armv7-versatile.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: armv7l
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the ARM versatile
- architecture.
-kind: system
-name: devel-system-armv7-versatile
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7-versatile
-- morph: tools
-- morph: openstack-clients
diff --git a/devel-system-armv7-wandboard.morph b/devel-system-armv7-wandboard.morph
deleted file mode 100644
index 08aeb4a..0000000
--- a/devel-system-armv7-wandboard.morph
+++ /dev/null
@@ -1,17 +0,0 @@
-arch: armv7l
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the Wandboard.
-kind: system
-name: devel-system-armv7-wandboard
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-wandboard
-- morph: tools
-- morph: openstack-clients
diff --git a/devel-system-armv7b-highbank.morph b/devel-system-armv7b-highbank.morph
deleted file mode 100644
index bbb5097..0000000
--- a/devel-system-armv7b-highbank.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: armv7b
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the ARM highbank
- architecture.
-kind: system
-name: devel-system-armv7b-highbank
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7b-highbank
-- morph: tools
-- morph: openstack-clients
diff --git a/devel-system-armv7lhf-highbank.morph b/devel-system-armv7lhf-highbank.morph
deleted file mode 100644
index 7a9fd2c..0000000
--- a/devel-system-armv7lhf-highbank.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: armv7lhf
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the ARM highbank
- architecture.
-kind: system
-name: devel-system-armv7lhf-highbank
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7-highbank
-- morph: tools
-- morph: openstack-clients
diff --git a/devel-system-armv7lhf-wandboard.morph b/devel-system-armv7lhf-wandboard.morph
deleted file mode 100644
index c9b7c8a..0000000
--- a/devel-system-armv7lhf-wandboard.morph
+++ /dev/null
@@ -1,17 +0,0 @@
-arch: armv7lhf
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the Wandboard.
-kind: system
-name: devel-system-armv7lhf-wandboard
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-wandboard
-- morph: tools
-- morph: openstack-clients
diff --git a/devel-system-ppc64-generic.morph b/devel-system-ppc64-generic.morph
deleted file mode 100644
index cbe4230..0000000
--- a/devel-system-ppc64-generic.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: ppc64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the 64-bit PowerPc
- architecture.
-kind: system
-name: devel-system-ppc64-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-ppc64-generic
-- morph: tools
-- morph: openstack-clients
diff --git a/devel-system-x86_32-chroot.morph b/devel-system-x86_32-chroot.morph
deleted file mode 100644
index baca290..0000000
--- a/devel-system-x86_32-chroot.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: x86_32
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the 32-bit x86
- architecture.
-kind: system
-name: devel-system-x86_32-chroot
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: tools
-- morph: openstack-clients
-- morph: bsp-x86_both-tools
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
deleted file mode 100644
index 28c8944..0000000
--- a/devel-system-x86_32-generic.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: x86_32
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the 32-bit x86
- architecture.
-kind: system
-name: devel-system-x86_32-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_32-generic
-- morph: tools
-- morph: openstack-clients
diff --git a/devel-system-x86_64-chroot.morph b/devel-system-x86_64-chroot.morph
deleted file mode 100644
index 50c757e..0000000
--- a/devel-system-x86_64-chroot.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the 64-bit x86
- architecture.
-kind: system
-name: devel-system-x86_64-chroot
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: tools
-- morph: openstack-clients
-- morph: bsp-x86_both-tools
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
deleted file mode 100644
index 1daa45d..0000000
--- a/devel-system-x86_64-generic.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the 64-bit x86
- architecture.
-kind: system
-name: devel-system-x86_64-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_64-generic
-- morph: tools
-- morph: openstack-clients
diff --git a/devel-system-x86_64-vagrant.morph b/devel-system-x86_64-vagrant.morph
deleted file mode 100644
index a346ad2..0000000
--- a/devel-system-x86_64-vagrant.morph
+++ /dev/null
@@ -1,29 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- vagrant
-description: A system that is able to build other systems based on the 64-bit x86
- architecture. This adds the virtualbox guest additions and vagrant configuration too
-kind: system
-name: devel-system-x86_64-vagrant
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
-- morph: bsp-x86_64-generic
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-x86_64-generic
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-x86_64-generic
-- morph: tools
-- morph: virtualization
-- morph: openstack-clients
-- morph: virtualbox-guest-x86_64
diff --git a/distbuild-system-armv7lhf-highbank.morph b/distbuild-system-armv7lhf-highbank.morph
deleted file mode 100644
index fdad7cc..0000000
--- a/distbuild-system-armv7lhf-highbank.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-arch: armv7lhf
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- distbuild
-- fstab
-description: Morph distributed build node for armv7lhf highbank
-kind: system
-name: distbuild-system-armv7lhf-highbank
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7-highbank
-- morph: tools
-- morph: nfs
-- morph: distbuild
diff --git a/distbuild-system-x86_32.morph b/distbuild-system-x86_32.morph
deleted file mode 100644
index 49a7458..0000000
--- a/distbuild-system-x86_32.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-arch: x86_32
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- distbuild
-- fstab
-description: Morph distributed build node for x86_32
-kind: system
-name: distbuild-system-x86_32
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_32-generic
-- morph: tools
-- morph: nfs
-- morph: distbuild
diff --git a/distbuild-system-x86_64.morph b/distbuild-system-x86_64.morph
deleted file mode 100644
index 52d9162..0000000
--- a/distbuild-system-x86_64.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- distbuild
-- fstab
-description: Morph distributed build node for x86_64
-kind: system
-name: distbuild-system-x86_64
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_64-generic
-- morph: tools
-- morph: nfs
-- morph: distbuild
diff --git a/example-distbuild-cluster.morph b/example-distbuild-cluster.morph
index 736a5be..74f438e 100644
--- a/example-distbuild-cluster.morph
+++ b/example-distbuild-cluster.morph
@@ -10,7 +10,7 @@ description: |
workers to authenticate with the Trove to give them read access to
all source repositories.
systems:
-- morph: distbuild-system-x86_64-generic
+- morph: systems/distbuild-system-x86_64-generic
deploy-defaults:
TROVE_ID: $MY_TROVE
CONTROLLERHOST: build-controller
diff --git a/genivi-baseline-system-armv7lhf-versatile.morph b/genivi-baseline-system-armv7lhf-versatile.morph
deleted file mode 100644
index 31185c9..0000000
--- a/genivi-baseline-system-armv7lhf-versatile.morph
+++ /dev/null
@@ -1,24 +0,0 @@
-arch: armv7lhf
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- strip-gplv3
-- fstab
-description: A GENIVI baseline system for an ARMv7 system.
-kind: system
-name: genivi-baseline-system-armv7lhf-versatile
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
-- morph: bsp-armv7-versatile
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: multimedia
-- morph: genivi
-- morph: wayland-armv7-versatile
diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph
deleted file mode 100644
index 7b08a89..0000000
--- a/genivi-baseline-system-x86_64-generic.morph
+++ /dev/null
@@ -1,23 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- strip-gplv3
-description: A GENIVI baseline system for a 64-bit x86 system.
-kind: system
-name: genivi-baseline-system-x86_64-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
-- morph: bsp-x86_64-generic
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: multimedia
-- morph: genivi
-- morph: wayland-x86_64-generic
diff --git a/gitlab-ci-runner-cluster.morph b/gitlab-ci-runner-cluster.morph
index fe6e345..c8999f1 100644
--- a/gitlab-ci-runner-cluster.morph
+++ b/gitlab-ci-runner-cluster.morph
@@ -1,7 +1,7 @@
kind: cluster
name: gitlab-ci-runner-cluster
systems:
-- morph: gitlab-ci-runner
+- morph: systems/gitlab-ci-runner
deploy-defaults:
AUTOSTART: no
DISK_SIZE: 6G
diff --git a/gitlab-ci-runner.morph b/gitlab-ci-runner.morph
deleted file mode 100644
index 9845dcc..0000000
--- a/gitlab-ci-runner.morph
+++ /dev/null
@@ -1,31 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system to run build tests as part of GitLab CI
- architecture.
-kind: system
-name: gitlab-ci-runner
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
-- morph: bsp-x86_64-generic
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-x86_64-generic
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-x86_64-generic
-- morph: tools
-- morph: virtualization
-- morph: openstack-clients
-- morph: databases
-- morph: webtools
-- morph: ruby
-- morph: nfs
diff --git a/gitlab-cluster.morph b/gitlab-cluster.morph
index d40bf8f..db20c0f 100644
--- a/gitlab-cluster.morph
+++ b/gitlab-cluster.morph
@@ -14,7 +14,7 @@ description: |
need to define a GITLAB_EMAIL, that is the email that mail from your GitLab
instance will appear to be from.
systems:
-- morph: gitlab-server
+- morph: systems/gitlab-server
deploy-defaults:
AUTOSTART: no
DISK_SIZE: 10G
@@ -33,7 +33,7 @@ systems:
CI_PORT: 81
UNICORN_CI_PORT: 8081
INSTALL_FILES: gitlab-server/manifest
-- morph: gitlab-ci-runner
+- morph: systems/gitlab-ci-runner
deploy-defaults:
AUTOSTART: no
DISK_SIZE: 10G
diff --git a/gitlab-server-cluster.morph b/gitlab-server-cluster.morph
index 09ff486..9835bd1 100644
--- a/gitlab-server-cluster.morph
+++ b/gitlab-server-cluster.morph
@@ -1,7 +1,7 @@
kind: cluster
name: gitlab-server-cluster
systems:
-- morph: gitlab-server
+- morph: systems/gitlab-server
deploy-defaults:
AUTOSTART: no
DISK_SIZE: 6G
diff --git a/gitlab-server.morph b/gitlab-server.morph
deleted file mode 100644
index 6142b8c..0000000
--- a/gitlab-server.morph
+++ /dev/null
@@ -1,22 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- gitlab
-description: system which hosts a gitlab server
-kind: system
-name: gitlab-server
-strata:
-- morph: build-essential
-- morph: bsp-x86_64-generic
-- morph: foundation
-- morph: core
-- morph: tools
-- morph: nfs
-- morph: databases
-- morph: webtools
-- morph: ruby
-- morph: gitlab
diff --git a/image-package-example.morph b/image-package-example.morph
index eeb5b3f..c683cd1 100644
--- a/image-package-example.morph
+++ b/image-package-example.morph
@@ -3,7 +3,7 @@ kind: cluster
description: |
Packaged system and script for installing it, for deferred instantiation.
systems:
-- morph: base-system-x86_32-generic
+- morph: systems/base-system-x86_32-generic
deploy:
imgpkg:
type: image-package
diff --git a/initramfs-test.morph b/initramfs-test.morph
index 9e69207..419842f 100644
--- a/initramfs-test.morph
+++ b/initramfs-test.morph
@@ -1,7 +1,7 @@
name: initramfs-test
kind: cluster
systems:
-- morph: base-system-x86_64-generic
+- morph: systems/base-system-x86_64-generic
deploy:
system:
type: rawdisk
@@ -10,7 +10,7 @@ systems:
HOSTNAME: initramfs-system
INITRAMFS_PATH: boot/initramfs.gz
subsystems:
- - morph: initramfs-x86_64
+ - morph: systems/initramfs-x86_64
deploy:
initramfs:
type: initramfs
diff --git a/minimal-system-deploy.morph b/minimal-system-deploy.morph
index f6213c3..9353ca8 100644
--- a/minimal-system-deploy.morph
+++ b/minimal-system-deploy.morph
@@ -3,7 +3,7 @@ kind: cluster
description: |
Deploy a minimal system to a system running KVM
systems:
-- morph: minimal-system-x86_32-generic
+- morph: systems/minimal-system-x86_32-generic
deploy:
vm:
type: kvm
diff --git a/nodejs-system-x86_64.morph b/nodejs-system-x86_64.morph
deleted file mode 100644
index 0018fbd..0000000
--- a/nodejs-system-x86_64.morph
+++ /dev/null
@@ -1,28 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the 64-bit x86
- architecture.
-kind: system
-name: nodejs-system-x86_64
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
-- morph: bsp-x86_64-generic
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-x86_64-generic
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-x86_64-generic
-- morph: tools
-- morph: virtualization
-- morph: openstack-clients
-- morph: nodejs
diff --git a/qt4-devel-system-x86_64-generic.morph b/qt4-devel-system-x86_64-generic.morph
deleted file mode 100644
index 7a45c0f..0000000
--- a/qt4-devel-system-x86_64-generic.morph
+++ /dev/null
@@ -1,26 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the 64-bit x86
- architecture.
-kind: system
-name: qt4-devel-system-x86_64-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: audio-bluetooth
-- morph: multimedia-gstreamer-0.10
-- morph: bsp-x86_64-generic
-- morph: tools
-- morph: x-common
-- morph: x-x86_64-generic
-- morph: qt4-tools
-- morph: qt4-sdk
-- morph: lua
-- morph: connectivity
-- morph: enlightenment
diff --git a/qt5-devel-system-x86_64-generic.morph b/qt5-devel-system-x86_64-generic.morph
deleted file mode 100644
index 2c75333..0000000
--- a/qt5-devel-system-x86_64-generic.morph
+++ /dev/null
@@ -1,26 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the 64-bit x86
- architecture.
-kind: system
-name: qt5-devel-system-x86_64-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: audio-bluetooth
-- morph: multimedia-gstreamer-0.10
-- morph: bsp-x86_64-generic
-- morph: tools
-- morph: x-common
-- morph: x-x86_64-generic
-- morph: qt5-tools
-- morph: qt5-sdk
-- morph: lua
-- morph: connectivity
-- morph: enlightenment
diff --git a/release.morph b/release.morph
index e803ee5..4b1b4ef 100644
--- a/release.morph
+++ b/release.morph
@@ -3,29 +3,29 @@ kind: cluster
description: |
Deploy all the systems for we support in a release.
systems:
-- morph: devel-system-armv7lhf-wandboard
+- morph: systems/devel-system-armv7lhf-wandboard
deploy:
devel-system-armv7lhf-wandboard:
type: tar
location: /src/release/baserock-14.24-devel-system-armv7lhf-wandboard.tar
-- morph: devel-system-x86_32-chroot
+- morph: systems/devel-system-x86_32-chroot
deploy:
devel-system-x86_32-chroot:
type: tar
location: /src/release/baserock-14.24-devel-system-x86_32-chroot.tar
-- morph: devel-system-x86_32-generic
+- morph: systems/devel-system-x86_32-generic
deploy:
devel-system-x86_32-generic:
type: rawdisk
location: /src/release/baserock-14.24-devel-system-x86_32-generic.img
DISK_SIZE: 4G
VERSION_LABEL: baserock-14.24
-- morph: devel-system-x86_64-chroot
+- morph: systems/devel-system-x86_64-chroot
deploy:
devel-system-x86_64-chroot:
type: tar
location: /src/release/baserock-14.24-devel-system-x86_64-chroot.tar
-- morph: devel-system-x86_64-generic
+- morph: systems/devel-system-x86_64-generic
deploy:
devel-system-x86_64-generic:
type: rawdisk
diff --git a/sdk-example-cluster.morph b/sdk-example-cluster.morph
index da0a6ff..5487ea5 100644
--- a/sdk-example-cluster.morph
+++ b/sdk-example-cluster.morph
@@ -31,7 +31,7 @@ description: |
See the documentation of the sdk.write extension for more information.
systems:
-- morph: armv7lhf-cross-toolchain-system-x86_32-generic
+- morph: systems/armv7lhf-cross-toolchain-system-x86_32-generic
deploy:
sdk:
type: sdk
@@ -39,7 +39,7 @@ systems:
PREFIX: /usr
TARGET: armv7lhf-baserock-linux-gnueabi
subsystems:
- - morph: devel-system-armv7lhf-highbank
+ - morph: systems/devel-system-armv7lhf-highbank
deploy:
sysroot:
type: sysroot
diff --git a/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain
index 37553c6..bb7a0ce 100644
--- a/armv7lhf-cross-toolchain.morph
+++ b/strata/armv7lhf-cross-toolchain
@@ -2,7 +2,8 @@ name: armv7lhf-cross-toolchain
kind: stratum
description: Stratum for building an armv7lhf cross compiler for your native system.
build-depends:
-- morph: build-essential
+- name: build-essential
+ morph: strata/build-essential
chunks:
- name: armv7lhf-cross-binutils
repo: upstream:binutils-redhat
diff --git a/audio-bluetooth.morph b/strata/audio-bluetooth
index ffb7d5f..c1eca37 100644
--- a/audio-bluetooth.morph
+++ b/strata/audio-bluetooth
@@ -2,7 +2,8 @@ name: audio-bluetooth
kind: stratum
description: Components required for audio and bluetooth.
build-depends:
-- morph: genivi-foundation
+- name: genivi-foundation
+ morph: strata/genivi-foundation
chunks:
- name: libatomic_ops
repo: upstream:libatomic_ops
diff --git a/bsp-armv7-highbank.morph b/strata/bsp-armv7-highbank
index 88922e2..192398f 100644
--- a/bsp-armv7-highbank.morph
+++ b/strata/bsp-armv7-highbank
@@ -2,7 +2,8 @@ name: bsp-armv7-highbank
kind: stratum
description: The platform dependent components required to boot an ARM highbank board.
build-depends:
-- morph: core
+- name: core
+ morph: strata/core
chunks:
- name: linux-armv7-highbank
repo: upstream:linux
diff --git a/bsp-armv7-versatile.morph b/strata/bsp-armv7-versatile
index cc1298f..2a85ed8 100644
--- a/bsp-armv7-versatile.morph
+++ b/strata/bsp-armv7-versatile
@@ -3,7 +3,8 @@ kind: stratum
description: The platform dependent components required to boot an ARM versatile development
board.
build-depends:
-- morph: core
+- name: core
+ morph: strata/core
chunks:
- name: linux-armv7-versatile
repo: upstream:linux
diff --git a/bsp-armv7b-highbank.morph b/strata/bsp-armv7b-highbank
index 0a94bcc..eb7c1b1 100644
--- a/bsp-armv7b-highbank.morph
+++ b/strata/bsp-armv7b-highbank
@@ -2,7 +2,8 @@ name: bsp-armv7b-highbank
kind: stratum
description: The platform dependent components required to boot an ARM highbank board.
build-depends:
-- morph: core
+- name: core
+ morph: strata/core
chunks:
- name: linux-armv7b-highbank
repo: upstream:linux
diff --git a/bsp-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2
index d8abde2..6d45b0a 100644
--- a/bsp-armv7b-vexpress-tc2.morph
+++ b/strata/bsp-armv7b-vexpress-tc2
@@ -2,7 +2,8 @@ name: bsp-armv7b-vexpress-tc2
kind: stratum
description: The platform dependent components required to boot Versatile TC2 board
build-depends:
-- morph: core
+- name: core
+ morph: strata/core
chunks:
- name: linux-armv7b-vexpress-tc2
repo: upstream:linux
diff --git a/bsp-ppc64-generic.morph b/strata/bsp-ppc64-generic
index fdafb86..43e10f4 100644
--- a/bsp-ppc64-generic.morph
+++ b/strata/bsp-ppc64-generic
@@ -2,7 +2,8 @@ name: bsp-ppc64-generic
kind: stratum
description: The platform dependent components required to boot a ppc64 board.
build-depends:
-- morph: core
+- name: core
+ morph: strata/core
chunks:
- name: linux-ppc64
repo: upstream:linux
diff --git a/bsp-wandboard.morph b/strata/bsp-wandboard
index cab2512..7b04e3c 100644
--- a/bsp-wandboard.morph
+++ b/strata/bsp-wandboard
@@ -2,7 +2,8 @@ name: bsp-wandboard
kind: stratum
description: The platform dependent components required to boot an wandboard ARM board.
build-depends:
-- morph: core
+- name: core
+ morph: strata/core
chunks:
- name: u-boot
repo: upstream:u-boot
diff --git a/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic
index 625f854..a919200 100644
--- a/bsp-x86_32-generic.morph
+++ b/strata/bsp-x86_32-generic
@@ -3,7 +3,8 @@ kind: stratum
description: The set of platform specific components required for booting a 32-bit
x86 based system.
build-depends:
-- morph: core
+- name: core
+ morph: strata/core
chunks:
- name: linux-x86-32-generic
repo: upstream:linux
diff --git a/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic
index ea7ab40..741d996 100644
--- a/bsp-x86_64-generic.morph
+++ b/strata/bsp-x86_64-generic
@@ -3,7 +3,8 @@ kind: stratum
description: The set of platform specific components required for booting a 64-bit
x86 based system.
build-depends:
-- morph: core
+- name: core
+ morph: strata/core
chunks:
- name: linux-x86-64-generic
repo: upstream:linux
diff --git a/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools
index 60b8bcd..972eb1b 100644
--- a/bsp-x86_both-tools.morph
+++ b/strata/bsp-x86_both-tools
@@ -3,7 +3,8 @@ kind: stratum
description: The set of platform specific components required for configuring a bootable
x86 based system.
build-depends:
-- morph: core
+- name: core
+ morph: strata/core
chunks:
- name: nasm
repo: upstream:nasm
diff --git a/build-essential.morph b/strata/build-essential
index 5183708..489ebb3 100644
--- a/build-essential.morph
+++ b/strata/build-essential
@@ -28,7 +28,7 @@ description: |
show (and cleanliness) and the binaries actually still run on the host.
After build-essential is built we do another trick. See
- stage2-fhs-dirs.morph for details. Basically, /bin is a symlink to
+ stage2-fhs-dirs for details. Basically, /bin is a symlink to
/tools/bin during stage 2 but in stage 3 it becomes a real directory
again.
products:
diff --git a/ceph-service.morph b/strata/ceph-service
index 92ecb41..1efe8ad 100644
--- a/ceph-service.morph
+++ b/strata/ceph-service
@@ -1,7 +1,8 @@
name: ceph-service
kind: stratum
build-depends:
-- morph: foundation
+- name: foundation
+ morph: strata/foundation
chunks:
- name: nspr
repo: upstream:nspr-hg
diff --git a/cloudinit-support.morph b/strata/cloudinit-support
index a107600..6e4fac1 100644
--- a/cloudinit-support.morph
+++ b/strata/cloudinit-support
@@ -2,9 +2,12 @@ name: cloudinit-support
kind: stratum
description: A stratum with cloudinit to fit a system in the OpenStack cloud.
build-depends:
-- morph: build-essential
-- morph: core
-- morph: foundation
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
chunks:
- name: configobj
repo: upstream:configobj
diff --git a/connectivity.morph b/strata/connectivity
index 6951239..f24a5b5 100644
--- a/connectivity.morph
+++ b/strata/connectivity
@@ -1,7 +1,8 @@
name: connectivity
kind: stratum
build-depends:
-- morph: genivi-foundation
+- name: genivi-foundation
+ morph: strata/genivi-foundation
chunks:
- name: libnl
repo: upstream:libnl
diff --git a/core.morph b/strata/core
index cbe3348..198fd19 100644
--- a/core.morph
+++ b/strata/core
@@ -3,7 +3,8 @@ kind: stratum
description: Core components of a Baserock base system that are build tools required
for the BSP and Foundation strata, but a step above build-essential
build-depends:
-- morph: build-essential
+- name: build-essential
+ morph: strata/build-essential
chunks:
- name: sqlite3
repo: upstream:sqlite3
diff --git a/cross-bootstrap.morph b/strata/cross-bootstrap
index eb5374f..d435dc2 100644
--- a/cross-bootstrap.morph
+++ b/strata/cross-bootstrap
@@ -2,7 +2,8 @@ name: cross-bootstrap
kind: stratum
description: The minimal development tools to build a baserock devel system
build-depends:
-- morph: core
+- name: core
+ morph: strata/core
chunks:
- name: six
repo: upstream:six
diff --git a/cross-tools.morph b/strata/cross-tools
index 2fb4d59..5f6affb 100644
--- a/cross-tools.morph
+++ b/strata/cross-tools
@@ -2,7 +2,8 @@ name: cross-tools
kind: stratum
description: Tools used together with cross compilers
build-depends:
-- morph: core
+- name: core
+ morph: strata/core
chunks:
- name: patchelf
repo: upstream:patchelf
diff --git a/cxmanage.morph b/strata/cxmanage
index b8c0ad0..ddae557 100644
--- a/cxmanage.morph
+++ b/strata/cxmanage
@@ -2,7 +2,8 @@ name: cxmanage
kind: stratum
description: All the tools for calxeda management
build-depends:
-- morph: tools
+- name: tools
+ morph: strata/tools
chunks:
- name: ipmitool
repo: upstream:ipmitool
diff --git a/databases.morph b/strata/databases
index c824b9b..e631d4b 100644
--- a/databases.morph
+++ b/strata/databases
@@ -2,8 +2,10 @@ name: databases
kind: stratum
description: some popular databases
build-depends:
-- morph: tools
-- morph: nfs
+- name: tools
+ morph: strata/tools
+- name: nfs
+ morph: strata/nfs
chunks:
- name: readline
repo: upstream:readline
diff --git a/distbuild.morph b/strata/distbuild
index 9a2d108..1df808e 100644
--- a/distbuild.morph
+++ b/strata/distbuild
@@ -2,9 +2,12 @@ name: distbuild
kind: stratum
description: Morph distributed build software
build-depends:
-- morph: foundation
-- morph: core
-- morph: tools
+- name: foundation
+ morph: strata/foundation
+- name: core
+ morph: strata/core
+- name: tools
+ morph: strata/tools
chunks:
- name: bottle
repo: upstream:bottle
diff --git a/enlightenment.morph b/strata/enlightenment
index d5ab533..0961fa9 100644
--- a/enlightenment.morph
+++ b/strata/enlightenment
@@ -2,12 +2,18 @@ name: enlightenment
kind: stratum
description: Enlightenment Desktop and Window Manager
build-depends:
-- morph: tools
-- morph: x-x86_64-generic
-- morph: lua
-- morph: audio-bluetooth
-- morph: multimedia-gstreamer-0.10
-- morph: connectivity
+- name: tools
+ morph: strata/tools
+- name: x-x86_64-generic
+ morph: strata/x-x86_64-generic
+- name: lua
+ morph: strata/lua
+- name: audio-bluetooth
+ morph: strata/audio-bluetooth
+- name: multimedia-gstreamer-0.10
+ morph: strata/multimedia-gstreamer-0.10
+- name: connectivity
+ morph: strata/connectivity
chunks:
- name: efl
repo: upstream:enlightenment/efl
diff --git a/erlang.morph b/strata/erlang
index bf553eb..121169c 100644
--- a/erlang.morph
+++ b/strata/erlang
@@ -2,7 +2,8 @@ name: erlang
kind: stratum
description: stratum for erlang/otp and stuff
build-depends:
-- morph: tools
+- name: tools
+ morph: strata/tools
chunks:
- name: erlang
repo: upstream:erlang
diff --git a/foundation.morph b/strata/foundation
index 8db2fd9..b5b77d3 100644
--- a/foundation.morph
+++ b/strata/foundation
@@ -2,7 +2,8 @@ name: foundation
kind: stratum
description: Basic userland runtime system
build-depends:
-- morph: core
+- name: core
+ morph: strata/core
chunks:
- name: attr
repo: upstream:attr
diff --git a/genivi.morph b/strata/genivi
index caf7ff9..a9e6b52 100644
--- a/genivi.morph
+++ b/strata/genivi
@@ -2,7 +2,8 @@ name: genivi
kind: stratum
description: Software components designed by genivi, for genivi.
build-depends:
-- morph: genivi-foundation
+- name: genivi-foundation
+ morph: strata/genivi-foundation
chunks:
- name: DLT-daemon
repo: upstream:DLT-daemon
diff --git a/genivi-foundation.morph b/strata/genivi-foundation
index fa29487..e60cb2d 100644
--- a/genivi-foundation.morph
+++ b/strata/genivi-foundation
@@ -2,7 +2,8 @@ name: genivi-foundation
kind: stratum
description: Basic components needed by the GENIVI baseline.
build-depends:
-- morph: foundation
+- name: foundation
+ morph: strata/foundation
chunks:
- name: dbus-glib
repo: upstream:dbus-glib
diff --git a/genivi-wayland-armv7-versatile.morph b/strata/genivi-wayland-armv7-versatile
index 13d0883..1490cfc 100644
--- a/genivi-wayland-armv7-versatile.morph
+++ b/strata/genivi-wayland-armv7-versatile
@@ -2,11 +2,16 @@ name: genivi-wayland-armv7-versatile
kind: stratum
description: Software components designed by genivi, for genivi.
build-depends:
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
-- morph: genivi
-- morph: wayland-armv7-versatile
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: genivi-foundation
+ morph: strata/genivi-foundation
+- name: genivi
+ morph: strata/genivi
+- name: wayland-armv7-versatile
+ morph: strata/wayland-armv7-versatile
chunks:
- name: layer_management-wayland
repo: upstream:layer_management
diff --git a/genivi-wayland-x86_64-generic.morph b/strata/genivi-wayland-x86_64-generic
index 6ff3aa6..ec28c0d 100644
--- a/genivi-wayland-x86_64-generic.morph
+++ b/strata/genivi-wayland-x86_64-generic
@@ -2,11 +2,16 @@ name: genivi-wayland-x86_64-generic
kind: stratum
description: Software components designed by genivi, for genivi.
build-depends:
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
-- morph: genivi
-- morph: wayland-x86_64-generic
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: genivi-foundation
+ morph: strata/genivi-foundation
+- name: genivi
+ morph: strata/genivi
+- name: wayland-x86_64-generic
+ morph: strata/wayland-x86_64-generic
chunks:
- name: layer_management-wayland
repo: upstream:layer_management
diff --git a/genivi-x-armv7-versatile.morph b/strata/genivi-x-armv7-versatile
index cd308bb..4259da8 100644
--- a/genivi-x-armv7-versatile.morph
+++ b/strata/genivi-x-armv7-versatile
@@ -2,8 +2,10 @@ name: genivi-x-armv7-versatile
kind: stratum
description: Software components designed by genivi, for genivi.
build-depends:
-- morph: genivi
-- morph: x-armv7-versatile
+- name: genivi
+ morph: strata/genivi
+- name: x-armv7-versatile
+ morph: strata/x-armv7-versatile
chunks:
- name: layer_management
repo: upstream:layer_management
diff --git a/genivi-x-ppc64-generic.morph b/strata/genivi-x-ppc64-generic
index 9843341..310f8eb 100644
--- a/genivi-x-ppc64-generic.morph
+++ b/strata/genivi-x-ppc64-generic
@@ -2,8 +2,10 @@ name: genivi-x-ppc64-generic
kind: stratum
description: Software components designed by genivi, for genivi.
build-depends:
-- morph: genivi
-- morph: x-ppc64-generic
+- name: genivi
+ morph: strata/genivi
+- name: x-ppc64-generic
+ morph: strata/x-ppc64-generic
chunks:
- name: layer_management
repo: upstream:layer_management
diff --git a/genivi-x-x86_64-generic.morph b/strata/genivi-x-x86_64-generic
index 45929b1..17ca1d5 100644
--- a/genivi-x-x86_64-generic.morph
+++ b/strata/genivi-x-x86_64-generic
@@ -2,8 +2,10 @@ name: genivi-x-x86_64-generic
kind: stratum
description: Software components designed by genivi, for genivi.
build-depends:
-- morph: genivi
-- morph: x-x86_64-generic
+- name: genivi
+ morph: strata/genivi
+- name: x-x86_64-generic
+ morph: strata/x-x86_64-generic
chunks:
- name: layer_management
repo: upstream:layer_management
diff --git a/gitlab.morph b/strata/gitlab
index a731290..90d3882 100644
--- a/gitlab.morph
+++ b/strata/gitlab
@@ -2,7 +2,8 @@ name: gitlab
kind: stratum
description: gitlab components for server, ci etc
build-depends:
-- morph: ruby
+- name: ruby
+ morph: strata/ruby
chunks:
- name: gitlab-ce
repo: upstream:gitlab/gitlab-ce
diff --git a/gtk2.morph b/strata/gtk2
index 82afb7e..10149f3 100644
--- a/gtk2.morph
+++ b/strata/gtk2
@@ -2,9 +2,12 @@ name: gtk2
kind: stratum
description: the gtk2 stratum
build-depends:
-- morph: genivi-foundation
-- morph: x-common
-- morph: x-x86_64-generic
+- name: genivi-foundation
+ morph: strata/genivi-foundation
+- name: x-common
+ morph: strata/x-common
+- name: x-x86_64-generic
+ morph: strata/x-x86_64-generic
chunks:
- name: shared-mime-info
repo: upstream:shared-mime-info
diff --git a/initramfs-utils.morph b/strata/initramfs-utils
index d59dcec..f95dcbe 100644
--- a/initramfs-utils.morph
+++ b/strata/initramfs-utils
@@ -2,7 +2,8 @@ name: initramfs-utils
kind: stratum
description: stratum for initramfs
build-depends:
-- morph: build-essential
+- name: build-essential
+ morph: strata/build-essential
chunks:
# A more minimal initramfs would be a single executable as /init,
# statically linked against musl.
diff --git a/lua.morph b/strata/lua
index 8ad1dfe..6ec935d 100644
--- a/lua.morph
+++ b/strata/lua
@@ -2,7 +2,8 @@ name: lua
kind: stratum
description: Interpreter for the lua scripting language.
build-depends:
-- morph: tools
+- name: tools
+ morph: strata/tools
chunks:
- name: lua
repo: upstream:lua
diff --git a/multimedia.morph b/strata/multimedia
index 9d7621c..8521322 100644
--- a/multimedia.morph
+++ b/strata/multimedia
@@ -2,7 +2,8 @@ name: multimedia
kind: stratum
description: Codecs
build-depends:
-- morph: audio-bluetooth
+- name: audio-bluetooth
+ morph: strata/audio-bluetooth
chunks:
- name: orc
repo: upstream:orc
diff --git a/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10
index c7a44e8..207cd68 100644
--- a/multimedia-gstreamer-0.10.morph
+++ b/strata/multimedia-gstreamer-0.10
@@ -2,9 +2,12 @@ name: multimedia-gstreamer-0.10
kind: stratum
description: Codecs
build-depends:
-- morph: core
-- morph: foundation
-- morph: audio-bluetooth
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: audio-bluetooth
+ morph: strata/audio-bluetooth
chunks:
- name: orc
repo: upstream:orc
diff --git a/nfs.morph b/strata/nfs
index e0e5f2a..b2b27b1 100644
--- a/nfs.morph
+++ b/strata/nfs
@@ -2,7 +2,8 @@ name: nfs
kind: stratum
description: NFS utilities
build-depends:
-- morph: foundation
+- name: foundation
+ morph: strata/foundation
chunks:
- name: libevent
repo: upstream:libevent
diff --git a/nodejs.morph b/strata/nodejs
index aece2d2..e8c4522 100644
--- a/nodejs.morph
+++ b/strata/nodejs
@@ -2,7 +2,8 @@ name: nodejs
kind: stratum
description: Stratum for nodejs related stuff
build-depends:
-- morph: core
+- name: core
+ morph: strata/core
chunks:
- name: node
repo: upstream:node
diff --git a/openstack-clients.morph b/strata/openstack-clients
index fc13087..14ec363 100644
--- a/openstack-clients.morph
+++ b/strata/openstack-clients
@@ -2,7 +2,8 @@ name: openstack-clients
kind: stratum
description: A stratum with OpenStack clients, for OpenStack deployments.
build-depends:
-- morph: tools
+- name: tools
+ morph: strata/tools
chunks:
- name: jsonschema
repo: upstream:jsonschema
diff --git a/qt4-sdk.morph b/strata/qt4-sdk
index 88c0974..7e92b2d 100644
--- a/qt4-sdk.morph
+++ b/strata/qt4-sdk
@@ -2,7 +2,8 @@ name: qt4-sdk
kind: stratum
description: Qt4 Desktop Environment, IDE and Example Apps
build-depends:
-- morph: qt4-tools
+- name: qt4-tools
+ morph: strata/qt4-tools
chunks:
- name: qt-creator
repo: upstream:qt-creator
diff --git a/qt4-tools.morph b/strata/qt4-tools
index 3c14828..2805d10 100644
--- a/qt4-tools.morph
+++ b/strata/qt4-tools
@@ -2,9 +2,12 @@ name: qt4-tools
kind: stratum
description: Qt4 Development Libraries and Tools
build-depends:
-- morph: tools
-- morph: x-x86_64-generic
-- morph: multimedia-gstreamer-0.10
+- name: tools
+ morph: strata/tools
+- name: x-x86_64-generic
+ morph: strata/x-x86_64-generic
+- name: multimedia-gstreamer-0.10
+ morph: strata/multimedia-gstreamer-0.10
chunks:
- name: icu
repo: upstream:icu
diff --git a/qt5-sdk.morph b/strata/qt5-sdk
index b26d227..8569a23 100644
--- a/qt5-sdk.morph
+++ b/strata/qt5-sdk
@@ -2,7 +2,8 @@ name: qt5-sdk
kind: stratum
description: Qt5 Desktop Environment, IDE and Example Apps
build-depends:
-- morph: qt5-tools
+- name: qt5-tools
+ morph: strata/qt5-tools
chunks:
- name: qt-creator
repo: upstream:qt-creator
diff --git a/qt5-tools.morph b/strata/qt5-tools
index 39a8264..4aff2bd 100644
--- a/qt5-tools.morph
+++ b/strata/qt5-tools
@@ -2,9 +2,12 @@ name: qt5-tools
kind: stratum
description: Qt5 Development Libraries and Tools
build-depends:
-- morph: tools
-- morph: x-x86_64-generic
-- morph: multimedia-gstreamer-0.10
+- name: tools
+ morph: strata/tools
+- name: x-x86_64-generic
+ morph: strata/x-x86_64-generic
+- name: multimedia-gstreamer-0.10
+ morph: strata/multimedia-gstreamer-0.10
chunks:
- name: icu
repo: upstream:icu
diff --git a/ruby.morph b/strata/ruby
index c9eccd8..816a86f 100644
--- a/ruby.morph
+++ b/strata/ruby
@@ -2,7 +2,8 @@ name: ruby
kind: stratum
description: ruby and things from ruby world
build-depends:
-- morph: tools
+- name: tools
+ morph: strata/tools
chunks:
- name: ruby-1.8
repo: upstream:ruby
diff --git a/tools.morph b/strata/tools
index 200688d..c9c715a 100644
--- a/tools.morph
+++ b/strata/tools
@@ -2,7 +2,8 @@ name: tools
kind: stratum
description: Extra development tools included in the devel system
build-depends:
-- morph: foundation
+- name: foundation
+ morph: strata/foundation
chunks:
- name: six
repo: upstream:six
diff --git a/trove.morph b/strata/trove
index ed58561..5eda1eb 100644
--- a/trove.morph
+++ b/strata/trove
@@ -2,7 +2,8 @@ name: trove
kind: stratum
description: Trove software
build-depends:
-- morph: tools
+- name: tools
+ morph: strata/tools
chunks:
- name: bottle
repo: upstream:bottle
diff --git a/virtualbox-guest-x86_64.morph b/strata/virtualbox-guest-x86_64
index 4babc6d..1c10431 100644
--- a/virtualbox-guest-x86_64.morph
+++ b/strata/virtualbox-guest-x86_64
@@ -3,10 +3,14 @@ kind: stratum
description: |
VirtualBox Guest Additions for x86_64
build-depends:
-- morph: tools
-- morph: bsp-x86_64-generic
-- morph: x-common
-- morph: x-x86_64-generic
+- name: tools
+ morph: strata/tools
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
+- name: x-common
+ morph: strata/x-common
+- name: x-x86_64-generic
+ morph: strata/x-x86_64-generic
chunks:
- name: yasm
repo: upstream:yasm
diff --git a/virtualization.morph b/strata/virtualization
index 33e662b..16443b7 100644
--- a/virtualization.morph
+++ b/strata/virtualization
@@ -2,7 +2,8 @@ name: virtualization
kind: stratum
description: virtualization for baserock
build-depends:
-- morph: connectivity
+- name: connectivity
+ morph: strata/connectivity
chunks:
- name: yajl
repo: upstream:yajl
diff --git a/wayland-armv7-versatile.morph b/strata/wayland-armv7-versatile
index 1bc2019..db11db8 100644
--- a/wayland-armv7-versatile.morph
+++ b/strata/wayland-armv7-versatile
@@ -1,7 +1,8 @@
name: wayland-armv7-versatile
kind: stratum
build-depends:
-- morph: x-common
+- name: x-common
+ morph: strata/x-common
chunks:
- name: libxkbcommon
repo: upstream:xorg-lib-libxkbcommon
diff --git a/wayland-x86_64-generic.morph b/strata/wayland-x86_64-generic
index 6441a1f..fde6566 100644
--- a/wayland-x86_64-generic.morph
+++ b/strata/wayland-x86_64-generic
@@ -1,7 +1,8 @@
name: wayland-x86_64-generic
kind: stratum
build-depends:
-- morph: x-common
+- name: x-common
+ morph: strata/x-common
chunks:
- name: libxkbcommon
repo: upstream:xorg-lib-libxkbcommon
diff --git a/webtools.morph b/strata/webtools
index 523dde2..6ab6b14 100644
--- a/webtools.morph
+++ b/strata/webtools
@@ -2,7 +2,8 @@ name: webtools
kind: stratum
description: pip, node and other fun things
build-depends:
-- morph: tools
+- name: tools
+ morph: strata/tools
chunks:
- name: icu
repo: upstream:icu
diff --git a/x-armv7-versatile.morph b/strata/x-armv7-versatile
index 3fcf1ea..1418a33 100644
--- a/x-armv7-versatile.morph
+++ b/strata/x-armv7-versatile
@@ -1,7 +1,8 @@
name: x-armv7-versatile
kind: stratum
build-depends:
-- morph: x-common
+- name: x-common
+ morph: strata/x-common
chunks:
- name: mesa-x
repo: upstream:mesa
diff --git a/x-common.morph b/strata/x-common
index 77ba793..7e87db0 100644
--- a/x-common.morph
+++ b/strata/x-common
@@ -1,7 +1,8 @@
name: x-common
kind: stratum
build-depends:
-- morph: genivi-foundation
+- name: genivi-foundation
+ morph: strata/genivi-foundation
chunks:
- name: llvm
repo: upstream:llvm
diff --git a/x-ppc64-generic.morph b/strata/x-ppc64-generic
index ee24f56..f0ed30a 100644
--- a/x-ppc64-generic.morph
+++ b/strata/x-ppc64-generic
@@ -1,7 +1,8 @@
name: x-ppc64-generic
kind: stratum
build-depends:
-- morph: x-common
+- name: x-common
+ morph: strata/x-common
chunks:
- name: mesa-x
repo: upstream:mesa
diff --git a/x-x86_64-generic.morph b/strata/x-x86_64-generic
index c19356c..52f277d 100644
--- a/x-x86_64-generic.morph
+++ b/strata/x-x86_64-generic
@@ -1,7 +1,8 @@
name: x-x86_64-generic
kind: stratum
build-depends:
-- morph: x-common
+- name: x-common
+ morph: strata/x-common
chunks:
- name: mesa-x
repo: upstream:mesa
diff --git a/xfce.morph b/strata/xfce
index 1e7a1f4..ec8e6be 100644
--- a/xfce.morph
+++ b/strata/xfce
@@ -2,9 +2,12 @@ name: xfce
kind: stratum
description: xfce stratum
build-depends:
-- morph: genivi-x-x86_64-generic
-- morph: gtk2
-- morph: x-x86_64-generic
+- name: genivi-x-x86_64-generic
+ morph: strata/genivi-x-x86_64-generic
+- name: gtk2
+ morph: strata/gtk2
+- name: x-x86_64-generic
+ morph: strata/x-x86_64-generic
chunks:
- name: xfce-dev-tools
repo: upstream:xfce/xfce4-dev-tools
diff --git a/armv7lhf-cross-toolchain-system-x86_32-generic.morph b/systems/armv7lhf-cross-toolchain-system-x86_32-generic
index 1c9ae41..8975c8f 100644
--- a/armv7lhf-cross-toolchain-system-x86_32-generic.morph
+++ b/systems/armv7lhf-cross-toolchain-system-x86_32-generic
@@ -3,9 +3,12 @@ kind: system
arch: x86_32
description: A system that contains an ARM cross compiler, intended to be used as a sysroot.
strata:
-- morph: build-essential
-- morph: armv7lhf-cross-toolchain
-- morph: cross-tools
+- name: build-essential
+ morph: strata/build-essential
+- name: armv7lhf-cross-toolchain
+ morph: strata/armv7lhf-cross-toolchain
+- name: cross-tools
+ morph: strata/cross-tools
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/armv7lhf-cross-toolchain-system-x86_64-generic.morph b/systems/armv7lhf-cross-toolchain-system-x86_64-generic
index 43f5bf8..a2addac 100644
--- a/armv7lhf-cross-toolchain-system-x86_64-generic.morph
+++ b/systems/armv7lhf-cross-toolchain-system-x86_64-generic
@@ -3,9 +3,12 @@ kind: system
arch: x86_64
description: A system that contains an ARM cross compiler, intended to be used as a sysroot.
strata:
-- morph: build-essential
-- morph: armv7lhf-cross-toolchain
-- morph: cross-tools
+- name: build-essential
+ morph: strata/build-essential
+- name: armv7lhf-cross-toolchain
+ morph: strata/armv7lhf-cross-toolchain
+- name: cross-tools
+ morph: strata/cross-tools
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/base-system-armv7-highbank.morph b/systems/base-system-armv7-highbank
index 9573866..ef72f9b 100644
--- a/base-system-armv7-highbank.morph
+++ b/systems/base-system-armv7-highbank
@@ -10,7 +10,11 @@ description: The set of strata required to have a minimal system for an ARM high
kind: system
name: base-system-armv7-highbank
strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7-highbank
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-armv7-highbank
+ morph: strata/bsp-armv7-highbank
diff --git a/base-system-armv7-versatile.morph b/systems/base-system-armv7-versatile
index 31e3bf3..87516ba 100644
--- a/base-system-armv7-versatile.morph
+++ b/systems/base-system-armv7-versatile
@@ -10,7 +10,11 @@ description: The set of strata required to have a minimal system for an ARM vers
kind: system
name: base-system-armv7-versatile
strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7-versatile
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-armv7-versatile
+ morph: strata/bsp-armv7-versatile
diff --git a/base-system-armv7b-highbank.morph b/systems/base-system-armv7b-highbank
index 75c69f8..3b3e9f9 100644
--- a/base-system-armv7b-highbank.morph
+++ b/systems/base-system-armv7b-highbank
@@ -10,7 +10,11 @@ description: The set of strata required to have a minimal system for an ARM high
kind: system
name: base-system-armv7b-highbank
strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7b-highbank
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-armv7b-highbank
+ morph: strata/bsp-armv7b-highbank
diff --git a/base-system-armv7b-vexpress-tc2.morph b/systems/base-system-armv7b-vexpress-tc2
index bdd63a0..fd3b50a 100644
--- a/base-system-armv7b-vexpress-tc2.morph
+++ b/systems/base-system-armv7b-vexpress-tc2
@@ -9,7 +9,11 @@ description: A small system for Versatile TC2 boards system.
kind: system
name: base-system-armv7b-vexpress-tc2
strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7b-vexpress-tc2
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-armv7b-vexpress-tc2
+ morph: strata/bsp-armv7b-vexpress-tc2
diff --git a/base-system-armv7lhf-highbank.morph b/systems/base-system-armv7lhf-highbank
index 7a8fa32..0e9be41 100644
--- a/base-system-armv7lhf-highbank.morph
+++ b/systems/base-system-armv7lhf-highbank
@@ -10,7 +10,11 @@ description: The set of strata required to have a minimal system for an ARM high
kind: system
name: base-system-armv7lhf-highbank
strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-armv7-highbank
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-armv7-highbank
+ morph: strata/bsp-armv7-highbank
diff --git a/base-system-ppc64-generic.morph b/systems/base-system-ppc64-generic
index c1589af..802eab2 100644
--- a/base-system-ppc64-generic.morph
+++ b/systems/base-system-ppc64-generic
@@ -10,7 +10,11 @@ description: The set of strata required to have a minimal system for a 64-bit pp
kind: system
name: base-system-ppc64-generic
strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-ppc64-generic
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-ppc64-generic
+ morph: strata/bsp-ppc64-generic
diff --git a/base-system-x86_32-generic.morph b/systems/base-system-x86_32-generic
index e53b2d9..1e309b3 100644
--- a/base-system-x86_32-generic.morph
+++ b/systems/base-system-x86_32-generic
@@ -10,7 +10,11 @@ description: The set of strata required to have a basic system for a 32-bit x86
kind: system
name: base-system-x86_32-generic
strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_32-generic
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-x86_32-generic
+ morph: strata/bsp-x86_32-generic
diff --git a/base-system-x86_64-generic.morph b/systems/base-system-x86_64-generic
index 183e331..f936d9d 100644
--- a/base-system-x86_64-generic.morph
+++ b/systems/base-system-x86_64-generic
@@ -10,7 +10,11 @@ description: The set of strata required to have a minimal system for a 64-bit x8
kind: system
name: base-system-x86_64-generic
strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_64-generic
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
diff --git a/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic
index 15188bc..baf2801 100644
--- a/ceph-service-x86_64-generic.morph
+++ b/systems/ceph-service-x86_64-generic
@@ -4,11 +4,16 @@ description: The set of strata required to have a minimal system for a 64-bit x8
kind: system
arch: x86_64
strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_64-generic
-- morph: ceph-service
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
+- name: ceph-service
+ morph: strata/ceph-service
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/cross-bootstrap-system-armv7lhf-generic.morph b/systems/cross-bootstrap-system-armv7lhf-generic
index 6195bd1..d1331fe 100644
--- a/cross-bootstrap-system-armv7lhf-generic.morph
+++ b/systems/cross-bootstrap-system-armv7lhf-generic
@@ -3,6 +3,9 @@ description: A system that produces the minimum needed to build a devel system
kind: system
name: cross-bootstrap-system-armv7lhf-generic
strata:
-- morph: build-essential
-- morph: core
-- morph: cross-bootstrap
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: cross-bootstrap
+ morph: strata/cross-bootstrap
diff --git a/cross-bootstrap-system-ppc64-generic.morph b/systems/cross-bootstrap-system-ppc64-generic
index 9a05a90..3b11fe3 100644
--- a/cross-bootstrap-system-ppc64-generic.morph
+++ b/systems/cross-bootstrap-system-ppc64-generic
@@ -3,6 +3,9 @@ description: A system that produces the minimum needed to build a devel system
kind: system
name: cross-bootstrap-system-ppc64-generic
strata:
-- morph: build-essential
-- morph: core
-- morph: cross-bootstrap
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: cross-bootstrap
+ morph: strata/cross-bootstrap
diff --git a/cross-bootstrap-system-x86_64-generic.morph b/systems/cross-bootstrap-system-x86_64-generic
index 6c7986e..38e4411 100644
--- a/cross-bootstrap-system-x86_64-generic.morph
+++ b/systems/cross-bootstrap-system-x86_64-generic
@@ -3,6 +3,9 @@ description: A system that produces the minimum needed to build a devel system
kind: system
name: cross-bootstrap-system-x86_64-generic
strata:
-- morph: build-essential
-- morph: core
-- morph: cross-bootstrap
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: cross-bootstrap
+ morph: strata/cross-bootstrap
diff --git a/systems/cxmanage-system-x86_64-generic b/systems/cxmanage-system-x86_64-generic
new file mode 100644
index 0000000..81aff83
--- /dev/null
+++ b/systems/cxmanage-system-x86_64-generic
@@ -0,0 +1,24 @@
+name: cxmanage-system-x86_64-generic
+description: A baserock development system with calxeda management tools added
+kind: system
+arch: x86_64
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
+- name: tools
+ morph: strata/tools
+- name: cxmanage
+ morph: strata/cxmanage
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- fstab
diff --git a/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot
index aabf9ec..8254df9 100644
--- a/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot
@@ -10,8 +10,13 @@ description: A system that is able to build other systems based on the ARM highb
kind: system
name: devel-system-armv7-chroot
strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: tools
-- morph: openstack-clients
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: tools
+ morph: strata/tools
+- name: openstack-clients
+ morph: strata/openstack-clients
diff --git a/systems/devel-system-armv7-highbank b/systems/devel-system-armv7-highbank
new file mode 100644
index 0000000..5eca998
--- /dev/null
+++ b/systems/devel-system-armv7-highbank
@@ -0,0 +1,24 @@
+arch: armv7l
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the ARM highbank
+ architecture.
+kind: system
+name: devel-system-armv7-highbank
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-armv7-highbank
+ morph: strata/bsp-armv7-highbank
+- name: tools
+ morph: strata/tools
+- name: openstack-clients
+ morph: strata/openstack-clients
diff --git a/systems/devel-system-armv7-versatile b/systems/devel-system-armv7-versatile
new file mode 100644
index 0000000..f091707
--- /dev/null
+++ b/systems/devel-system-armv7-versatile
@@ -0,0 +1,24 @@
+arch: armv7l
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the ARM versatile
+ architecture.
+kind: system
+name: devel-system-armv7-versatile
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-armv7-versatile
+ morph: strata/bsp-armv7-versatile
+- name: tools
+ morph: strata/tools
+- name: openstack-clients
+ morph: strata/openstack-clients
diff --git a/systems/devel-system-armv7-wandboard b/systems/devel-system-armv7-wandboard
new file mode 100644
index 0000000..695c2fe
--- /dev/null
+++ b/systems/devel-system-armv7-wandboard
@@ -0,0 +1,23 @@
+arch: armv7l
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the Wandboard.
+kind: system
+name: devel-system-armv7-wandboard
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-wandboard
+ morph: strata/bsp-wandboard
+- name: tools
+ morph: strata/tools
+- name: openstack-clients
+ morph: strata/openstack-clients
diff --git a/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot
index 6a417ec..a0e6d8c 100644
--- a/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot
@@ -10,8 +10,13 @@ description: A system that is able to build other systems based on the ARMv7b
kind: system
name: devel-system-armv7b-chroot
strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: tools
-- morph: openstack-clients
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: tools
+ morph: strata/tools
+- name: openstack-clients
+ morph: strata/openstack-clients
diff --git a/systems/devel-system-armv7b-highbank b/systems/devel-system-armv7b-highbank
new file mode 100644
index 0000000..8eeca5b
--- /dev/null
+++ b/systems/devel-system-armv7b-highbank
@@ -0,0 +1,24 @@
+arch: armv7b
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the ARM highbank
+ architecture.
+kind: system
+name: devel-system-armv7b-highbank
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-armv7b-highbank
+ morph: strata/bsp-armv7b-highbank
+- name: tools
+ morph: strata/tools
+- name: openstack-clients
+ morph: strata/openstack-clients
diff --git a/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot
index f07fc77..35a429e 100644
--- a/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot
@@ -10,8 +10,13 @@ description: A system that is able to build other systems based on the ARMv7lhf
kind: system
name: devel-system-armv7lhf-chroot
strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: tools
-- morph: openstack-clients
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: tools
+ morph: strata/tools
+- name: openstack-clients
+ morph: strata/openstack-clients
diff --git a/systems/devel-system-armv7lhf-highbank b/systems/devel-system-armv7lhf-highbank
new file mode 100644
index 0000000..e01b34e
--- /dev/null
+++ b/systems/devel-system-armv7lhf-highbank
@@ -0,0 +1,24 @@
+arch: armv7lhf
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the ARM highbank
+ architecture.
+kind: system
+name: devel-system-armv7lhf-highbank
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-armv7-highbank
+ morph: strata/bsp-armv7-highbank
+- name: tools
+ morph: strata/tools
+- name: openstack-clients
+ morph: strata/openstack-clients
diff --git a/systems/devel-system-armv7lhf-wandboard b/systems/devel-system-armv7lhf-wandboard
new file mode 100644
index 0000000..8d3b8be
--- /dev/null
+++ b/systems/devel-system-armv7lhf-wandboard
@@ -0,0 +1,23 @@
+arch: armv7lhf
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the Wandboard.
+kind: system
+name: devel-system-armv7lhf-wandboard
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-wandboard
+ morph: strata/bsp-wandboard
+- name: tools
+ morph: strata/tools
+- name: openstack-clients
+ morph: strata/openstack-clients
diff --git a/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot
index dfb2b7c..fcc13bf 100644
--- a/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot
@@ -10,8 +10,13 @@ description: A system that is able to build other systems based on the 64-bit Po
kind: system
name: devel-system-ppc64-chroot
strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: tools
-- morph: openstack-clients
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: tools
+ morph: strata/tools
+- name: openstack-clients
+ morph: strata/openstack-clients
diff --git a/systems/devel-system-ppc64-generic b/systems/devel-system-ppc64-generic
new file mode 100644
index 0000000..80318bd
--- /dev/null
+++ b/systems/devel-system-ppc64-generic
@@ -0,0 +1,24 @@
+arch: ppc64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the 64-bit PowerPc
+ architecture.
+kind: system
+name: devel-system-ppc64-generic
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-ppc64-generic
+ morph: strata/bsp-ppc64-generic
+- name: tools
+ morph: strata/tools
+- name: openstack-clients
+ morph: strata/openstack-clients
diff --git a/systems/devel-system-x86_32-chroot b/systems/devel-system-x86_32-chroot
new file mode 100644
index 0000000..18db948
--- /dev/null
+++ b/systems/devel-system-x86_32-chroot
@@ -0,0 +1,24 @@
+arch: x86_32
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the 32-bit x86
+ architecture.
+kind: system
+name: devel-system-x86_32-chroot
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: tools
+ morph: strata/tools
+- name: openstack-clients
+ morph: strata/openstack-clients
+- name: bsp-x86_both-tools
+ morph: strata/bsp-x86_both-tools
diff --git a/systems/devel-system-x86_32-generic b/systems/devel-system-x86_32-generic
new file mode 100644
index 0000000..929f966
--- /dev/null
+++ b/systems/devel-system-x86_32-generic
@@ -0,0 +1,24 @@
+arch: x86_32
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the 32-bit x86
+ architecture.
+kind: system
+name: devel-system-x86_32-generic
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-x86_32-generic
+ morph: strata/bsp-x86_32-generic
+- name: tools
+ morph: strata/tools
+- name: openstack-clients
+ morph: strata/openstack-clients
diff --git a/systems/devel-system-x86_64-chroot b/systems/devel-system-x86_64-chroot
new file mode 100644
index 0000000..332a273
--- /dev/null
+++ b/systems/devel-system-x86_64-chroot
@@ -0,0 +1,24 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the 64-bit x86
+ architecture.
+kind: system
+name: devel-system-x86_64-chroot
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: tools
+ morph: strata/tools
+- name: openstack-clients
+ morph: strata/openstack-clients
+- name: bsp-x86_both-tools
+ morph: strata/bsp-x86_both-tools
diff --git a/systems/devel-system-x86_64-generic b/systems/devel-system-x86_64-generic
new file mode 100644
index 0000000..554a9a8
--- /dev/null
+++ b/systems/devel-system-x86_64-generic
@@ -0,0 +1,24 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the 64-bit x86
+ architecture.
+kind: system
+name: devel-system-x86_64-generic
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
+- name: tools
+ morph: strata/tools
+- name: openstack-clients
+ morph: strata/openstack-clients
diff --git a/systems/devel-system-x86_64-vagrant b/systems/devel-system-x86_64-vagrant
new file mode 100644
index 0000000..d87b278
--- /dev/null
+++ b/systems/devel-system-x86_64-vagrant
@@ -0,0 +1,45 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- vagrant
+description: A system that is able to build other systems based on the 64-bit x86
+ architecture. This adds the virtualbox guest additions and vagrant configuration too
+kind: system
+name: devel-system-x86_64-vagrant
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: genivi-foundation
+ morph: strata/genivi-foundation
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
+- name: connectivity
+ morph: strata/connectivity
+- name: audio-bluetooth
+ morph: strata/audio-bluetooth
+- name: x-common
+ morph: strata/x-common
+- name: x-x86_64-generic
+ morph: strata/x-x86_64-generic
+- name: multimedia
+ morph: strata/multimedia
+- name: genivi
+ morph: strata/genivi
+- name: genivi-x-x86_64-generic
+ morph: strata/genivi-x-x86_64-generic
+- name: tools
+ morph: strata/tools
+- name: virtualization
+ morph: strata/virtualization
+- name: openstack-clients
+ morph: strata/openstack-clients
+- name: virtualbox-guest-x86_64
+ morph: strata/virtualbox-guest-x86_64
diff --git a/systems/distbuild-system-armv7lhf-highbank b/systems/distbuild-system-armv7lhf-highbank
new file mode 100644
index 0000000..fcfffd4
--- /dev/null
+++ b/systems/distbuild-system-armv7lhf-highbank
@@ -0,0 +1,27 @@
+arch: armv7lhf
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+description: Morph distributed build node for armv7lhf highbank
+kind: system
+name: distbuild-system-armv7lhf-highbank
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-armv7-highbank
+ morph: strata/bsp-armv7-highbank
+- name: tools
+ morph: strata/tools
+- name: nfs
+ morph: strata/nfs
+- name: distbuild
+ morph: strata/distbuild
diff --git a/systems/distbuild-system-x86_32 b/systems/distbuild-system-x86_32
new file mode 100644
index 0000000..d283738
--- /dev/null
+++ b/systems/distbuild-system-x86_32
@@ -0,0 +1,27 @@
+arch: x86_32
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+description: Morph distributed build node for x86_32
+kind: system
+name: distbuild-system-x86_32
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-x86_32-generic
+ morph: strata/bsp-x86_32-generic
+- name: tools
+ morph: strata/tools
+- name: nfs
+ morph: strata/nfs
+- name: distbuild
+ morph: strata/distbuild
diff --git a/systems/distbuild-system-x86_64 b/systems/distbuild-system-x86_64
new file mode 100644
index 0000000..92df72c
--- /dev/null
+++ b/systems/distbuild-system-x86_64
@@ -0,0 +1,27 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- distbuild
+- fstab
+description: Morph distributed build node for x86_64
+kind: system
+name: distbuild-system-x86_64
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
+- name: tools
+ morph: strata/tools
+- name: nfs
+ morph: strata/nfs
+- name: distbuild
+ morph: strata/distbuild
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile b/systems/genivi-baseline-system-armv7lhf-versatile
new file mode 100644
index 0000000..dd94852
--- /dev/null
+++ b/systems/genivi-baseline-system-armv7lhf-versatile
@@ -0,0 +1,35 @@
+arch: armv7lhf
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- strip-gplv3
+- fstab
+description: A GENIVI baseline system for an ARMv7 system.
+kind: system
+name: genivi-baseline-system-armv7lhf-versatile
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: genivi-foundation
+ morph: strata/genivi-foundation
+- name: bsp-armv7-versatile
+ morph: strata/bsp-armv7-versatile
+- name: connectivity
+ morph: strata/connectivity
+- name: audio-bluetooth
+ morph: strata/audio-bluetooth
+- name: x-common
+ morph: strata/x-common
+- name: multimedia
+ morph: strata/multimedia
+- name: genivi
+ morph: strata/genivi
+- name: wayland-armv7-versatile
+ morph: strata/wayland-armv7-versatile
diff --git a/systems/genivi-baseline-system-x86_64-generic b/systems/genivi-baseline-system-x86_64-generic
new file mode 100644
index 0000000..d2fa299
--- /dev/null
+++ b/systems/genivi-baseline-system-x86_64-generic
@@ -0,0 +1,34 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- strip-gplv3
+description: A GENIVI baseline system for a 64-bit x86 system.
+kind: system
+name: genivi-baseline-system-x86_64-generic
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: genivi-foundation
+ morph: strata/genivi-foundation
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
+- name: connectivity
+ morph: strata/connectivity
+- name: audio-bluetooth
+ morph: strata/audio-bluetooth
+- name: x-common
+ morph: strata/x-common
+- name: multimedia
+ morph: strata/multimedia
+- name: genivi
+ morph: strata/genivi
+- name: wayland-x86_64-generic
+ morph: strata/wayland-x86_64-generic
diff --git a/systems/gitlab-ci-runner b/systems/gitlab-ci-runner
new file mode 100644
index 0000000..6c7bbaf
--- /dev/null
+++ b/systems/gitlab-ci-runner
@@ -0,0 +1,50 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system to run build tests as part of GitLab CI
+ architecture.
+kind: system
+name: gitlab-ci-runner
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: genivi-foundation
+ morph: strata/genivi-foundation
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
+- name: connectivity
+ morph: strata/connectivity
+- name: audio-bluetooth
+ morph: strata/audio-bluetooth
+- name: x-common
+ morph: strata/x-common
+- name: x-x86_64-generic
+ morph: strata/x-x86_64-generic
+- name: multimedia
+ morph: strata/multimedia
+- name: genivi
+ morph: strata/genivi
+- name: genivi-x-x86_64-generic
+ morph: strata/genivi-x-x86_64-generic
+- name: tools
+ morph: strata/tools
+- name: virtualization
+ morph: strata/virtualization
+- name: openstack-clients
+ morph: strata/openstack-clients
+- name: databases
+ morph: strata/databases
+- name: webtools
+ morph: strata/webtools
+- name: ruby
+ morph: strata/ruby
+- name: nfs
+ morph: strata/nfs
diff --git a/systems/gitlab-server b/systems/gitlab-server
new file mode 100644
index 0000000..a2753b3
--- /dev/null
+++ b/systems/gitlab-server
@@ -0,0 +1,32 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- gitlab
+description: system which hosts a gitlab server
+kind: system
+name: gitlab-server
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
+- name: foundation
+ morph: strata/foundation
+- name: core
+ morph: strata/core
+- name: tools
+ morph: strata/tools
+- name: nfs
+ morph: strata/nfs
+- name: databases
+ morph: strata/databases
+- name: webtools
+ morph: strata/webtools
+- name: ruby
+ morph: strata/ruby
+- name: gitlab
+ morph: strata/gitlab
diff --git a/initramfs-x86_64.morph b/systems/initramfs-x86_64
index 7daa81f..465aabb 100644
--- a/initramfs-x86_64.morph
+++ b/systems/initramfs-x86_64
@@ -4,7 +4,9 @@ kind: system
arch: x86_64
configuration-extensions: []
strata:
-- morph: build-essential
+- name: build-essential
+ morph: strata/build-essential
artifacts:
- build-essential-minimal
-- morph: initramfs-utils
+- name: initramfs-utils
+ morph: strata/initramfs-utils
diff --git a/minimal-system-x86_32-generic.morph b/systems/minimal-system-x86_32-generic
index b9e9b9e..968424b 100644
--- a/minimal-system-x86_32-generic.morph
+++ b/systems/minimal-system-x86_32-generic
@@ -10,10 +10,12 @@ description: The set of strata required to have a minimal system for a 32-bit x8
kind: system
name: minimal-system-x86_32-generic
strata:
-- morph: build-essential
+- name: build-essential
+ morph: strata/build-essential
artifacts:
- build-essential-minimal
-- morph: bsp-x86_32-generic
+- name: bsp-x86_32-generic
+ morph: strata/bsp-x86_32-generic
# Don't include kernel headers in the system
artifacts:
- bsp-x86_32-generic-runtime
diff --git a/minimal-system-x86_64-generic.morph b/systems/minimal-system-x86_64-generic
index 9ead85e..6f27856 100644
--- a/minimal-system-x86_64-generic.morph
+++ b/systems/minimal-system-x86_64-generic
@@ -10,10 +10,14 @@ description: The set of strata required to have a minimal system for a 64-bit x8
kind: system
name: minimal-system-x86_64-generic
strata:
-- morph: build-essential
+- name: build-essential
+ name: build-essential
+ morph: strata/build-essential
artifacts:
- build-essential-minimal
-- morph: bsp-x86_64-generic
+- name: bsp-x86_64-generic
+ name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
# Don't include kernel headers in the system
artifacts:
- bsp-x86_64-generic-runtime
diff --git a/systems/nodejs-system-x86_64 b/systems/nodejs-system-x86_64
new file mode 100644
index 0000000..74cccd2
--- /dev/null
+++ b/systems/nodejs-system-x86_64
@@ -0,0 +1,44 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the 64-bit x86
+ architecture.
+kind: system
+name: nodejs-system-x86_64
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: genivi-foundation
+ morph: strata/genivi-foundation
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
+- name: connectivity
+ morph: strata/connectivity
+- name: audio-bluetooth
+ morph: strata/audio-bluetooth
+- name: x-common
+ morph: strata/x-common
+- name: x-x86_64-generic
+ morph: strata/x-x86_64-generic
+- name: multimedia
+ morph: strata/multimedia
+- name: genivi
+ morph: strata/genivi
+- name: genivi-x-x86_64-generic
+ morph: strata/genivi-x-x86_64-generic
+- name: tools
+ morph: strata/tools
+- name: virtualization
+ morph: strata/virtualization
+- name: openstack-clients
+ morph: strata/openstack-clients
+- name: nodejs
+ morph: strata/nodejs
diff --git a/openstack-client-base-system-x86_32-generic.morph b/systems/openstack-client-base-system-x86_32-generic
index 21b60af..d7fc814 100644
--- a/openstack-client-base-system-x86_32-generic.morph
+++ b/systems/openstack-client-base-system-x86_32-generic
@@ -11,8 +11,13 @@ description: The set of strata required to have a minimal system for a 32-bit x8
kind: system
name: openstack-client-base-system-x86_32-generic
strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_32-generic
-- morph: cloudinit-support
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-x86_32-generic
+ morph: strata/bsp-x86_32-generic
+- name: cloudinit-support
+ morph: strata/cloudinit-support
diff --git a/openstack-client-base-system-x86_64-generic.morph b/systems/openstack-client-base-system-x86_64-generic
index 977e1fb..03bcd3d 100644
--- a/openstack-client-base-system-x86_64-generic.morph
+++ b/systems/openstack-client-base-system-x86_64-generic
@@ -11,8 +11,13 @@ description: The set of strata required to have a minimal system for a 64-bit x8
kind: system
name: openstack-client-base-system-x86_64-generic
strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: bsp-x86_64-generic
-- morph: cloudinit-support
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
+- name: cloudinit-support
+ morph: strata/cloudinit-support
diff --git a/systems/qt4-devel-system-x86_64-generic b/systems/qt4-devel-system-x86_64-generic
new file mode 100644
index 0000000..847f0e6
--- /dev/null
+++ b/systems/qt4-devel-system-x86_64-generic
@@ -0,0 +1,40 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the 64-bit x86
+ architecture.
+kind: system
+name: qt4-devel-system-x86_64-generic
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: audio-bluetooth
+ morph: strata/audio-bluetooth
+- name: multimedia-gstreamer-0.10
+ morph: strata/multimedia-gstreamer-0.10
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
+- name: tools
+ morph: strata/tools
+- name: x-common
+ morph: strata/x-common
+- name: x-x86_64-generic
+ morph: strata/x-x86_64-generic
+- name: qt4-tools
+ morph: strata/qt4-tools
+- name: qt4-sdk
+ morph: strata/qt4-sdk
+- name: lua
+ morph: strata/lua
+- name: connectivity
+ morph: strata/connectivity
+- name: enlightenment
+ morph: strata/enlightenment
diff --git a/systems/qt5-devel-system-x86_64-generic b/systems/qt5-devel-system-x86_64-generic
new file mode 100644
index 0000000..1126ead
--- /dev/null
+++ b/systems/qt5-devel-system-x86_64-generic
@@ -0,0 +1,40 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the 64-bit x86
+ architecture.
+kind: system
+name: qt5-devel-system-x86_64-generic
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: audio-bluetooth
+ morph: strata/audio-bluetooth
+- name: multimedia-gstreamer-0.10
+ morph: strata/multimedia-gstreamer-0.10
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
+- name: tools
+ morph: strata/tools
+- name: x-common
+ morph: strata/x-common
+- name: x-x86_64-generic
+ morph: strata/x-x86_64-generic
+- name: qt5-tools
+ morph: strata/qt5-tools
+- name: qt5-sdk
+ morph: strata/qt5-sdk
+- name: lua
+ morph: strata/lua
+- name: connectivity
+ morph: strata/connectivity
+- name: enlightenment
+ morph: strata/enlightenment
diff --git a/systems/trove-system-x86_64 b/systems/trove-system-x86_64
new file mode 100644
index 0000000..69898d7
--- /dev/null
+++ b/systems/trove-system-x86_64
@@ -0,0 +1,27 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- trove
+- nfsboot-server
+- trove-backup
+- fstab
+- simple-network
+- install-files
+description: Trove server
+kind: system
+name: trove-system-x86_64
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
+- name: foundation
+ morph: strata/foundation
+- name: core
+ morph: strata/core
+- name: tools
+ morph: strata/tools
+- name: trove
+ morph: strata/trove
+- name: nfs
+ morph: strata/nfs
diff --git a/systems/web-system-x86_64-generic b/systems/web-system-x86_64-generic
new file mode 100644
index 0000000..20c8895
--- /dev/null
+++ b/systems/web-system-x86_64-generic
@@ -0,0 +1,33 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: system with web tools
+kind: system
+name: web-system-x86_64-generic
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
+- name: foundation
+ morph: strata/foundation
+- name: core
+ morph: strata/core
+- name: tools
+ morph: strata/tools
+- name: nfs
+ morph: strata/nfs
+- name: databases
+ morph: strata/databases
+- name: webtools
+ morph: strata/webtools
+- name: erlang
+ morph: strata/erlang
+- name: ruby
+ morph: strata/ruby
+- name: nodejs
+ morph: strata/nodejs
diff --git a/systems/xfce-system b/systems/xfce-system
new file mode 100644
index 0000000..a2a259c
--- /dev/null
+++ b/systems/xfce-system
@@ -0,0 +1,41 @@
+arch: x86_64
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A GENIVI devel with XFCE
+kind: system
+name: xfce-system
+strata:
+- name: build-essential
+ morph: strata/build-essential
+- name: core
+ morph: strata/core
+- name: foundation
+ morph: strata/foundation
+- name: genivi-foundation
+ morph: strata/genivi-foundation
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic
+- name: connectivity
+ morph: strata/connectivity
+- name: audio-bluetooth
+ morph: strata/audio-bluetooth
+- name: x-common
+ morph: strata/x-common
+- name: x-x86_64-generic
+ morph: strata/x-x86_64-generic
+- name: multimedia
+ morph: strata/multimedia
+- name: genivi
+ morph: strata/genivi
+- name: genivi-x-x86_64-generic
+ morph: strata/genivi-x-x86_64-generic
+- name: gtk2
+ morph: strata/gtk2
+- name: tools
+ morph: strata/tools
+- name: xfce
+ morph: strata/xfce
diff --git a/trove-system-x86_64.morph b/trove-system-x86_64.morph
deleted file mode 100644
index d599d4b..0000000
--- a/trove-system-x86_64.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- trove
-- nfsboot-server
-- trove-backup
-- fstab
-- simple-network
-- install-files
-description: Trove server
-kind: system
-name: trove-system-x86_64
-strata:
-- morph: build-essential
-- morph: bsp-x86_64-generic
-- morph: foundation
-- morph: core
-- morph: tools
-- morph: trove
-- morph: nfs
diff --git a/trove.baserock.org-upgrade.morph b/trove.baserock.org-upgrade.morph
index 359bb3c..6630468 100644
--- a/trove.baserock.org-upgrade.morph
+++ b/trove.baserock.org-upgrade.morph
@@ -10,7 +10,7 @@ description: |
Replace the value of gbo.VERSION_LABEL above with the current date.
You can add letters if you need to upgrade multiple times in a day.
systems:
-- morph: trove-system-x86_64
+- morph: systems/trove-system-x86_64
deploy:
gbo:
type: ssh-rsync
diff --git a/upgrade-devel.morph b/upgrade-devel.morph
index 408dfd0..d612a1b 100644
--- a/upgrade-devel.morph
+++ b/upgrade-devel.morph
@@ -18,7 +18,7 @@ description: |
To upgrade, select a sensible a value for VERSION_LABEL and run:
- morph deploy --upgrade upgrade-devel.morph self.HOSTNAME=$(hostname) self.VERSION_LABEL=$VERSION_LABEL
+ morph deploy --upgrade upgrade-devel self.HOSTNAME=$(hostname) self.VERSION_LABEL=$VERSION_LABEL
Your configuration in /etc should be propagated to the new system, but there
may be merge conflicts. Check /etc for files named '.rej' and '.orig' in the
@@ -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: devel-system-x86_64-generic
+- morph: systems/devel-system-x86_64-generic
deploy:
self:
type: ssh-rsync
diff --git a/web-system-x86_64-generic.morph b/web-system-x86_64-generic.morph
deleted file mode 100644
index 836bb45..0000000
--- a/web-system-x86_64-generic.morph
+++ /dev/null
@@ -1,22 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: system with web tools
-kind: system
-name: web-system-x86_64-generic
-strata:
-- morph: build-essential
-- morph: bsp-x86_64-generic
-- morph: foundation
-- morph: core
-- morph: tools
-- morph: nfs
-- morph: databases
-- morph: webtools
-- morph: erlang
-- morph: ruby
-- morph: nodejs
diff --git a/xfce-system.morph b/xfce-system.morph
deleted file mode 100644
index b2fd7d2..0000000
--- a/xfce-system.morph
+++ /dev/null
@@ -1,26 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A GENIVI devel with XFCE
-kind: system
-name: xfce-system
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: genivi-foundation
-- morph: bsp-x86_64-generic
-- morph: connectivity
-- morph: audio-bluetooth
-- morph: x-common
-- morph: x-x86_64-generic
-- morph: multimedia
-- morph: genivi
-- morph: genivi-x-x86_64-generic
-- morph: gtk2
-- morph: tools
-- morph: xfce