diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2012-10-01 16:07:50 +0100 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-10-01 16:07:50 +0100 |
commit | 9cbac930cc53ab3e5a9c6c61a616184fa49d3d21 (patch) | |
tree | 16ba2f5d24255bda7a121b47c8bbe47c01fd8301 | |
parent | 93379fd8939fe50b8dad59b05e8b119a414c4852 (diff) | |
parent | 6b1b8b8562a5d9f9da092c875a64a56bb4146318 (diff) | |
download | definitions-9cbac930cc53ab3e5a9c6c61a616184fa49d3d21.tar.gz |
Merge branch 'baserock/richardmaw/S4505/suffix-with-arch-instead' of git://git.baserock.org/baserock/morphs
Reviewed-By: Lars Wirzenius on IRC
-rw-r--r-- | base-system-armv7-versatile.morph (renamed from armv7-versatile-base-system.morph) | 4 | ||||
-rw-r--r-- | base-system-x86_64-generic.morph (renamed from x86_64-generic-base-system.morph) | 7 | ||||
-rw-r--r-- | bootstrap-pass3-imx53.morph (renamed from imx53-bootstrap-pass3.morph) | 2 | ||||
-rw-r--r-- | bootstrap-pass3-x86_64-generic.morph (renamed from x86_64-generic-bootstrap-pass3.morph) | 6 | ||||
-rw-r--r-- | bsp-armv7-versatile.morph (renamed from armv7-versatile-bsp.morph) | 2 | ||||
-rw-r--r-- | bsp-imx53.morph (renamed from imx53-bsp.morph) | 2 | ||||
-rw-r--r-- | bsp-x86_64-generic.morph (renamed from x86_64-generic-bsp.morph) | 2 | ||||
-rw-r--r-- | devel-system-armv7-versatile.morph (renamed from armv7-versatile-devel-system.morph) | 2 | ||||
-rw-r--r-- | devel-system-x86_64-generic.morph (renamed from x86_64-generic-devel-system.morph) | 4 |
9 files changed, 14 insertions, 17 deletions
diff --git a/armv7-versatile-base-system.morph b/base-system-armv7-versatile.morph index bcc606fe..bcd8b02c 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", @@ -7,7 +7,7 @@ "disk-size": "2G", "strata": [ { - "morph": "armv7-versatile-bsp", + "morph": "bsp-armv7-versatile", "repo": "baserock:morphs", "ref": "master" }, diff --git a/x86_64-generic-base-system.morph b/base-system-x86_64-generic.morph index 35e41bc1..4c5c6f9d 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", @@ -7,7 +7,7 @@ "disk-size": "2G", "strata": [ { - "morph": "x86_64-generic-bsp", + "morph": "bsp-x86_64-generic", "repo": "baserock:morphs", "ref": "master" }, @@ -16,8 +16,5 @@ "repo": "baserock:morphs", "ref": "master" } - ], - "test-stories": [ - "stories/login.py" ] } diff --git a/imx53-bootstrap-pass3.morph b/bootstrap-pass3-imx53.morph index 078e545e..82493aa7 100644 --- a/imx53-bootstrap-pass3.morph +++ b/bootstrap-pass3-imx53.morph @@ -1,5 +1,5 @@ { - "name": "imx53-bootstrap-pass3", + "name": "bootstrap-pass3-imx53", "description": "The set of strata that constitute the final bootstrap for the i.MX 53 ARM development board. This is a stratum rather than a system because a system image is not necessarily required to finish a bootstrap, and listing multiple strata on the command line doesn't share a staging area, so imx53-bsp fails to find what it needs from devel.", "kind": "stratum", "build-depends": [ diff --git a/x86_64-generic-bootstrap-pass3.morph b/bootstrap-pass3-x86_64-generic.morph index 78a5a3b5..538b1572 100644 --- a/x86_64-generic-bootstrap-pass3.morph +++ b/bootstrap-pass3-x86_64-generic.morph @@ -1,6 +1,6 @@ { - "name": "x86_64-generic-bootstrap-pass3", - "description": "The set of strata that constitute the final bootstrap for 64-bit x86 systems. This is a stratum rather than a system because a system image is not necessarily required to finish a bootstrap, and listing multiple strata on the command line doesn't share a staging area, so x86_64-generic-bsp fails to find what it needs from devel.", + "name": "bootstrap-pass3-x86_64-generic", + "description": "The set of strata that constitute the final bootstrap for 64-bit x86 systems. This is a stratum rather than a system because a system image is not necessarily required to finish a bootstrap, and listing multiple strata on the command line doesn't share a staging area, so bsp-x86_64-generic fails to find what it needs from devel.", "kind": "stratum", "build-depends": [ { @@ -14,7 +14,7 @@ "ref": "master" }, { - "morph": "x86_64-generic-bsp", + "morph": "bsp-x86_64-generic", "repo": "baserock:morphs", "ref": "master" } diff --git a/armv7-versatile-bsp.morph b/bsp-armv7-versatile.morph index e0b5b690..7f7e4c2c 100644 --- a/armv7-versatile-bsp.morph +++ b/bsp-armv7-versatile.morph @@ -1,5 +1,5 @@ { - "name": "armv7-versatile-bsp", + "name": "bsp-armv7-versatile", "description": "The platform dependent components required to boot an ARM versatile development board.", "kind": "stratum", "chunks": [ diff --git a/imx53-bsp.morph b/bsp-imx53.morph index 1bb73cf6..54a58f88 100644 --- a/imx53-bsp.morph +++ b/bsp-imx53.morph @@ -1,5 +1,5 @@ { - "name": "imx53-bsp", + "name": "bsp-imx53", "description": "The platform dependent components required to boot an i.MX 53 ARM development board.", "kind": "stratum", "chunks": [ diff --git a/x86_64-generic-bsp.morph b/bsp-x86_64-generic.morph index f20a7ed7..ae5a3b07 100644 --- a/x86_64-generic-bsp.morph +++ b/bsp-x86_64-generic.morph @@ -1,5 +1,5 @@ { - "name": "x86_64-generic-bsp", + "name": "bsp-x86_64-generic", "description": "The set of platform specific components required for booting a 64-bit x86 based system.", "kind": "stratum", "chunks": [ diff --git a/armv7-versatile-devel-system.morph b/devel-system-armv7-versatile.morph index 6e107de8..1a092d4c 100644 --- a/armv7-versatile-devel-system.morph +++ b/devel-system-armv7-versatile.morph @@ -7,7 +7,7 @@ "disk-size": "2G", "strata": [ { - "morph": "armv7-versatile-bsp", + "morph": "bsp-armv7-versatile", "repo": "baserock:morphs", "ref": "master" }, diff --git a/x86_64-generic-devel-system.morph b/devel-system-x86_64-generic.morph index bb49230b..09b322c2 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", @@ -7,7 +7,7 @@ "disk-size": "2G", "strata": [ { - "morph": "x86_64-generic-bsp", + "morph": "bsp-x86_64-generic", "repo": "baserock:morphs", "ref": "master" }, |