summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2014-04-09 08:10:34 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2014-04-09 08:10:34 +0000
commit8002c2604d16e9f61a4d9f819b8300c12803b836 (patch)
tree6be9ae5b0f36c4107e5232d91dbef47fb2ce724a
parent2bb2479af804e47df374a5ff1974219e477f9c6c (diff)
downloaddefinitions-8002c2604d16e9f61a4d9f819b8300c12803b836.tar.gz
Move stratum morphologies into subdirectories
Before bringing in the chunk morphologies, rearrange the definitions repo so that the chunk morphologies can go in a subdirectory along with the stratum that contains the chunk. Also rename the `distbuild` directory to `distbuild-system` and update the example cluster morphology accordingly.
-rw-r--r--armv7lhf-cross-toolchain/morph (renamed from armv7lhf-cross-toolchain.morph)0
-rw-r--r--audio-bluetooth/morph (renamed from audio-bluetooth.morph)0
-rw-r--r--bsp-armv7-highbank/morph (renamed from bsp-armv7-highbank.morph)0
-rw-r--r--bsp-armv7-versatile/morph (renamed from bsp-armv7-versatile.morph)0
-rw-r--r--bsp-armv7b-highbank/morph (renamed from bsp-armv7b-highbank.morph)0
-rw-r--r--bsp-armv7b-vexpress-tc2/morph (renamed from bsp-armv7b-vexpress-tc2.morph)0
-rw-r--r--bsp-imx53/morph (renamed from bsp-imx53.morph)0
-rw-r--r--bsp-ppc64-generic/morph (renamed from bsp-ppc64-generic.morph)0
-rw-r--r--bsp-wandboard/morph (renamed from bsp-wandboard.morph)0
-rw-r--r--bsp-x86_32-generic/morph (renamed from bsp-x86_32-generic.morph)0
-rw-r--r--bsp-x86_64-generic/morph (renamed from bsp-x86_64-generic.morph)0
-rw-r--r--build-essential/morph (renamed from build-essential.morph)0
-rw-r--r--ceph-service/morph (renamed from ceph-service.morph)0
-rw-r--r--cloudinit-support/morph (renamed from cloudinit-support.morph)0
-rw-r--r--connectivity/morph (renamed from connectivity.morph)0
-rw-r--r--core/morph (renamed from core.morph)0
-rw-r--r--cross-bootstrap/morph (renamed from cross-bootstrap.morph)0
-rw-r--r--cross-tools/morph (renamed from cross-tools.morph)0
-rw-r--r--cxmanage/morph (renamed from cxmanage.morph)0
-rwxr-xr-xdistbuild-system/lib/systemd/system-generators/ccache-nfs-mount-generator (renamed from distbuild/lib/systemd/system-generators/ccache-nfs-mount-generator)0
-rw-r--r--distbuild-system/manifest (renamed from distbuild/manifest)0
-rw-r--r--distbuild-system/usr/lib/systemd/system/morph-cache-server.service (renamed from distbuild/usr/lib/systemd/system/morph-cache-server.service)0
-rw-r--r--distbuild-system/usr/lib/systemd/system/morph-controller-helper.service (renamed from distbuild/usr/lib/systemd/system/morph-controller-helper.service)0
-rw-r--r--distbuild-system/usr/lib/systemd/system/morph-controller.service (renamed from distbuild/usr/lib/systemd/system/morph-controller.service)0
-rw-r--r--distbuild-system/usr/lib/systemd/system/morph-worker-helper.service (renamed from distbuild/usr/lib/systemd/system/morph-worker-helper.service)0
-rw-r--r--distbuild-system/usr/lib/systemd/system/morph-worker.service (renamed from distbuild/usr/lib/systemd/system/morph-worker.service)0
l---------distbuild-system/usr/lib/systemd/system/multi-user.target.wants/morph-cache-server.service (renamed from distbuild/usr/lib/systemd/system/multi-user.target.wants/morph-cache-server.service)0
l---------distbuild-system/usr/lib/systemd/system/multi-user.target.wants/morph-controller-helper.service (renamed from distbuild/usr/lib/systemd/system/multi-user.target.wants/morph-controller-helper.service)0
l---------distbuild-system/usr/lib/systemd/system/multi-user.target.wants/morph-controller.service (renamed from distbuild/usr/lib/systemd/system/multi-user.target.wants/morph-controller.service)0
l---------distbuild-system/usr/lib/systemd/system/multi-user.target.wants/morph-worker-helper.service (renamed from distbuild/usr/lib/systemd/system/multi-user.target.wants/morph-worker-helper.service)0
l---------distbuild-system/usr/lib/systemd/system/multi-user.target.wants/morph-worker.service (renamed from distbuild/usr/lib/systemd/system/multi-user.target.wants/morph-worker.service)0
-rw-r--r--distbuild/morph (renamed from distbuild.morph)0
-rw-r--r--enlightenment/morph (renamed from enlightenment.morph)0
-rw-r--r--example-distbuild-cluster.morph2
-rw-r--r--foundation/morph (renamed from foundation.morph)0
-rw-r--r--genivi-foundation/morph (renamed from genivi-foundation.morph)0
-rw-r--r--genivi-wayland-armv7-versatile/morph (renamed from genivi-wayland-armv7-versatile.morph)0
-rw-r--r--genivi-wayland-x86_64-generic/morph (renamed from genivi-wayland-x86_64-generic.morph)0
-rw-r--r--genivi-x-armv7-versatile/morph (renamed from genivi-x-armv7-versatile.morph)0
-rw-r--r--genivi-x-ppc64-generic/morph (renamed from genivi-x-ppc64-generic.morph)0
-rw-r--r--genivi-x-x86_64-generic/morph (renamed from genivi-x-x86_64-generic.morph)0
-rw-r--r--genivi/morph (renamed from genivi.morph)0
-rw-r--r--glanceclient/morph (renamed from glanceclient.morph)0
-rw-r--r--gtk2/morph (renamed from gtk2.morph)0
-rw-r--r--lua/morph (renamed from lua.morph)0
-rw-r--r--multimedia-gstreamer-0.10/morph (renamed from multimedia-gstreamer-0.10.morph)0
-rw-r--r--multimedia/morph (renamed from multimedia.morph)0
-rw-r--r--nfs/morph (renamed from nfs.morph)0
-rw-r--r--qt4-sdk/morph (renamed from qt4-sdk.morph)0
-rw-r--r--qt4-tools/morph (renamed from qt4-tools.morph)0
-rw-r--r--qt5-sdk/morph (renamed from qt5-sdk.morph)0
-rw-r--r--qt5-tools/morph (renamed from qt5-tools.morph)0
-rw-r--r--tools/morph (renamed from tools.morph)0
-rw-r--r--trove/morph (renamed from trove.morph)0
-rw-r--r--wayland-armv7-versatile/morph (renamed from wayland-armv7-versatile.morph)0
-rw-r--r--wayland-x86_64-generic/morph (renamed from wayland-x86_64-generic.morph)0
-rw-r--r--x-armv7-versatile/morph (renamed from x-armv7-versatile.morph)0
-rw-r--r--x-common/morph (renamed from x-common.morph)0
-rw-r--r--x-ppc64-generic/morph (renamed from x-ppc64-generic.morph)0
-rw-r--r--x-x86_64-generic/morph (renamed from x-x86_64-generic.morph)0
-rw-r--r--xfce/morph (renamed from xfce.morph)0
61 files changed, 1 insertions, 1 deletions
diff --git a/armv7lhf-cross-toolchain.morph b/armv7lhf-cross-toolchain/morph
index 8d21fa6c..8d21fa6c 100644
--- a/armv7lhf-cross-toolchain.morph
+++ b/armv7lhf-cross-toolchain/morph
diff --git a/audio-bluetooth.morph b/audio-bluetooth/morph
index 07db9d16..07db9d16 100644
--- a/audio-bluetooth.morph
+++ b/audio-bluetooth/morph
diff --git a/bsp-armv7-highbank.morph b/bsp-armv7-highbank/morph
index ea791c6f..ea791c6f 100644
--- a/bsp-armv7-highbank.morph
+++ b/bsp-armv7-highbank/morph
diff --git a/bsp-armv7-versatile.morph b/bsp-armv7-versatile/morph
index 797fdeec..797fdeec 100644
--- a/bsp-armv7-versatile.morph
+++ b/bsp-armv7-versatile/morph
diff --git a/bsp-armv7b-highbank.morph b/bsp-armv7b-highbank/morph
index 491f0948..491f0948 100644
--- a/bsp-armv7b-highbank.morph
+++ b/bsp-armv7b-highbank/morph
diff --git a/bsp-armv7b-vexpress-tc2.morph b/bsp-armv7b-vexpress-tc2/morph
index 3446cb9a..3446cb9a 100644
--- a/bsp-armv7b-vexpress-tc2.morph
+++ b/bsp-armv7b-vexpress-tc2/morph
diff --git a/bsp-imx53.morph b/bsp-imx53/morph
index 395fad19..395fad19 100644
--- a/bsp-imx53.morph
+++ b/bsp-imx53/morph
diff --git a/bsp-ppc64-generic.morph b/bsp-ppc64-generic/morph
index d765e6c2..d765e6c2 100644
--- a/bsp-ppc64-generic.morph
+++ b/bsp-ppc64-generic/morph
diff --git a/bsp-wandboard.morph b/bsp-wandboard/morph
index 95f61bc9..95f61bc9 100644
--- a/bsp-wandboard.morph
+++ b/bsp-wandboard/morph
diff --git a/bsp-x86_32-generic.morph b/bsp-x86_32-generic/morph
index b6cb845a..b6cb845a 100644
--- a/bsp-x86_32-generic.morph
+++ b/bsp-x86_32-generic/morph
diff --git a/bsp-x86_64-generic.morph b/bsp-x86_64-generic/morph
index a824fdfc..a824fdfc 100644
--- a/bsp-x86_64-generic.morph
+++ b/bsp-x86_64-generic/morph
diff --git a/build-essential.morph b/build-essential/morph
index c6e7ba2c..c6e7ba2c 100644
--- a/build-essential.morph
+++ b/build-essential/morph
diff --git a/ceph-service.morph b/ceph-service/morph
index 92ecb417..92ecb417 100644
--- a/ceph-service.morph
+++ b/ceph-service/morph
diff --git a/cloudinit-support.morph b/cloudinit-support/morph
index a1076006..a1076006 100644
--- a/cloudinit-support.morph
+++ b/cloudinit-support/morph
diff --git a/connectivity.morph b/connectivity/morph
index 69512392..69512392 100644
--- a/connectivity.morph
+++ b/connectivity/morph
diff --git a/core.morph b/core/morph
index 7b90657e..7b90657e 100644
--- a/core.morph
+++ b/core/morph
diff --git a/cross-bootstrap.morph b/cross-bootstrap/morph
index 3234befc..3234befc 100644
--- a/cross-bootstrap.morph
+++ b/cross-bootstrap/morph
diff --git a/cross-tools.morph b/cross-tools/morph
index 2fb4d59d..2fb4d59d 100644
--- a/cross-tools.morph
+++ b/cross-tools/morph
diff --git a/cxmanage.morph b/cxmanage/morph
index b8c0ad07..b8c0ad07 100644
--- a/cxmanage.morph
+++ b/cxmanage/morph
diff --git a/distbuild/lib/systemd/system-generators/ccache-nfs-mount-generator b/distbuild-system/lib/systemd/system-generators/ccache-nfs-mount-generator
index 127bc84f..127bc84f 100755
--- a/distbuild/lib/systemd/system-generators/ccache-nfs-mount-generator
+++ b/distbuild-system/lib/systemd/system-generators/ccache-nfs-mount-generator
diff --git a/distbuild/manifest b/distbuild-system/manifest
index eba7c9f1..eba7c9f1 100644
--- a/distbuild/manifest
+++ b/distbuild-system/manifest
diff --git a/distbuild/usr/lib/systemd/system/morph-cache-server.service b/distbuild-system/usr/lib/systemd/system/morph-cache-server.service
index 7ee5e167..7ee5e167 100644
--- a/distbuild/usr/lib/systemd/system/morph-cache-server.service
+++ b/distbuild-system/usr/lib/systemd/system/morph-cache-server.service
diff --git a/distbuild/usr/lib/systemd/system/morph-controller-helper.service b/distbuild-system/usr/lib/systemd/system/morph-controller-helper.service
index 9e5bd3c8..9e5bd3c8 100644
--- a/distbuild/usr/lib/systemd/system/morph-controller-helper.service
+++ b/distbuild-system/usr/lib/systemd/system/morph-controller-helper.service
diff --git a/distbuild/usr/lib/systemd/system/morph-controller.service b/distbuild-system/usr/lib/systemd/system/morph-controller.service
index b3ba93b4..b3ba93b4 100644
--- a/distbuild/usr/lib/systemd/system/morph-controller.service
+++ b/distbuild-system/usr/lib/systemd/system/morph-controller.service
diff --git a/distbuild/usr/lib/systemd/system/morph-worker-helper.service b/distbuild-system/usr/lib/systemd/system/morph-worker-helper.service
index 14c082ce..14c082ce 100644
--- a/distbuild/usr/lib/systemd/system/morph-worker-helper.service
+++ b/distbuild-system/usr/lib/systemd/system/morph-worker-helper.service
diff --git a/distbuild/usr/lib/systemd/system/morph-worker.service b/distbuild-system/usr/lib/systemd/system/morph-worker.service
index 26dcb9ad..26dcb9ad 100644
--- a/distbuild/usr/lib/systemd/system/morph-worker.service
+++ b/distbuild-system/usr/lib/systemd/system/morph-worker.service
diff --git a/distbuild/usr/lib/systemd/system/multi-user.target.wants/morph-cache-server.service b/distbuild-system/usr/lib/systemd/system/multi-user.target.wants/morph-cache-server.service
index e624a31d..e624a31d 120000
--- a/distbuild/usr/lib/systemd/system/multi-user.target.wants/morph-cache-server.service
+++ b/distbuild-system/usr/lib/systemd/system/multi-user.target.wants/morph-cache-server.service
diff --git a/distbuild/usr/lib/systemd/system/multi-user.target.wants/morph-controller-helper.service b/distbuild-system/usr/lib/systemd/system/multi-user.target.wants/morph-controller-helper.service
index 1554df76..1554df76 120000
--- a/distbuild/usr/lib/systemd/system/multi-user.target.wants/morph-controller-helper.service
+++ b/distbuild-system/usr/lib/systemd/system/multi-user.target.wants/morph-controller-helper.service
diff --git a/distbuild/usr/lib/systemd/system/multi-user.target.wants/morph-controller.service b/distbuild-system/usr/lib/systemd/system/multi-user.target.wants/morph-controller.service
index 9d92814b..9d92814b 120000
--- a/distbuild/usr/lib/systemd/system/multi-user.target.wants/morph-controller.service
+++ b/distbuild-system/usr/lib/systemd/system/multi-user.target.wants/morph-controller.service
diff --git a/distbuild/usr/lib/systemd/system/multi-user.target.wants/morph-worker-helper.service b/distbuild-system/usr/lib/systemd/system/multi-user.target.wants/morph-worker-helper.service
index 298c582f..298c582f 120000
--- a/distbuild/usr/lib/systemd/system/multi-user.target.wants/morph-worker-helper.service
+++ b/distbuild-system/usr/lib/systemd/system/multi-user.target.wants/morph-worker-helper.service
diff --git a/distbuild/usr/lib/systemd/system/multi-user.target.wants/morph-worker.service b/distbuild-system/usr/lib/systemd/system/multi-user.target.wants/morph-worker.service
index 3f8d58a8..3f8d58a8 120000
--- a/distbuild/usr/lib/systemd/system/multi-user.target.wants/morph-worker.service
+++ b/distbuild-system/usr/lib/systemd/system/multi-user.target.wants/morph-worker.service
diff --git a/distbuild.morph b/distbuild/morph
index 9a2d1087..9a2d1087 100644
--- a/distbuild.morph
+++ b/distbuild/morph
diff --git a/enlightenment.morph b/enlightenment/morph
index d5ab5330..d5ab5330 100644
--- a/enlightenment.morph
+++ b/enlightenment/morph
diff --git a/example-distbuild-cluster.morph b/example-distbuild-cluster.morph
index 736a5beb..08a43af0 100644
--- a/example-distbuild-cluster.morph
+++ b/example-distbuild-cluster.morph
@@ -17,7 +17,7 @@ systems:
DISTBUILD_CONTROLLER: no
DISTBUILD_WORKER: yes
FSTAB_SRC: LABEL=src /srv/distbuild auto defaults,rw,noatime 0 2
- INSTALL_FILES: distbuild/manifest
+ INSTALL_FILES: distbuild-system/manifest
NFSBOOT_CONFIGURE: yes
WORKER_SSH_KEY: ssh-keys/worker.key
deploy:
diff --git a/foundation.morph b/foundation/morph
index 413ed4be..413ed4be 100644
--- a/foundation.morph
+++ b/foundation/morph
diff --git a/genivi-foundation.morph b/genivi-foundation/morph
index 9fbfb3eb..9fbfb3eb 100644
--- a/genivi-foundation.morph
+++ b/genivi-foundation/morph
diff --git a/genivi-wayland-armv7-versatile.morph b/genivi-wayland-armv7-versatile/morph
index 13d08834..13d08834 100644
--- a/genivi-wayland-armv7-versatile.morph
+++ b/genivi-wayland-armv7-versatile/morph
diff --git a/genivi-wayland-x86_64-generic.morph b/genivi-wayland-x86_64-generic/morph
index 6ff3aa66..6ff3aa66 100644
--- a/genivi-wayland-x86_64-generic.morph
+++ b/genivi-wayland-x86_64-generic/morph
diff --git a/genivi-x-armv7-versatile.morph b/genivi-x-armv7-versatile/morph
index cd308bb8..cd308bb8 100644
--- a/genivi-x-armv7-versatile.morph
+++ b/genivi-x-armv7-versatile/morph
diff --git a/genivi-x-ppc64-generic.morph b/genivi-x-ppc64-generic/morph
index 9843341b..9843341b 100644
--- a/genivi-x-ppc64-generic.morph
+++ b/genivi-x-ppc64-generic/morph
diff --git a/genivi-x-x86_64-generic.morph b/genivi-x-x86_64-generic/morph
index 45929b17..45929b17 100644
--- a/genivi-x-x86_64-generic.morph
+++ b/genivi-x-x86_64-generic/morph
diff --git a/genivi.morph b/genivi/morph
index 70384d3c..70384d3c 100644
--- a/genivi.morph
+++ b/genivi/morph
diff --git a/glanceclient.morph b/glanceclient/morph
index 5d80a73f..5d80a73f 100644
--- a/glanceclient.morph
+++ b/glanceclient/morph
diff --git a/gtk2.morph b/gtk2/morph
index 74156fcd..74156fcd 100644
--- a/gtk2.morph
+++ b/gtk2/morph
diff --git a/lua.morph b/lua/morph
index 8ad1dfec..8ad1dfec 100644
--- a/lua.morph
+++ b/lua/morph
diff --git a/multimedia-gstreamer-0.10.morph b/multimedia-gstreamer-0.10/morph
index c7a44e87..c7a44e87 100644
--- a/multimedia-gstreamer-0.10.morph
+++ b/multimedia-gstreamer-0.10/morph
diff --git a/multimedia.morph b/multimedia/morph
index 9d7621c5..9d7621c5 100644
--- a/multimedia.morph
+++ b/multimedia/morph
diff --git a/nfs.morph b/nfs/morph
index e0e5f2a1..e0e5f2a1 100644
--- a/nfs.morph
+++ b/nfs/morph
diff --git a/qt4-sdk.morph b/qt4-sdk/morph
index 88c0974d..88c0974d 100644
--- a/qt4-sdk.morph
+++ b/qt4-sdk/morph
diff --git a/qt4-tools.morph b/qt4-tools/morph
index 3c148283..3c148283 100644
--- a/qt4-tools.morph
+++ b/qt4-tools/morph
diff --git a/qt5-sdk.morph b/qt5-sdk/morph
index b26d2271..b26d2271 100644
--- a/qt5-sdk.morph
+++ b/qt5-sdk/morph
diff --git a/qt5-tools.morph b/qt5-tools/morph
index 39a8264b..39a8264b 100644
--- a/qt5-tools.morph
+++ b/qt5-tools/morph
diff --git a/tools.morph b/tools/morph
index 449b19d0..449b19d0 100644
--- a/tools.morph
+++ b/tools/morph
diff --git a/trove.morph b/trove/morph
index 013d2647..013d2647 100644
--- a/trove.morph
+++ b/trove/morph
diff --git a/wayland-armv7-versatile.morph b/wayland-armv7-versatile/morph
index 9b779477..9b779477 100644
--- a/wayland-armv7-versatile.morph
+++ b/wayland-armv7-versatile/morph
diff --git a/wayland-x86_64-generic.morph b/wayland-x86_64-generic/morph
index 2b9f581f..2b9f581f 100644
--- a/wayland-x86_64-generic.morph
+++ b/wayland-x86_64-generic/morph
diff --git a/x-armv7-versatile.morph b/x-armv7-versatile/morph
index 3fcf1ea5..3fcf1ea5 100644
--- a/x-armv7-versatile.morph
+++ b/x-armv7-versatile/morph
diff --git a/x-common.morph b/x-common/morph
index 81ca96ab..81ca96ab 100644
--- a/x-common.morph
+++ b/x-common/morph
diff --git a/x-ppc64-generic.morph b/x-ppc64-generic/morph
index ee24f566..ee24f566 100644
--- a/x-ppc64-generic.morph
+++ b/x-ppc64-generic/morph
diff --git a/x-x86_64-generic.morph b/x-x86_64-generic/morph
index c19356c7..c19356c7 100644
--- a/x-x86_64-generic.morph
+++ b/x-x86_64-generic/morph
diff --git a/xfce.morph b/xfce/morph
index 1e7a1f41..1e7a1f41 100644
--- a/xfce.morph
+++ b/xfce/morph