From efe5807433bb576bbba4312d2e3d150ed6f7e1a4 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Fri, 20 Feb 2015 15:31:53 +0000
Subject: Remove 'generic' from SDK system names

They are long enough anyway.
---
 clusters/sdk-example-cluster.morph                     |  4 ++--
 ...rmv7lhf-cross-toolchain-system-x86_32-generic.morph | 18 ------------------
 ...rmv7lhf-cross-toolchain-system-x86_64-generic.morph | 18 ------------------
 3 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph
 delete mode 100644 systems/armv7lhf-cross-toolchain-system-x86_64-generic.morph

diff --git a/clusters/sdk-example-cluster.morph b/clusters/sdk-example-cluster.morph
index f71d093d..92e4a413 100644
--- a/clusters/sdk-example-cluster.morph
+++ b/clusters/sdk-example-cluster.morph
@@ -31,11 +31,11 @@ description: |
 
   See the documentation of the sdk.write extension for more information.
 systems:
-- morph: systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph
+- morph: systems/armv7lhf-cross-toolchain-system-x86_64.morph
   deploy:
     sdk:
       type: sdk
-      location: armv7lhf-cross-toolchain-system-x86_32-generic.sh
+      location: armv7lhf-cross-toolchain-system-x86_64.sh
       PREFIX: /usr
       TARGET: armv7lhf-baserock-linux-gnueabi
   subsystems:
diff --git a/systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph b/systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph
deleted file mode 100644
index e983ba7a..00000000
--- a/systems/armv7lhf-cross-toolchain-system-x86_32-generic.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-name: armv7lhf-cross-toolchain-system-x86_32-generic
-kind: system
-description: A system that contains an ARM cross compiler, intended to be used as
-  a sysroot.
-arch: x86_32
-strata:
-- name: build-essential
-  morph: strata/build-essential.morph
-- name: armv7lhf-cross-toolchain
-  morph: strata/armv7lhf-cross-toolchain.morph
-- name: cross-tools
-  morph: strata/cross-tools.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
diff --git a/systems/armv7lhf-cross-toolchain-system-x86_64-generic.morph b/systems/armv7lhf-cross-toolchain-system-x86_64-generic.morph
deleted file mode 100644
index 1a8c20bb..00000000
--- a/systems/armv7lhf-cross-toolchain-system-x86_64-generic.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-name: armv7lhf-cross-toolchain-system-x86_64-generic
-kind: system
-description: A system that contains an ARM cross compiler, intended to be used as
-  a sysroot.
-arch: x86_64
-strata:
-- name: build-essential
-  morph: strata/build-essential.morph
-- name: armv7lhf-cross-toolchain
-  morph: strata/armv7lhf-cross-toolchain.morph
-- name: cross-tools
-  morph: strata/cross-tools.morph
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-- 
cgit v1.2.1