Merge remote-tracking branch 'remotes/origin/jonathan/remove-system-kind'

16 files changed, 0 insertions, 32 deletions

diff --git a/base-system-armv7-highbank.morph b/base-system-armv7-highbank.morph
index 8df8b48f..a317f6a0 100644
--- a/base-system-armv7-highbank.morph
+++ b/base-system-armv7-highbank.morph
@@ -2,9 +2,7 @@ name: base-system-armv7-highbank
 description: The set of strata required to have a minimal system for an ARM highbank
   system.
 kind: system
-system-kind: rootfs-tarball
 arch: armv7
-disk-size: 2G
 strata:
 - morph: build-essential
   repo: baserock:baserock/morphs
diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph
index 6600cc61..b64845fb 100644
--- a/base-system-armv7-versatile.morph
+++ b/base-system-armv7-versatile.morph
@@ -2,9 +2,7 @@ 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
 arch: armv7
-disk-size: 2G
 strata:
 - morph: build-essential
   repo: baserock:baserock/morphs
diff --git a/base-system-armv7b-highbank.morph b/base-system-armv7b-highbank.morph
index b3334210..ce86b415 100644
--- a/base-system-armv7b-highbank.morph
+++ b/base-system-armv7b-highbank.morph
@@ -2,9 +2,7 @@ name: base-system-armv7b-highbank
 description: The set of strata required to have a minimal system for an ARM highbank
   system.
 kind: system
-system-kind: rootfs-tarball
 arch: armv7b
-disk-size: 2G
 strata:
 - morph: build-essential
   repo: baserock:baserock/morphs
diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph
index 8d9bc001..643ec94e 100644
--- a/base-system-x86_32-generic.morph
+++ b/base-system-x86_32-generic.morph
@@ -2,9 +2,7 @@ name: base-system-x86_32-generic
 description: The set of strata required to have a minimal system for a 32-bit x86
   system.
 kind: system
-system-kind: rootfs-tarball
 arch: x86_32
-disk-size: 2G
 strata:
 - morph: build-essential
   repo: baserock:baserock/morphs
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index 2cb06f9b..89e7f397 100644
--- a/base-system-x86_64-generic.morph
+++ b/base-system-x86_64-generic.morph
@@ -2,9 +2,7 @@ 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: rootfs-tarball
 arch: x86_64
-disk-size: 2G
 strata:
 - morph: build-essential
   repo: baserock:baserock/morphs
diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph
index b1b3127f..ed28417f 100644
--- a/devel-system-armv7-highbank.morph
+++ b/devel-system-armv7-highbank.morph
@@ -2,9 +2,7 @@ name: devel-system-armv7-highbank
 description: A system that is able to build other systems based on the ARM highbank
   architecture.
 kind: system
-system-kind: rootfs-tarball
 arch: armv7
-disk-size: 2G
 strata:
 - morph: build-essential
   repo: baserock:baserock/morphs
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
index 913f8fc3..89734239 100644
--- a/devel-system-armv7-versatile.morph
+++ b/devel-system-armv7-versatile.morph
@@ -2,9 +2,7 @@ name: devel-system-armv7-versatile
 description: A system that is able to build other systems based on the ARM versatile
   architecture.
 kind: system
-system-kind: rootfs-tarball
 arch: armv7
-disk-size: 2G
 strata:
 - morph: build-essential
   repo: baserock:baserock/morphs
diff --git a/devel-system-armv7b-highbank.morph b/devel-system-armv7b-highbank.morph
index 736fadf8..39927403 100644
--- a/devel-system-armv7b-highbank.morph
+++ b/devel-system-armv7b-highbank.morph
@@ -2,9 +2,7 @@ name: devel-system-armv7b-highbank
 description: A system that is able to build other systems based on the ARM highbank
   architecture.
 kind: system
-system-kind: rootfs-tarball
 arch: armv7b
