From 415568c94489545f0243cf7f8996ffc8f4bb4d1f Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Mon, 1 Oct 2012 14:21:17 +0000 Subject: Rename the bsp morphologies to suffixed architecture --- armv7-versatile-base-system.morph | 2 +- armv7-versatile-bsp.morph | 13 ------------- armv7-versatile-devel-system.morph | 2 +- bsp-armv7-versatile.morph | 13 +++++++++++++ bsp-x86_64-generic.morph | 25 +++++++++++++++++++++++++ x86_64-generic-base-system.morph | 2 +- x86_64-generic-bootstrap-pass3.morph | 4 ++-- x86_64-generic-bsp.morph | 25 ------------------------- x86_64-generic-devel-system.morph | 2 +- 9 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 armv7-versatile-bsp.morph create mode 100644 bsp-armv7-versatile.morph create mode 100644 bsp-x86_64-generic.morph delete mode 100644 x86_64-generic-bsp.morph diff --git a/armv7-versatile-base-system.morph b/armv7-versatile-base-system.morph index bcc606fe..2bc95c4d 100644 --- a/armv7-versatile-base-system.morph +++ b/armv7-versatile-base-system.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/armv7-versatile-bsp.morph b/armv7-versatile-bsp.morph deleted file mode 100644 index e0b5b690..00000000 --- a/armv7-versatile-bsp.morph +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "armv7-versatile-bsp", - "description": "The platform dependent components required to boot an ARM versatile development board.", - "kind": "stratum", - "chunks": [ - { - "name": "linux", - "repo": "upstream:linux", - "ref": "baserock/arm/versatile", - "build-depends": [] - } - ] -} diff --git a/armv7-versatile-devel-system.morph b/armv7-versatile-devel-system.morph index 6e107de8..1a092d4c 100644 --- a/armv7-versatile-devel-system.morph +++ b/armv7-versatile-devel-system.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/bsp-armv7-versatile.morph b/bsp-armv7-versatile.morph new file mode 100644 index 00000000..7f7e4c2c --- /dev/null +++ b/bsp-armv7-versatile.morph @@ -0,0 +1,13 @@ +{ + "name": "bsp-armv7-versatile", + "description": "The platform dependent components required to boot an ARM versatile development board.", + "kind": "stratum", + "chunks": [ + { + "name": "linux", + "repo": "upstream:linux", + "ref": "baserock/arm/versatile", + "build-depends": [] + } + ] +} diff --git a/bsp-x86_64-generic.morph b/bsp-x86_64-generic.morph new file mode 100644 index 00000000..ae5a3b07 --- /dev/null +++ b/bsp-x86_64-generic.morph @@ -0,0 +1,25 @@ +{ + "name": "bsp-x86_64-generic", + "description": "The set of platform specific components required for booting a 64-bit x86 based system.", + "kind": "stratum", + "chunks": [ + { + "name": "linux", + "repo": "upstream:linux", + "ref": "baserock/morph", + "build-depends": [] + }, + { + "name": "nasm", + "repo": "upstream:nasm", + "ref": "baserock/morph", + "build-depends": [] + }, + { + "name": "syslinux", + "repo": "upstream:syslinux", + "ref": "baserock/morph", + "build-depends": ["nasm"] + } + ] +} diff --git a/x86_64-generic-base-system.morph b/x86_64-generic-base-system.morph index 35e41bc1..3e6b4e9c 100644 --- a/x86_64-generic-base-system.morph +++ b/x86_64-generic-base-system.morph @@ -7,7 +7,7 @@ "disk-size": "2G", "strata": [ { - "morph": "x86_64-generic-bsp", + "morph": "bsp-x86_64-generic", "repo": "baserock:morphs", "ref": "master" }, diff --git a/x86_64-generic-bootstrap-pass3.morph b/x86_64-generic-bootstrap-pass3.morph index 78a5a3b5..8e1f5ec4 100644 --- a/x86_64-generic-bootstrap-pass3.morph +++ b/x86_64-generic-bootstrap-pass3.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.", + "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/x86_64-generic-bsp.morph b/x86_64-generic-bsp.morph deleted file mode 100644 index f20a7ed7..00000000 --- a/x86_64-generic-bsp.morph +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "x86_64-generic-bsp", - "description": "The set of platform specific components required for booting a 64-bit x86 based system.", - "kind": "stratum", - "chunks": [ - { - "name": "linux", - "repo": "upstream:linux", - "ref": "baserock/morph", - "build-depends": [] - }, - { - "name": "nasm", - "repo": "upstream:nasm", - "ref": "baserock/morph", - "build-depends": [] - }, - { - "name": "syslinux", - "repo": "upstream:syslinux", - "ref": "baserock/morph", - "build-depends": ["nasm"] - } - ] -} diff --git a/x86_64-generic-devel-system.morph b/x86_64-generic-devel-system.morph index bb49230b..8ec47137 100644 --- a/x86_64-generic-devel-system.morph +++ b/x86_64-generic-devel-system.morph @@ -7,7 +7,7 @@ "disk-size": "2G", "strata": [ { - "morph": "x86_64-generic-bsp", + "morph": "bsp-x86_64-generic", "repo": "baserock:morphs", "ref": "master" }, -- cgit v1.2.1