summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-10-01 14:37:24 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2012-10-01 14:42:09 +0000
commit0cab0856f50a4ffb00869f29a5ef981fe74a76f2 (patch)
treeba658bd0c99078b6849e80cfa40f7f6f51a4455a
parent415568c94489545f0243cf7f8996ffc8f4bb4d1f (diff)
downloadmorphs-0cab0856f50a4ffb00869f29a5ef981fe74a76f2.tar.gz
Rename more commonly used system morphologies
-rw-r--r--base-system-armv7-versatile.morph (renamed from armv7-versatile-base-system.morph)2
-rw-r--r--base-system-x86_64-generic.morph (renamed from x86_64-generic-base-system.morph)5
-rw-r--r--devel-system-armv7-versatile.morph (renamed from armv7-versatile-devel-system.morph)0
-rw-r--r--devel-system-x86_64-generic.morph (renamed from x86_64-generic-devel-system.morph)2
4 files changed, 3 insertions, 6 deletions
diff --git a/armv7-versatile-base-system.morph b/base-system-armv7-versatile.morph
index 2bc95c4..bcd8b02 100644
--- a/armv7-versatile-base-system.morph
+++ b/base-system-armv7-versatile.morph
@@ -1,5 +1,5 @@
{
- "name": "arm-versatile-base-system",
+ "name": "base-system-armv7-versatile",
"description": "The set of strata required to have a minimal system for an ARM versatile system.",
"kind": "system",
"system-kind": "rootfs-tarball",
diff --git a/x86_64-generic-base-system.morph b/base-system-x86_64-generic.morph
index 3e6b4e9..4c5c6f9 100644
--- a/x86_64-generic-base-system.morph
+++ b/base-system-x86_64-generic.morph
@@ -1,5 +1,5 @@
{
- "name": "x86_64-generic-base-system",
+ "name": "base-system-x86_64-generic",
"description": "The set of strata required to have a minimal system for a 64-bit x86 system.",
"kind": "system",
"system-kind": "syslinux-disk",
@@ -16,8 +16,5 @@
"repo": "baserock:morphs",
"ref": "master"
}
- ],
- "test-stories": [
- "stories/login.py"
]
}
diff --git a/armv7-versatile-devel-system.morph b/devel-system-armv7-versatile.morph
index 1a092d4..1a092d4 100644
--- a/armv7-versatile-devel-system.morph
+++ b/devel-system-armv7-versatile.morph
diff --git a/x86_64-generic-devel-system.morph b/devel-system-x86_64-generic.morph
index 8ec4713..09b322c 100644
--- a/x86_64-generic-devel-system.morph
+++ b/devel-system-x86_64-generic.morph
@@ -1,5 +1,5 @@
{
- "name": "x86_64-generic-devel-system",
+ "name": "devel-system-x86_64-generic",
"description": "A system that is able to build other systems based on the 64-bit x86 architecture.",
"kind": "system",
"system-kind": "syslinux-disk",