-disk-size: 2G
 strata:
 - morph: build-essential
   repo: baserock:baserock/morphs
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index a8c9e12e..4ee93880 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -2,9 +2,7 @@ name: devel-system-x86_32-generic
 description: A system that is able to build other systems based on the 32-bit x86
   architecture.
 kind: system
-system-kind: rootfs-tarball
 arch: x86_32
-disk-size: 2G
 strata:
 - morph: build-essential
   repo: baserock:baserock/morphs
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index 28ad9e35..3c66d0c1 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -2,9 +2,7 @@ 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: rootfs-tarball
 arch: x86_64
-disk-size: 2G
 strata:
 - morph: build-essential
   repo: baserock:baserock/morphs
diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7-versatile.morph
index 78d67b95..b9fa2f86 100644
--- a/genivi-baseline-system-armv7-versatile.morph
+++ b/genivi-baseline-system-armv7-versatile.morph
@@ -1,9 +1,7 @@
 name: genivi-baseline-system-armv7-versatile
 description: A GENIVI baseline system for an ARMv7 system.
 kind: system
-system-kind: rootfs-tarball
 arch: armv7
-disk-size: 2G
 strata:
 - morph: build-essential
   repo: baserock:baserock/morphs
diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph
index be46a445..f95af5e4 100644
--- a/genivi-baseline-system-x86_64-generic.morph
+++ b/genivi-baseline-system-x86_64-generic.morph
@@ -1,9 +1,7 @@
 name: genivi-baseline-system-x86_64-generic
 description: A GENIVI baseline system for a 64-bit x86 system.
 kind: system
-system-kind: rootfs-tarball
 arch: x86_64
-disk-size: 2G
 strata:
 - morph: build-essential
   repo: baserock:baserock/morphs
diff --git a/genivi-devel-system-armv7-versatile.morph b/genivi-devel-system-armv7-versatile.morph
index 81489d8f..e7fb2594 100644
--- a/genivi-devel-system-armv7-versatile.morph
+++ b/genivi-devel-system-armv7-versatile.morph
@@ -1,9 +1,7 @@
 name: genivi-devel-system-armv7-versatile
 description: A GENIVI baseline system for an ARMv7 system.
 kind: system
-system-kind: rootfs-tarball
 arch: armv7
-disk-size: 2G
 strata:
 - morph: build-essential
   repo: baserock:baserock/morphs
diff --git a/genivi-devel-system-x86_64-generic.morph b/genivi-devel-system-x86_64-generic.morph
index 8fba0bb8..cbfdb73c 100644
--- a/genivi-devel-system-x86_64-generic.morph
+++ b/genivi-devel-system-x86_64-generic.morph
@@ -1,9 +1,7 @@
 name: genivi-devel-system-x86_64-generic
 description: A GENIVI baseline system for a 64-bit x86 system.
 kind: system
-system-kind: rootfs-tarball
 arch: x86_64
-disk-size: 2G
 strata:
 - morph: build-essential
   repo: baserock:baserock/morphs
diff --git a/qt4-devel-system-x86_64-generic.morph b/qt4-devel-system-x86_64-generic.morph
index 5a2ce620..4183c784 100644
--- a/qt4-devel-system-x86_64-generic.morph
+++ b/qt4-devel-system-x86_64-generic.morph
@@ -2,9 +2,7 @@ name: qt4-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: rootfs-tarball
 arch: x86_64
-disk-size: 4G
 strata:
 - morph: build-essential
   repo: baserock:baserock/morphs
diff --git a/qt5-devel-system-x86_64-generic.morph b/qt5-devel-system-x86_64-generic.morph
index 58207b45..97b1d85f 100644
--- a/qt5-devel-system-x86_64-generic.morph
+++ b/qt5-devel-system-x86_64-generic.morph
@@ -2,9 +2,7 @@ name: qt5-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: rootfs-tarball
 arch: x86_64
-disk-size: 2G
 strata:
 - morph: build-essential
   repo: baserock:baserock/morphs