Replace JSON morphologies with YAML.

48 files changed, 2704 insertions, 4262 deletions

diff --git a/audio-bluetooth.morph b/audio-bluetooth.morph
index 69b0472..0c89cba 100644
--- a/audio-bluetooth.morph
+++ b/audio-bluetooth.morph
@@ -1,128 +1,84 @@
-{
-    "name": "audio-bluetooth",
-    "description": "Components required for audio and bluetooth.",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "libatomic_ops",
-            "repo": "upstream:libatomic_ops",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "alsa-lib",
-            "repo": "upstream:alsa-lib",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "alsa-utils",
-            "repo": "upstream:alsa-utils",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "alsa-lib"
-            ]
-        },
-        {
-            "name": "bluez",
-            "repo": "upstream:bluez",
-            "ref": "baserock/genivi/baseline",
-            "build-depends": [
-                "alsa-lib"
-            ]
-        },
-        {
-            "name": "bluez-tools",
-            "repo": "upstream:bluez-tools",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "libical",
-            "repo": "upstream:libical",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "obexd",
-            "repo": "upstream:obexd",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "bluez",
-                "libical"
-            ]
-        },
-        {
-            "name": "speex",
-            "repo": "upstream:speex",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "nohands",
-            "repo": "upstream:nohands",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "bluez",
-                "speex"
-            ]
-        },
-        {
-            "name": "mobile-broadband-provider-info",
-            "repo": "upstream:mobile-broadband-provider-info",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "ofono",
-            "repo": "upstream:ofono",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "mobile-broadband-provider-info",
-                "bluez"
-            ]
-        },
-        {
-            "name": "json-c",
-            "repo": "upstream:json-c",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "libsndfile",
-            "repo": "upstream:libsndfile",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "pulseaudio",
-            "repo": "upstream:pulseaudio",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "libsndfile",
-                "libatomic_ops",
-                "speex",
-                "json-c",
-                "alsa-lib",
-                "bluez"
-            ]
-        }
-    ]
-}
+name: audio-bluetooth
+description: Components required for audio and bluetooth.
+kind: stratum
+build-depends:
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
+chunks:
+- name: libatomic_ops
+  repo: upstream:libatomic_ops
+  ref: baserock/morph
+  build-depends: []
+- name: alsa-lib
+  repo: upstream:alsa-lib
+  ref: baserock/morph
+  build-depends: []
+- name: alsa-utils
+  repo: upstream:alsa-utils
+  ref: baserock/morph
+  build-depends:
+  - alsa-lib
+- name: bluez
+  repo: upstream:bluez
+  ref: baserock/genivi/baseline
+  build-depends:
+  - alsa-lib
+- name: bluez-tools
+  repo: upstream:bluez-tools
+  ref: baserock/morph
+  build-depends: []
+- name: libical
+  repo: upstream:libical
+  ref: baserock/morph
+  build-depends: []
+- name: obexd
+  repo: upstream:obexd
+  ref: baserock/morph
+  build-depends:
+  - bluez
+  - libical
+- name: speex
+  repo: upstream:speex
+  ref: baserock/morph
+  build-depends: []
+- name: nohands
+  repo: upstream:nohands
+  ref: baserock/morph
+  build-depends:
+  - bluez
+  - speex
+- name: mobile-broadband-provider-info
+  repo: upstream:mobile-broadband-provider-info
+  ref: baserock/morph
+  build-depends: []
+- name: ofono
+  repo: upstream:ofono
+  ref: baserock/morph
+  build-depends:
+  - mobile-broadband-provider-info
+  - bluez
+- name: json-c
+  repo: upstream:json-c
+  ref: baserock/morph
+  build-depends: []
+- name: libsndfile
+  repo: upstream:libsndfile
+  ref: baserock/morph
+  build-depends: []
+- name: pulseaudio
+  repo: upstream:pulseaudio
+  ref: baserock/morph
+  build-depends:
+  - libsndfile
+  - libatomic_ops
+  - speex
+  - json-c
+  - alsa-lib
+  - bluez
diff --git a/base-system-armv7-highbank.morph b/base-system-armv7-highbank.morph
index bb9cc5b..8df8b48 100644
--- a/base-system-armv7-highbank.morph
+++ b/base-system-armv7-highbank.morph
@@ -1,38 +1,27 @@
-{
-    "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",
-            "ref": "master"
-        },
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "bsp-armv7-highbank",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "configuration-extensions": [
-        "set-hostname",
-        "ssh",
-        "add-config-files",
-	"simple-network",
-	"nfsboot",
-	"install-files"
-    ]
-}
+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
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-armv7-highbank
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph
index 759d884..6600cc6 100644
--- a/base-system-armv7-versatile.morph
+++ b/base-system-armv7-versatile.morph
@@ -1,38 +1,27 @@
-{
-    "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",
-            "ref": "master"
-        },
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "bsp-armv7-versatile",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "configuration-extensions": [
-        "set-hostname",
-        "ssh",
-        "add-config-files",
-	"simple-network",
-	"nfsboot",
-	"install-files"
-    ]
-}
+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
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-armv7-versatile
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/base-system-armv7b-highbank.morph b/base-system-armv7b-highbank.morph
index df5d5bb..b333421 100644
--- a/base-system-armv7b-highbank.morph
+++ b/base-system-armv7b-highbank.morph
@@ -1,38 +1,27 @@
-{
-    "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",
-            "ref": "master"
-        },
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "bsp-armv7b-highbank",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "configuration-extensions": [
-        "set-hostname",
-        "ssh",
-        "add-config-files",
-	"simple-network",
-	"nfsboot",
-	"install-files"
-    ]
-}
+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
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-armv7b-highbank
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph
index 31d84b3..8d9bc00 100644
--- a/base-system-x86_32-generic.morph
+++ b/base-system-x86_32-generic.morph
@@ -1,38 +1,27 @@
-{
-    "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",
-            "ref": "master"
-        },
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "bsp-x86_32-generic",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "configuration-extensions": [
-        "set-hostname",
-        "ssh",
-        "add-config-files",
-	"simple-network",
-	"nfsboot",
-	"install-files"
-    ]
-}
+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
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-x86_32-generic
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index 0479304..2cb06f9 100644
--- a/base-system-x86_64-generic.morph
+++ b/base-system-x86_64-generic.morph
@@ -1,38 +1,27 @@
-{
-    "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",
-            "ref": "master"
-        },
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "bsp-x86_64-generic",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "configuration-extensions": [
-        "set-hostname",
-        "ssh",
-        "add-config-files",
-	"simple-network",
-	"nfsboot",
-	"install-files"
-    ]
-}
+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
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/bsp-armv7-highbank.morph b/bsp-armv7-highbank.morph
index 1a49c68..a3eaf2d 100644
--- a/bsp-armv7-highbank.morph
+++ b/bsp-armv7-highbank.morph
@@ -1,20 +1,12 @@
-{
-    "name": "bsp-armv7-highbank",
-    "description": "The platform dependent components required to boot an ARM highbank board.",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "core"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "linux",
-            "repo": "upstream:linux",
-            "ref": "baserock/arm/highbank",
-            "build-depends": []
-        }
-    ]
-}
+name: bsp-armv7-highbank
+description: The platform dependent components required to boot an ARM highbank board.
+kind: stratum
+build-depends:
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: core
+chunks:
+- name: linux
+  repo: upstream:linux
+  ref: baserock/arm/highbank
+  build-depends: []
diff --git a/bsp-armv7-versatile.morph b/bsp-armv7-versatile.morph
index 6f5e4a1..5b2afde 100644
--- a/bsp-armv7-versatile.morph
+++ b/bsp-armv7-versatile.morph
@@ -1,20 +1,13 @@
-{
-    "name": "bsp-armv7-versatile",
-    "description": "The platform dependent components required to boot an ARM versatile development board.",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "core"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "linux",
-            "repo": "upstream:linux",
-            "ref": "baserock/arm/versatile",
-            "build-depends": []
-        }
-    ]
-}
+name: bsp-armv7-versatile
+description: The platform dependent components required to boot an ARM versatile development
+  board.
+kind: stratum
+build-depends:
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: core
+chunks:
+- name: linux
+  repo: upstream:linux
+  ref: baserock/arm/versatile
+  build-depends: []
diff --git a/bsp-armv7b-highbank.morph b/bsp-armv7b-highbank.morph
index f4231e9..0a921f9 100644
--- a/bsp-armv7b-highbank.morph
+++ b/bsp-armv7b-highbank.morph
@@ -1,20 +1,12 @@
-{
-    "name": "bsp-armv7b-highbank",
-    "description": "The platform dependent components required to boot an ARM highbank board.",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "core"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "linux",
-            "repo": "upstream:linux",
-            "ref": "baserock/arm/highbank-be",
-            "build-depends": []
-        }
-    ]
-}
+name: bsp-armv7b-highbank
+description: The platform dependent components required to boot an ARM highbank board.
+kind: stratum
+build-depends:
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: core
+chunks:
+- name: linux
+  repo: upstream:linux
+  ref: baserock/arm/highbank-be
+  build-depends: []
diff --git a/bsp-imx53.morph b/bsp-imx53.morph
index d8c668d..99dc3ff 100644
--- a/bsp-imx53.morph
+++ b/bsp-imx53.morph
@@ -1,20 +1,13 @@
-{
-    "name": "bsp-imx53",
-    "description": "The platform dependent components required to boot an i.MX 53 ARM development board.",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "core"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "linux",
-            "repo": "upstream:linux",
-            "ref": "baserock/morph",
-            "build-depends": []
-        }
-    ]
-}
+name: bsp-imx53
+description: The platform dependent components required to boot an i.MX 53 ARM development
+  board.
+kind: stratum
+build-depends:
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: core
+chunks:
+- name: linux
+  repo: upstream:linux
+  ref: baserock/morph
+  build-depends: []
diff --git a/bsp-x86_32-generic.morph b/bsp-x86_32-generic.morph
index bd52755..536c3ff 100644
--- a/bsp-x86_32-generic.morph
+++ b/bsp-x86_32-generic.morph
@@ -1,34 +1,22 @@
-{
-    "name": "bsp-x86_32-generic",
-    "description": "The set of platform specific components required for booting a 32-bit x86 based system.",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "core"
-        }
-    ],
-    "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"
-            ]
-        }
-    ]
-}
+name: bsp-x86_32-generic
+description: The set of platform specific components required for booting a 32-bit
+  x86 based system.
+kind: stratum
+build-depends:
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: core
+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/bsp-x86_64-generic.morph b/bsp-x86_64-generic.morph
index b984a13..4f2ad85 100644
--- a/bsp-x86_64-generic.morph
+++ b/bsp-x86_64-generic.morph
@@ -1,34 +1,22 @@
-{
-    "name": "bsp-x86_64-generic",
-    "description": "The set of platform specific components required for booting a 64-bit x86 based system.",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "core"
-        }
-    ],
-    "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"
-            ]
-        }
-    ]
-}
+name: bsp-x86_64-generic
+description: The set of platform specific components required for booting a 64-bit
+  x86 based system.
+kind: stratum
+build-depends:
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: core
+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/build-essential.morph b/build-essential.morph
index bd8859d..f4708e3 100644
--- a/build-essential.morph
+++ b/build-essential.morph
@@ -1,297 +1,287 @@
-{
-    "name": "build-essential",
-    "description": "Toolchain stratum",
-    "kind": "stratum",
-    "chunks": [
-        {
-            "name": "stage1-binutils",
-            "repo": "upstream:binutils-redhat",
-            "ref": "baserock/build-essential",
-            "build-mode": "bootstrap",
-            "prefix": "/tools",
-            "build-depends": []
-        },
-        {
-            "name": "stage1-gcc",
-            "repo": "upstream:gcc-tarball",
-            "ref": "baserock/build-essential",
-            "build-mode": "bootstrap",
-            "prefix": "/tools",
-            "build-depends": [
-                "stage1-binutils"
-            ]
-        },
-        {
-            "name": "stage2-linux-api-headers",
-            "repo": "upstream:linux",
-            "ref": "baserock/build-essential",
-            "build-mode": "bootstrap",
-            "prefix": "/tools",
-            "build-depends": [
-                "stage1-binutils",
-                "stage1-gcc"
-            ]
-        },
-        {
-            "name": "stage2-eglibc",
-            "repo": "upstream:eglibc2",
-            "ref": "baserock/2.15-build-essential",
-            "build-mode": "bootstrap",
-            "prefix": "/tools",
-            "build-depends": [
-                "stage1-binutils",
-                "stage1-gcc",
-                "stage2-linux-api-headers"
-            ]
-        },
-        {
-            "name": "stage2-binutils",
-            "repo": "upstream:binutils-redhat",
-            "ref": "baserock/build-essential",
-            "build-mode": "bootstrap",
-            "prefix": "/tools",
-            "build-depends": [
-                "stage1-binutils",
-                "stage1-gcc",
-                "stage2-eglibc"
-            ]
-        },
-        {
-            "name": "stage2-gcc",
-            "repo": "upstream:gcc-tarball",
-            "ref": "baserock/build-essential",
-            "build-mode": "bootstrap",
-            "prefix": "/tools",
-            "build-depends": [
-                "stage1-binutils",
-                "stage1-gcc",
-                "stage2-eglibc"
-            ]
-        },
-        {
-            "name": "stage2-busybox",
-            "repo": "upstream:busybox",
-            "ref": "baserock/build-essential",
-            "build-mode": "bootstrap",
-            "prefix": "/tools",
-            "build-depends": [
-                "stage1-binutils",
-                "stage1-gcc",
-                "stage2-eglibc"
-            ]
-        },
-        {
-            "name": "stage2-fhs-dirs",
-            "repo": "baserock:baserock/fhs-dirs",
-            "ref": "master",
-            "build-mode": "bootstrap",
-            "prefix": "/tools",
-            "build-depends": []
-        },
-        {
-            "name": "stage2-gawk",
-            "repo": "upstream:gawk",
-            "ref": "baserock/build-essential",
-            "build-mode": "bootstrap",
-            "prefix": "/tools",
-            "build-depends": [
-                "stage1-binutils",
-                "stage1-gcc",
-                "stage2-eglibc"
-            ]
-        },
-        {
-            "name": "stage2-make",
-            "repo": "upstream:make",
-            "ref": "baserock/build-essential",
-            "build-mode": "bootstrap",
-            "prefix": "/tools",
-            "build-depends": [
-                "stage1-binutils",
-                "stage1-gcc",
-                "stage2-eglibc"
-            ]
-        },
-        {
-            "name": "fhs-dirs",
-            "repo": "baserock:baserock/fhs-dirs",
-            "ref": "master",
-            "build-mode": "staging",
-            "prefix": "/usr",
-            "build-depends": [
-                "stage2-binutils",
-                "stage2-busybox",
-                "stage2-eglibc",
-                "stage2-fhs-dirs",
-                "stage2-gawk",
-                "stage2-gcc",
-                "stage2-linux-api-headers",
-                "stage2-make"
-            ]
-        },
-        {
-            "name": "linux-api-headers",
-            "repo": "upstream:linux",
-            "ref": "baserock/build-essential",
-            "build-mode": "staging",
-            "prefix": "/usr",
-            "build-depends": [
-                "stage2-binutils",
-                "stage2-busybox",
-                "stage2-eglibc",
-                "stage2-fhs-dirs",
-                "stage2-gawk",
-                "stage2-gcc",
-                "stage2-linux-api-headers",
-                "stage2-make"
-            ]
-        },
-        {
-            "name": "eglibc",
-            "repo": "upstream:eglibc2",
-            "ref": "baserock/2.15-build-essential",
-            "build-mode": "staging",
-            "prefix": "/usr",
-            "build-depends": [
-                "stage2-binutils",
-                "stage2-busybox",
-                "stage2-eglibc",
-                "stage2-fhs-dirs",
-                "stage2-gawk",
-                "stage2-gcc",
-                "stage2-linux-api-headers",
-                "stage2-make",
-                "linux-api-headers"
-            ]
-        },
-        {
-            "name": "zlib",
-            "repo": "upstream:zlib",
-            "ref": "baserock/build-essential",
-            "build-mode": "staging",
-            "prefix": "/usr",
-            "build-depends": [
-                "stage2-binutils",
-                "stage2-busybox",
-                "stage2-eglibc",
-                "stage2-fhs-dirs",
-                "stage2-gawk",
-                "stage2-gcc",
-                "stage2-linux-api-headers",
-                "stage2-make",
-                "eglibc"
-            ]
-        },
-        {
-            "name": "binutils",
-            "repo": "upstream:binutils-redhat",
-            "ref": "baserock/build-essential",
-            "build-mode": "staging",
-            "prefix": "/usr",
-            "build-depends": [
-                "stage2-binutils",
-                "stage2-busybox",
-                "stage2-eglibc",
-                "stage2-fhs-dirs",
-                "stage2-gawk",
-                "stage2-gcc",
-                "stage2-linux-api-headers",
-                "stage2-make",
-                "eglibc",
-                "zlib"
-            ]
-        },
-        {
-            "name": "busybox",
-            "repo": "upstream:busybox",
-            "ref": "baserock/build-essential",
-            "build-mode": "staging",
-            "prefix": "/usr",
-            "build-depends": [
-                "stage2-binutils",
-                "stage2-busybox",
-                "stage2-eglibc",
-                "stage2-fhs-dirs",
-                "stage2-gawk",
-                "stage2-gcc",
-                "stage2-linux-api-headers",
-                "stage2-make",
-                "eglibc"
-            ]
-        },
-        {
-            "name": "gawk",
-            "repo": "upstream:gawk",
-            "ref": "baserock/build-essential",
-            "build-mode": "staging",
-            "prefix": "/usr",
-            "build-depends": [
-                "stage2-binutils",
-                "stage2-busybox",
-                "stage2-eglibc",
-                "stage2-fhs-dirs",
-                "stage2-gawk",
-                "stage2-gcc",
-                "stage2-linux-api-headers",
-                "stage2-make",
-                "eglibc"
-            ]
-        },
-        {
-            "name": "gcc",
-            "repo": "upstream:gcc-tarball",
-            "ref": "baserock/build-essential",
-            "build-mode": "staging",
-            "prefix": "/usr",
-            "build-depends": [
-                "stage2-binutils",
-                "stage2-busybox",
-                "stage2-eglibc",
-                "stage2-fhs-dirs",
-                "stage2-gawk",
-                "stage2-gcc",
-                "stage2-linux-api-headers",
-                "stage2-make",
-                "eglibc",
-                "zlib"
-            ]
-        },
-        {
-            "name": "make",
-            "repo": "upstream:make",
-            "ref": "baserock/build-essential",
-            "build-mode": "staging",
-            "prefix": "/usr",
-            "build-depends": [
-                "stage2-binutils",
-                "stage2-busybox",
-                "stage2-eglibc",
-                "stage2-fhs-dirs",
-                "stage2-gawk",
-                "stage2-gcc",
-                "stage2-linux-api-headers",
-                "stage2-make",
-                "eglibc"
-            ]
-        },
-        {
-            "name": "ccache",
-            "repo": "upstream:ccache",
-            "ref": "baserock/build-essential",
-            "build-mode": "staging",
-            "prefix": "/usr",
-            "build-depends": [
-                "stage2-binutils",
-                "stage2-busybox",
-                "stage2-eglibc",
-                "stage2-fhs-dirs",
-                "stage2-gawk",
-                "stage2-gcc",
-                "stage2-linux-api-headers",
-                "stage2-make",
-                "eglibc",
-                "zlib"
-            ]
-        }
-    ]
-}
+name: build-essential
+description: Toolchain stratum
+kind: stratum
+
+chunks:
+    # Stage 1: build a minimal cross compiler with the host's tools.
+    #
+    # Starting with a cross compiler ensures that (a) nothing from the host
+    # can leak into the build-essential artifacts, and (b) cross-compiling
+    # build-essential is fully tested and supported, since we always use the
+    # cross code paths.
+
+    - name: stage1-binutils
+      repo: upstream:binutils-redhat
+      ref: baserock/build-essential
+      build-mode: bootstrap
+      prefix: /tools
+      build-depends: []
+
+    - name: stage1-gcc
+      repo: upstream:gcc-tarball
+      ref: baserock/build-essential
+      build-mode: bootstrap
+      prefix: /tools
+      build-depends:
+          - stage1-binutils
+
+    # Stage 2: cross-build the whole of build-essential, using the host's tools
+    # but the cross-compiler toolchain.
+    #
+    # Stage 2 GCC outputs code for the same 'bootstrap' machine as stage 1 GCC,
+    # but because stage 2 GCC is also built to *run* on the bootstrap machine
+    # it can only execute inside the stage 3 chroot (due to being built against
+    # a libc with a non-standard prefix).
+
+    - name: stage2-linux-api-headers
+      repo: upstream:linux
+      ref: baserock/build-essential
+      build-mode: bootstrap
+      prefix: /tools
+      build-depends:
+          - stage1-binutils
+          - stage1-gcc
+
+    - name: stage2-eglibc
+      repo: upstream:eglibc2
+      ref: baserock/2.15-build-essential
+      build-mode: bootstrap
+      prefix: /tools
+      build-depends:
+          - stage1-binutils
+          - stage1-gcc
+          - stage2-linux-api-headers
+
+    - name: stage2-binutils
+      repo: upstream:binutils-redhat
+      ref: baserock/build-essential
+      build-mode: bootstrap
+      prefix: /tools
+      build-depends:
+          - stage1-binutils
+          - stage1-gcc
+          - stage2-eglibc
+
+    - name: stage2-gcc
+      repo: upstream:gcc-tarball
+      ref: baserock/build-essential
+      build-mode: bootstrap
+      prefix: /tools
+      build-depends:
+          - stage1-binutils
+          - stage1-gcc
+          - stage2-eglibc
+
+    - name: stage2-busybox
+      repo: upstream:busybox
+      ref: baserock/build-essential
+      build-mode: bootstrap
+      prefix: /tools
+      build-depends:
+          - stage1-binutils
+          - stage1-gcc
+          - stage2-eglibc
+
+    - name: stage2-fhs-dirs
+      repo: baserock:baserock/fhs-dirs
+      ref: master
+      build-mode: bootstrap
+      prefix: /tools
+      build-depends: []
+
+    - name: stage2-gawk
+      repo: upstream:gawk
+      ref: baserock/build-essential
+      build-mode: bootstrap
+      prefix: /tools
+      build-depends:
+          - stage1-binutils
+          - stage1-gcc
+          - stage2-eglibc
+
+    - name: stage2-make
+      repo: upstream:make
+      ref: baserock/build-essential
+      build-mode: bootstrap
+      prefix: /tools
+      build-depends:
+          - stage1-binutils
+          - stage1-gcc
+          - stage2-eglibc
+
+    # Stage 3: build the whole of build-essential again, this time using a
+    # staging area containing only the output of stage 2. The result of this
+    # build is fully reproducible.
+    #
+    # We do a switch-a-roo between stage 2 and 3: stages 2 chunks are all built
+    # to run on a host *-bootstrap-* while stage 3 chunks are native-built for
+    # a *-baserock-* machine. This works, because the cross build was all for
+    # show (and cleanliness) and the binaries actually still run on the host.
+    #
+    # After build-essential is built we do another trick. See
+    # stage2-fhs-dirs.morph for details. Basically, /bin is a symlink to
+    # /tools/bin during stage 2 but in stage 3 it becomes a real directory
+    # again.
+
+    - name: fhs-dirs
+      repo: baserock:baserock/fhs-dirs
+      ref: master
+      build-mode: staging
+      prefix: /usr
+      build-depends:
+          - stage2-binutils
+          - stage2-busybox
+          - stage2-eglibc
+          - stage2-fhs-dirs
+          - stage2-gawk
+          - stage2-gcc
+          - stage2-linux-api-headers
+          - stage2-make
+
+    - name: linux-api-headers
+      repo: upstream:linux
+      ref: baserock/build-essential
+      build-mode: staging
+      prefix: /usr
+      build-depends:
+          - stage2-binutils
+          - stage2-busybox
+          - stage2-eglibc
+          - stage2-fhs-dirs
+          - stage2-gawk
+          - stage2-gcc
+          - stage2-linux-api-headers
+          - stage2-make
+
+    - name: eglibc
+      repo: upstream:eglibc2
+      ref: baserock/2.15-build-essential
+      build-mode: staging
+      prefix: /usr
+      build-depends:
+          - stage2-binutils
+          - stage2-busybox
+          - stage2-eglibc
+          - stage2-fhs-dirs
+          - stage2-gawk
+          - stage2-gcc
+          - stage2-linux-api-headers
+          - stage2-make
+          - linux-api-headers
+
+    - name: zlib
+      repo: upstream:zlib
+      ref: baserock/build-essential
+      build-mode: staging
+      prefix: /usr
+      build-depends:
+          - stage2-binutils
+          - stage2-busybox
+          - stage2-eglibc
+          - stage2-fhs-dirs
+          - stage2-gawk
+          - stage2-gcc
+          - stage2-linux-api-headers
+          - stage2-make
+          - eglibc
+
+    - name: binutils
+      repo: upstream:binutils-redhat
+      ref: baserock/build-essential
+      build-mode: staging
+      prefix: /usr
+      build-depends:
+          - stage2-binutils
+          - stage2-busybox
+          - stage2-eglibc
+          - stage2-fhs-dirs
+          - stage2-gawk
+          - stage2-gcc
+          - stage2-linux-api-headers
+          - stage2-make
+          - eglibc
+          - zlib
+
+    - name: busybox
+      repo: upstream:busybox
+      ref: baserock/build-essential
+      build-mode: staging
+      prefix: /usr
+      build-depends:
+          - stage2-binutils
+          - stage2-busybox
+          - stage2-eglibc
+          - stage2-fhs-dirs
+          - stage2-gawk
+          - stage2-gcc
+          - stage2-linux-api-headers
+          - stage2-make
+          - eglibc
+
+    - name: gawk
+      repo: upstream:gawk
+      ref: baserock/build-essential
+      build-mode: staging
+      prefix: /usr
+      build-depends:
+          - stage2-binutils
+          - stage2-busybox
+          - stage2-eglibc
+          - stage2-fhs-dirs
+          - stage2-gawk
+          - stage2-gcc
+          - stage2-linux-api-headers
+          - stage2-make
+          - eglibc
+
+    - name: gcc
+      repo: upstream:gcc-tarball
+      ref: baserock/build-essential
+      build-mode: staging
+      prefix: /usr
+      build-depends:
+          - stage2-binutils
+          - stage2-busybox
+          - stage2-eglibc
+          - stage2-fhs-dirs
+          - stage2-gawk
+          - stage2-gcc
+          - stage2-linux-api-headers
+          - stage2-make
+          - eglibc
+          - zlib
+
+    - name: make
+      repo: upstream:make
+      ref: baserock/build-essential
+      build-mode: staging
+      prefix: /usr
+      build-depends:
+          - stage2-binutils
+          - stage2-busybox
+          - stage2-eglibc
+          - stage2-fhs-dirs
+          - stage2-gawk
+          - stage2-gcc
+          - stage2-linux-api-headers
+          - stage2-make
+          - eglibc
+
+    # Extras that need to be in build-essential but don't need bootstrapping.
+
+    - name: ccache
+      repo: upstream:ccache
+      ref: baserock/build-essential
+      build-mode: staging
+      prefix: /usr
+      build-depends:
+          - stage2-binutils
+          - stage2-busybox
+          - stage2-eglibc
+          - stage2-fhs-dirs
+          - stage2-gawk
+          - stage2-gcc
+          - stage2-linux-api-headers
+          - stage2-make
+          - eglibc
+          - zlib
diff --git a/build-essential.morph.yaml b/build-essential.morph.yaml
deleted file mode 100644
index f4708e3..0000000
--- a/build-essential.morph.yaml
+++ /dev/null
@@ -1,287 +0,0 @@
-name: build-essential
-description: Toolchain stratum
-kind: stratum
-
-chunks:
-    # Stage 1: build a minimal cross compiler with the host's tools.
-    #
-    # Starting with a cross compiler ensures that (a) nothing from the host
-    # can leak into the build-essential artifacts, and (b) cross-compiling
-    # build-essential is fully tested and supported, since we always use the
-    # cross code paths.
-
-    - name: stage1-binutils
-      repo: upstream:binutils-redhat
-      ref: baserock/build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends: []
-
-    - name: stage1-gcc
-      repo: upstream:gcc-tarball
-      ref: baserock/build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-
-    # Stage 2: cross-build the whole of build-essential, using the host's tools
-    # but the cross-compiler toolchain.
-    #
-    # Stage 2 GCC outputs code for the same 'bootstrap' machine as stage 1 GCC,
-    # but because stage 2 GCC is also built to *run* on the bootstrap machine
-    # it can only execute inside the stage 3 chroot (due to being built against
-    # a libc with a non-standard prefix).
-
-    - name: stage2-linux-api-headers
-      repo: upstream:linux
-      ref: baserock/build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-          - stage1-gcc
-
-    - name: stage2-eglibc
-      repo: upstream:eglibc2
-      ref: baserock/2.15-build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-          - stage1-gcc
-          - stage2-linux-api-headers
-
-    - name: stage2-binutils
-      repo: upstream:binutils-redhat
-      ref: baserock/build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-          - stage1-gcc
-          - stage2-eglibc
-
-    - name: stage2-gcc
-      repo: upstream:gcc-tarball
-      ref: baserock/build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-          - stage1-gcc
-          - stage2-eglibc
-
-    - name: stage2-busybox
-      repo: upstream:busybox
-      ref: baserock/build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-          - stage1-gcc
-          - stage2-eglibc
-
-    - name: stage2-fhs-dirs
-      repo: baserock:baserock/fhs-dirs
-      ref: master
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends: []
-
-    - name: stage2-gawk
-      repo: upstream:gawk
-      ref: baserock/build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-          - stage1-gcc
-          - stage2-eglibc
-
-    - name: stage2-make
-      repo: upstream:make
-      ref: baserock/build-essential
-      build-mode: bootstrap
-      prefix: /tools
-      build-depends:
-          - stage1-binutils
-          - stage1-gcc
-          - stage2-eglibc
-
-    # Stage 3: build the whole of build-essential again, this time using a
-    # staging area containing only the output of stage 2. The result of this
-    # build is fully reproducible.
-    #
-    # We do a switch-a-roo between stage 2 and 3: stages 2 chunks are all built
-    # to run on a host *-bootstrap-* while stage 3 chunks are native-built for
-    # a *-baserock-* machine. This works, because the cross build was all for
-    # show (and cleanliness) and the binaries actually still run on the host.
-    #
-    # After build-essential is built we do another trick. See
-    # stage2-fhs-dirs.morph for details. Basically, /bin is a symlink to
-    # /tools/bin during stage 2 but in stage 3 it becomes a real directory
-    # again.
-
-    - name: fhs-dirs
-      repo: baserock:baserock/fhs-dirs
-      ref: master
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-
-    - name: linux-api-headers
-      repo: upstream:linux
-      ref: baserock/build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-
-    - name: eglibc
-      repo: upstream:eglibc2
-      ref: baserock/2.15-build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - linux-api-headers
-
-    - name: zlib
-      repo: upstream:zlib
-      ref: baserock/build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - eglibc
-
-    - name: binutils
-      repo: upstream:binutils-redhat
-      ref: baserock/build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - eglibc
-          - zlib
-
-    - name: busybox
-      repo: upstream:busybox
-      ref: baserock/build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - eglibc
-
-    - name: gawk
-      repo: upstream:gawk
-      ref: baserock/build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - eglibc
-
-    - name: gcc
-      repo: upstream:gcc-tarball
-      ref: baserock/build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - eglibc
-          - zlib
-
-    - name: make
-      repo: upstream:make
-      ref: baserock/build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - eglibc
-
-    # Extras that need to be in build-essential but don't need bootstrapping.
-
-    - name: ccache
-      repo: upstream:ccache
-      ref: baserock/build-essential
-      build-mode: staging
-      prefix: /usr
-      build-depends:
-          - stage2-binutils
-          - stage2-busybox
-          - stage2-eglibc
-          - stage2-fhs-dirs
-          - stage2-gawk
-          - stage2-gcc
-          - stage2-linux-api-headers
-          - stage2-make
-          - eglibc
-          - zlib
diff --git a/connectivity.morph b/connectivity.morph
index 282a80e..41f0c26 100644
--- a/connectivity.morph
+++ b/connectivity.morph
@@ -1,51 +1,31 @@
-{
-    "name": "connectivity",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "libnl",
-            "repo": "upstream:libnl",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "wpa_supplicant",
-            "repo": "upstream:hostap",
-            "ref": "baserock/genivi/morph",
-            "build-depends": [
-                "libnl"
-            ]
-        },
-        {
-            "name": "iptables",
-            "repo": "upstream:iptables",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "connman",
-            "repo": "upstream:connman",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "iptables"
-            ]
-        }
-    ]
-}
+name: connectivity
+kind: stratum
+build-depends:
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
+chunks:
+- name: libnl
+  repo: upstream:libnl
+  ref: baserock/morph
+  build-depends: []
+- name: wpa_supplicant
+  repo: upstream:hostap
+  ref: baserock/genivi/morph
+  build-depends:
+  - libnl
+- name: iptables
+  repo: upstream:iptables
+  ref: baserock/morph
+  build-depends: []
+- name: connman
+  repo: upstream:connman
+  ref: baserock/morph
+  build-depends:
+  - iptables
diff --git a/core.morph b/core.morph
index 71ca4b6..435bd54 100644
--- a/core.morph
+++ b/core.morph
@@ -1,281 +1,193 @@
-{
-    "name": "core",
-    "description": "Core components of a Baserock base system that are build tools required for the BSP and Foundation strata, but a step above build-essential",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "build-essential"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "cmake",
-            "repo": "upstream:cmake",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "gdbm",
-            "repo": "upstream:gdbm",
-            "ref": "baserock/build-essential",
-            "build-depends": []
-        },
-        {
-            "name": "gettext",
-            "repo": "upstream:gettext",
-            "ref": "baserock/build-essential",
-            "build-depends": []
-        },
-        {
-            "name": "m4",
-            "repo": "upstream:m4",
-            "ref": "baserock/build-essential",
-            "build-depends": []
-        },
-        {
-            "name": "mini-utils",
-            "repo": "baserock:baserock/mini-utils",
-            "ref": "master",
-            "build-depends": []
-        },
-        {
-            "name": "ncurses",
-            "repo": "upstream:ncurses",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "perl",
-            "repo": "upstream:perl",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "gdbm"
-            ]
-        },
-        {
-            "name": "pkg-config",
-            "repo": "upstream:pkg-config",
-            "ref": "baserock/build-essential",
-            "build-depends": []
-        },
-        {
-            "name": "texinfo-tarball",
-            "repo": "upstream:texinfo-tarball",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "ncurses"
-            ]
-        },
-        {
-            "name": "autoconf",
-            "repo": "upstream:autoconf",
-            "ref": "baserock/build-essential",
-            "build-depends": [
-                "m4",
-                "perl"
-            ]
-        },
-        {
-            "name": "automake",
-            "repo": "upstream:automake",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "autoconf",
-                "perl",
-                "texinfo-tarball"
-            ]
-        },
-        {
-            "name": "bash",
-            "repo": "upstream:bash",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "error-perl-tarball",
-            "repo": "upstream:error-perl-tarball",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "perl"
-            ]
-        },
-        {
-            "name": "flex",
-            "repo": "upstream:flex",
-            "ref": "baserock/build-essential",
-            "build-depends": [
-                "m4"
-            ]
-        },
-        {
-            "name": "openssl",
-            "repo": "upstream:openssl",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "perl"
-            ]
-        },
-        {
-            "name": "bzip2",
-            "repo": "upstream:bzip2",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "cpython",
-            "repo": "upstream:cpython",
-            "ref": "baserock/morph-2.7",
-            "build-depends": [
-                "openssl",
-                "bzip2"
-            ]
-        },
-        {
-            "name": "libtool",
-            "repo": "upstream:libtool",
-            "ref": "baserock/build-essential",
-            "build-depends": [
-                "bash"
-            ]
-        },
-        {
-            "name": "gtk-doc-stub",
-            "repo": "upstream:gtk-doc-stub",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "autoconf",
-                "automake",
-                "libtool"
-            ]
-        },
-        {
-            "name": "libxml2",
-            "repo": "upstream:libxml2",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "autoconf",
-                "automake",
-                "cpython",
-                "libtool"
-            ]
-        },
-        {
-            "name": "curl",
-            "repo": "upstream:curl",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "autoconf",
-                "automake",
-                "libtool",
-                "openssl"
-            ]
-        },
-        {
-            "name": "libexpat",
-            "repo": "upstream:libexpat",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "autoconf",
-                "automake",
-                "libtool"
-            ]
-        },
-        {
-            "name": "XML-Parser",
-            "repo": "upstream:XML-Parser",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "libexpat",
-                "libxml2",
-                "perl"
-            ]
-        },
-        {
-            "name": "git",
-            "repo": "upstream:git",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "autoconf",
-                "cpython",
-                "curl",
-                "error-perl-tarball",
-                "gettext",
-                "libexpat",
-                "openssl"
-            ]
-        },
-        {
-            "name": "bison",
-            "repo": "upstream:bison",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "autoconf",
-                "automake",
-                "bash",
-                "flex",
-                "gettext",
-                "git",
-                "mini-utils"
-            ]
-        },
-        {
-            "name": "gperf",
-            "repo": "upstream:gperf",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "intltool",
-            "repo": "upstream:intltool",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "XML-Parser",
-                "autoconf",
-                "automake",
-                "perl"
-            ]
-        },
-        {
-            "name": "util-linux",
-            "repo": "upstream:util-linux",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "autoconf",
-                "automake",
-                "gettext",
-                "git",
-                "libtool",
-                "pkg-config"
-            ]
-        },
-        {
-            "name": "xz",
-            "repo": "upstream:xz",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "autoconf",
-                "automake",
-                "gettext",
-                "libtool"
-            ]
-        },
-        {
-            "name": "nano",
-            "repo": "upstream:nano-tarball",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "ncurses"
-            ]
-        },
-        {
-            "name": "bc",
-            "repo": "upstream:bc-tarball",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "flex"
-            ]
-        }
-    ]
-}
+name: core
+description: Core components of a Baserock base system that are build tools required
+  for the BSP and Foundation strata, but a step above build-essential
+kind: stratum
+build-depends:
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: build-essential
+chunks:
+- name: cmake
+  repo: upstream:cmake
+  ref: baserock/morph
+  build-depends: []
+- name: gdbm
+  repo: upstream:gdbm
+  ref: baserock/build-essential
+  build-depends: []
+- name: gettext
+  repo: upstream:gettext
+  ref: baserock/build-essential
+  build-depends: []
+- name: m4
+  repo: upstream:m4
+  ref: baserock/build-essential
+  build-depends: []
+- name: mini-utils
+  repo: baserock:baserock/mini-utils
+  ref: master
+  build-depends: []
+- name: ncurses
+  repo: upstream:ncurses
+  ref: baserock/morph
+  build-depends: []
+- name: perl
+  repo: upstream:perl
+  ref: baserock/morph
+  build-depends:
+  - gdbm
+- name: pkg-config
+  repo: upstream:pkg-config
+  ref: baserock/build-essential
+  build-depends: []
+- name: texinfo-tarball
+  repo: upstream:texinfo-tarball
+  ref: baserock/morph
+  build-depends:
+  - ncurses
+- name: autoconf
+  repo: upstream:autoconf
+  ref: baserock/build-essential
+  build-depends:
+  - m4
+  - perl
+- name: automake
+  repo: upstream:automake
+  ref: baserock/morph
+  build-depends:
+  - autoconf
+  - perl
+  - texinfo-tarball
+- name: bash
+  repo: upstream:bash
+  ref: baserock/morph
+  build-depends: []
+- name: error-perl-tarball
+  repo: upstream:error-perl-tarball
+  ref: baserock/morph
+  build-depends:
+  - perl
+- name: flex
+  repo: upstream:flex
+  ref: baserock/build-essential
+  build-depends:
+  - m4
+- name: openssl
+  repo: upstream:openssl
+  ref: baserock/morph
+  build-depends:
+  - perl
+- name: bzip2
+  repo: upstream:bzip2
+  ref: baserock/morph
+  build-depends: []
+- name: cpython
+  repo: upstream:cpython
+  ref: baserock/morph-2.7
+  build-depends:
+  - openssl
+  - bzip2
+- name: libtool
+  repo: upstream:libtool
+  ref: baserock/build-essential
+  build-depends:
+  - bash
+- name: gtk-doc-stub
+  repo: upstream:gtk-doc-stub
+  ref: baserock/morph
+  build-depends:
+  - autoconf
+  - automake
+  - libtool
+- name: libxml2
+  repo: upstream:libxml2
+  ref: baserock/morph
+  build-depends:
+  - autoconf
+  - automake
+  - cpython
+  - libtool
+- name: curl
+  repo: upstream:curl
+  ref: baserock/morph
+  build-depends:
+  - autoconf
+  - automake
+  - libtool
+  - openssl
+- name: libexpat
+  repo: upstream:libexpat
+  ref: baserock/morph
+  build-depends:
+  - autoconf
+  - automake
+  - libtool
+- name: XML-Parser
+  repo: upstream:XML-Parser
+  ref: baserock/morph
+  build-depends:
+  - libexpat
+  - libxml2
+  - perl
+- name: git
+  repo: upstream:git
+  ref: baserock/morph
+  build-depends:
+  - autoconf
+  - cpython
+  - curl
+  - error-perl-tarball
+  - gettext
+  - libexpat
+  - openssl
+- name: bison
+  repo: upstream:bison
+  ref: baserock/morph
+  build-depends:
+  - autoconf
+  - automake
+  - bash
+  - flex
+  - gettext
+  - git
+  - mini-utils
+- name: gperf
+  repo: upstream:gperf
+  ref: baserock/morph
+  build-depends: []
+- name: intltool
+  repo: upstream:intltool
+  ref: baserock/morph
+  build-depends:
+  - XML-Parser
+  - autoconf
+  - automake
+  - perl
+- name: util-linux
+  repo: upstream:util-linux
+  ref: baserock/morph
+  build-depends:
+  - autoconf
+  - automake
+  - gettext
+  - git
+  - libtool
+  - pkg-config
+- name: xz
+  repo: upstream:xz
+  ref: baserock/morph
+  build-depends:
+  - autoconf
+  - automake
+  - gettext
+  - libtool
+- name: nano
+  repo: upstream:nano-tarball
+  ref: baserock/morph
+  build-depends:
+  - ncurses
+- name: bc
+  repo: upstream:bc-tarball
+  ref: baserock/morph
+  build-depends:
+  - flex
diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph
index eb31a27..b1b3127 100644
--- a/devel-system-armv7-highbank.morph
+++ b/devel-system-armv7-highbank.morph
@@ -1,43 +1,30 @@
-{
-    "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",
-            "ref": "master"
-        },
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "bsp-armv7-highbank",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "tools",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "configuration-extensions": [
-        "set-hostname",
-        "ssh",
-        "add-config-files",
-	"simple-network",
-	"nfsboot",
-	"install-files"
-    ]
-}
+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
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-armv7-highbank
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: tools
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
index a6891f9..913f8fc 100644
--- a/devel-system-armv7-versatile.morph
+++ b/devel-system-armv7-versatile.morph
@@ -1,43 +1,30 @@
-{
-    "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",
-            "ref": "master"
-        },
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "bsp-armv7-versatile",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "tools",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "configuration-extensions": [
-        "set-hostname",
-        "ssh",
-        "add-config-files",
-	"simple-network",
-	"nfsboot",
-	"install-files"
-    ]
-}
+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
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-armv7-versatile
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: tools
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/devel-system-armv7b-highbank.morph b/devel-system-armv7b-highbank.morph
index 0dab97d..736fadf 100644
--- a/devel-system-armv7b-highbank.morph
+++ b/devel-system-armv7b-highbank.morph
@@ -1,43 +1,30 @@
-{
-    "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",
-            "ref": "master"
-        },
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "bsp-armv7b-highbank",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "tools",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "configuration-extensions": [
-        "set-hostname",
-        "ssh",
-        "add-config-files",
-	"simple-network",
-	"nfsboot",
-	"install-files"
-    ]
-}
+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
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-armv7b-highbank
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: tools
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index 91735fb..a8c9e12 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -1,43 +1,30 @@
-{
-    "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",
-            "ref": "master"
-        },
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "bsp-x86_32-generic",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "tools",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "configuration-extensions": [
-        "set-hostname",
-        "ssh",
-        "add-config-files",
-	"simple-network",
-	"nfsboot",
-	"install-files"
-    ]
-}
+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
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-x86_32-generic
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: tools
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index 646b302..28ad9e3 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -1,43 +1,30 @@
-{
-    "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",
-            "ref": "master"
-        },
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "bsp-x86_64-generic",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "tools",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "configuration-extensions": [
-        "set-hostname",
-        "ssh",
-        "add-config-files",
-	"simple-network",
-	"nfsboot",
-	"install-files"
-    ]
-}
+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
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: tools
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/foundation.morph b/foundation.morph
index 0e2a803..329fb35 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -1,155 +1,101 @@
-{
-    "name": "foundation",
-    "kind": "stratum",
-    "description": "Basic userland runtime system",
-    "build-depends": [
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "core"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "attr",
-            "repo": "upstream:attr",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "groff",
-            "repo": "upstream:groff",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "kmod",
-            "repo": "upstream:kmod",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "libcap2",
-            "repo": "upstream:libcap2",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "attr"
-            ]
-        },
-        {
-            "name": "libffi",
-            "repo": "upstream:libffi",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "libusbx",
-            "repo": "upstream:libusbx",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "pciutils",
-            "repo": "upstream:pciutils",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "usbutils",
-            "repo": "upstream:usbutils",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "libusbx"
-            ]
-        },
-        {
-            "name": "glib",
-            "repo": "upstream:glib",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "libffi"
-            ]
-        },
-        {
-            "name": "gobject-introspection",
-            "repo": "upstream:gobject-introspection",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "glib"
-            ]
-        },
-        {
-            "name": "dbus-pre",
-            "repo": "upstream:dbus",
-            "ref": "baserock/build-essential",
-            "build-depends": [
-                "glib"
-            ]
-        },
-        {
-            "name": "systemd",
-            "repo": "upstream:systemd",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "dbus-pre",
-                "gobject-introspection",
-                "kmod",
-                "libcap2",
-                "pciutils",
-                "usbutils"
-            ]
-        },
-        {
-            "name": "lzo",
-            "repo": "upstream:lzo",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "btrfs-progs",
-            "repo": "upstream:btrfs-progs",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "attr",
-                "lzo"
-            ]
-        },
-        {
-            "name": "dbus",
-            "repo": "upstream:dbus",
-            "ref": "baserock/build-essential",
-            "build-depends": [
-                "glib",
-                "systemd"
-            ]
-        },
-        {
-            "name": "help2man",
-            "repo": "upstream:help2man",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "libxslt",
-            "repo": "upstream:libxslt",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "openssh",
-            "repo": "upstream:openssh",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "groff"
-            ]
-        },
-        {
-            "name": "tbdiff",
-            "repo": "baserock:baserock/tbdiff",
-            "ref": "master",
-            "build-depends": [
-                "attr"
-            ]
-        }
-    ]
-}
+name: foundation
+kind: stratum
+description: Basic userland runtime system
+build-depends:
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: core
+chunks:
+- name: attr
+  repo: upstream:attr
+  ref: baserock/morph
+  build-depends: []
+- name: groff
+  repo: upstream:groff
+  ref: baserock/morph
+  build-depends: []
+- name: kmod
+  repo: upstream:kmod
+  ref: baserock/morph
+  build-depends: []
+- name: libcap2
+  repo: upstream:libcap2
+  ref: baserock/morph
+  build-depends:
+  - attr
+- name: libffi
+  repo: upstream:libffi
+  ref: baserock/morph
+  build-depends: []
+- name: libusbx
+  repo: upstream:libusbx
+  ref: baserock/morph
+  build-depends: []
+- name: pciutils
+  repo: upstream:pciutils
+  ref: baserock/morph
+  build-depends: []
+- name: usbutils
+  repo: upstream:usbutils
+  ref: baserock/morph
+  build-depends:
+  - libusbx
+- name: glib
+  repo: upstream:glib
+  ref: baserock/morph
+  build-depends:
+  - libffi
+- name: gobject-introspection
+  repo: upstream:gobject-introspection
+  ref: baserock/morph
+  build-depends:
+  - glib
+- name: dbus-pre
+  repo: upstream:dbus
+  ref: baserock/build-essential
+  build-depends:
+  - glib
+- name: systemd
+  repo: upstream:systemd
+  ref: baserock/morph
+  build-depends:
+  - dbus-pre
+  - gobject-introspection
+  - kmod
+  - libcap2
+  - pciutils
+  - usbutils
+- name: lzo
+  repo: upstream:lzo
+  ref: baserock/morph
+  build-depends: []
+- name: btrfs-progs
+  repo: upstream:btrfs-progs
+  ref: baserock/morph
+  build-depends:
+  - attr
+  - lzo
+- name: dbus
+  repo: upstream:dbus
+  ref: baserock/build-essential
+  build-depends:
+  - glib
+  - systemd
+- name: help2man
+  repo: upstream:help2man
+  ref: baserock/morph
+  build-depends: []
+- name: libxslt
+  repo: upstream:libxslt
+  ref: baserock/morph
+  build-depends: []
+- name: openssh
+  repo: upstream:openssh
+  ref: baserock/morph
+  build-depends:
+  - groff
+- name: tbdiff
+  repo: baserock:baserock/tbdiff
+  ref: master
+  build-depends:
+  - attr
diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7-versatile.morph
index fc303ed..78d67b9 100644
--- a/genivi-baseline-system-armv7-versatile.morph
+++ b/genivi-baseline-system-armv7-versatile.morph
@@ -1,79 +1,51 @@
-{
-    "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",
-            "ref": "master"
-        },
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "bsp-armv7-versatile",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "connectivity",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "audio-bluetooth",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-common",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-armv7-versatile",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "multimedia",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-x-armv7-versatile",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "configuration-extensions": [
-        "set-hostname",
-        "ssh",
-        "add-config-files",
-	"simple-network",
-	"nfsboot",
-	"install-files",
-        "strip-gplv3"
-    ]
-}
+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
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-armv7-versatile
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: connectivity
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: audio-bluetooth
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-common
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-armv7-versatile
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: multimedia
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-x-armv7-versatile
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- strip-gplv3
diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph
index 1b70881..be46a44 100644
--- a/genivi-baseline-system-x86_64-generic.morph
+++ b/genivi-baseline-system-x86_64-generic.morph
@@ -1,79 +1,51 @@
-{
-    "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",
-            "ref": "master"
-        },
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "bsp-x86_64-generic",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "connectivity",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "audio-bluetooth",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-common",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-x86_64-generic",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "multimedia",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-x-x86_64-generic",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "configuration-extensions": [
-        "set-hostname",
-        "ssh",
-        "add-config-files",
-	"simple-network",
-	"nfsboot",
-	"install-files",
-        "strip-gplv3"
-    ]
-}
+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
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: connectivity
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: audio-bluetooth
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-common
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: multimedia
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-x-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- strip-gplv3
diff --git a/genivi-devel-system-armv7-versatile.morph b/genivi-devel-system-armv7-versatile.morph
index 1585b8a..81489d8 100644
--- a/genivi-devel-system-armv7-versatile.morph
+++ b/genivi-devel-system-armv7-versatile.morph
@@ -1,83 +1,53 @@
-{
-    "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",
-            "ref": "master"
-        },
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "bsp-armv7-versatile",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "connectivity",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "audio-bluetooth",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-common",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-armv7-versatile",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "multimedia",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-x-armv7-versatile",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "tools",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "configuration-extensions": [
-        "set-hostname",
-        "ssh",
-        "add-config-files",
-	"simple-network",
-	"nfsboot",
-	"install-files"
-    ]
-}
+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
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-armv7-versatile
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: connectivity
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: audio-bluetooth
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-common
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-armv7-versatile
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: multimedia
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-x-armv7-versatile
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: tools
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/genivi-devel-system-x86_64-generic.morph b/genivi-devel-system-x86_64-generic.morph
index 9773d56..8fba0bb 100644
--- a/genivi-devel-system-x86_64-generic.morph
+++ b/genivi-devel-system-x86_64-generic.morph
@@ -1,83 +1,53 @@
-{
-    "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",
-            "ref": "master"
-        },
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "bsp-x86_64-generic",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "connectivity",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "audio-bluetooth",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-common",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-x86_64-generic",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "multimedia",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-x-x86_64-generic",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "tools",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "configuration-extensions": [
-        "set-hostname",
-        "ssh",
-        "add-config-files",
-	"simple-network",
-	"nfsboot",
-	"install-files"
-    ]
-}
+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
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: connectivity
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: audio-bluetooth
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-common
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: multimedia
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-x-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: tools
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/genivi-foundation.morph b/genivi-foundation.morph
index 51fccc0..22b01bd 100644
--- a/genivi-foundation.morph
+++ b/genivi-foundation.morph
@@ -1,37 +1,23 @@
-{
-    "name": "genivi-foundation",
-    "description": "Basic components needed by the GENIVI baseline.",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "dbus-glib",
-            "repo": "upstream:dbus-glib",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "fuse",
-            "repo": "upstream:fuse",
-            "ref": "baserock/genivi/morph",
-            "build-depends": []
-        },
-        {
-            "name": "linuxquota",
-            "repo": "upstream:linuxquota",
-            "ref": "baserock/genivi/morph",
-            "build-depends": []
-        }
-    ]
-}
+name: genivi-foundation
+description: Basic components needed by the GENIVI baseline.
+kind: stratum
+build-depends:
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+chunks:
+- name: dbus-glib
+  repo: upstream:dbus-glib
+  ref: baserock/morph
+  build-depends: []
+- name: fuse
+  repo: upstream:fuse
+  ref: baserock/genivi/morph
+  build-depends: []
+- name: linuxquota
+  repo: upstream:linuxquota
+  ref: baserock/genivi/morph
+  build-depends: []
diff --git a/genivi-staging.morph b/genivi-staging.morph
index eebb447..a2dc991 100644
--- a/genivi-staging.morph
+++ b/genivi-staging.morph
@@ -1,27 +1,17 @@
-{
-    "name": "genivi-staging",
-    "kind": "stratum",
-    "build-depends": [],
-    "chunks": [
-        {
-            "name": "linux-api-headers",
-            "repo": "upstream:linux",
-            "ref": "baserock/genivi/baseline",
-            "build-depends": []
-        },
-        {
-            "name": "mpfr",
-            "repo": "upstream:mpfr",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "mpc",
-            "repo": "upstream:mpc",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "mpfr"
-            ]
-        }
-    ]
-}
+name: genivi-staging
+kind: stratum
+build-depends: []
+chunks:
+- name: linux-api-headers
+  repo: upstream:linux
+  ref: baserock/genivi/baseline
+  build-depends: []
+- name: mpfr
+  repo: upstream:mpfr
+  ref: baserock/morph
+  build-depends: []
+- name: mpc
+  repo: upstream:mpc
+  ref: baserock/morph
+  build-depends:
+  - mpfr
diff --git a/genivi-wayland-armv7-versatile.morph b/genivi-wayland-armv7-versatile.morph
index 9ee91d1..69132c5 100644
--- a/genivi-wayland-armv7-versatile.morph
+++ b/genivi-wayland-armv7-versatile.morph
@@ -1,40 +1,24 @@
-{
-    "name": "genivi-wayland-armv7-versatile",
-    "kind": "stratum",
-    "description": "Software components designed by genivi, for genivi.",
-    "build-depends": [
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "wayland-armv7-versatile",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "layer_management-wayland",
-            "repo": "upstream:layer_management",
-            "ref": "baserock/genivi/baseline",
-            "build-depends": []
-        }
-    ]
-}
+name: genivi-wayland-armv7-versatile
+kind: stratum
+description: Software components designed by genivi, for genivi.
+build-depends:
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: wayland-armv7-versatile
+  repo: baserock:baserock/morphs
+  ref: master
+chunks:
+- name: layer_management-wayland
+  repo: upstream:layer_management
+  ref: baserock/genivi/baseline
+  build-depends: []
diff --git a/genivi-wayland-x86_64-generic.morph b/genivi-wayland-x86_64-generic.morph
index 33039aa..277319d 100644
--- a/genivi-wayland-x86_64-generic.morph
+++ b/genivi-wayland-x86_64-generic.morph
@@ -1,40 +1,24 @@
-{
-    "name": "genivi-wayland-x86_64-generic",
-    "kind": "stratum",
-    "description": "Software components designed by genivi, for genivi.",
-    "build-depends": [
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "wayland-x86_64-generic",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "layer_management-wayland",
-            "repo": "upstream:layer_management",
-            "ref": "baserock/genivi/baseline",
-            "build-depends": []
-        }
-    ]
-}
+name: genivi-wayland-x86_64-generic
+kind: stratum
+description: Software components designed by genivi, for genivi.
+build-depends:
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: wayland-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
+chunks:
+- name: layer_management-wayland
+  repo: upstream:layer_management
+  ref: baserock/genivi/baseline
+  build-depends: []
diff --git a/genivi-x-armv7-versatile.morph b/genivi-x-armv7-versatile.morph
index edfbe14..2aa5ee5 100644
--- a/genivi-x-armv7-versatile.morph
+++ b/genivi-x-armv7-versatile.morph
@@ -1,40 +1,24 @@
-{
-    "name": "genivi-x-armv7-versatile",
-    "kind": "stratum",
-    "description": "Software components designed by genivi, for genivi.",
-    "build-depends": [
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-armv7-versatile",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "layer_management",
-            "repo": "upstream:layer_management",
-            "ref": "baserock/genivi/baseline",
-            "build-depends": []
-        }
-    ]
-}
+name: genivi-x-armv7-versatile
+kind: stratum
+description: Software components designed by genivi, for genivi.
+build-depends:
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-armv7-versatile
+  repo: baserock:baserock/morphs
+  ref: master
+chunks:
+- name: layer_management
+  repo: upstream:layer_management
+  ref: baserock/genivi/baseline
+  build-depends: []
diff --git a/genivi-x-x86_64-generic.morph b/genivi-x-x86_64-generic.morph
index dd4e4de..643e051 100644
--- a/genivi-x-x86_64-generic.morph
+++ b/genivi-x-x86_64-generic.morph
@@ -1,40 +1,24 @@
-{
-    "name": "genivi-x-x86_64-generic",
-    "kind": "stratum",
-    "description": "Software components designed by genivi, for genivi.",
-    "build-depends": [
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-x86_64-generic",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "layer_management",
-            "repo": "upstream:layer_management",
-            "ref": "baserock/genivi/baseline",
-            "build-depends": []
-        }
-    ]
-}
+name: genivi-x-x86_64-generic
+kind: stratum
+description: Software components designed by genivi, for genivi.
+build-depends:
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
+chunks:
+- name: layer_management
+  repo: upstream:layer_management
+  ref: baserock/genivi/baseline
+  build-depends: []
diff --git a/genivi.morph b/genivi.morph
index 148605e..84a0992 100644
--- a/genivi.morph
+++ b/genivi.morph
@@ -1,69 +1,44 @@
-{
-    "name": "genivi",
-    "kind": "stratum",
-    "description": "Software components designed by genivi, for genivi.",
-    "build-depends": [
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "DLT-daemon",
-            "repo": "upstream:DLT-daemon",
-            "ref": "baserock/morphs",
-            "build-depends": []
-        },
-        {
-            "name": "sqlite3",
-            "repo": "upstream:sqlite3",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "node-startup-controller",
-            "repo": "upstream:node-startup-controller",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "DLT-daemon"
-            ]
-        },
-        {
-            "name": "googletest",
-            "repo": "upstream:googletest",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "googlemock",
-            "repo": "upstream:googlemock",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "googletest"
-            ]
-        },
-        {
-            "name": "audiomanager",
-            "repo": "upstream:audiomanager",
-            "ref": "baserock/genivi/baseline",
-            "build-depends": [
-                "DLT-daemon",
-                "sqlite3",
-                "googletest",
-                "googlemock"
-            ]
-        }
-    ]
-}
+name: genivi
+kind: stratum
+description: Software components designed by genivi, for genivi.
+build-depends:
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
+chunks:
+- name: DLT-daemon
+  repo: upstream:DLT-daemon
+  ref: baserock/morphs
+  build-depends: []
+- name: sqlite3
+  repo: upstream:sqlite3
+  ref: baserock/morph
+  build-depends: []
+- name: node-startup-controller
+  repo: upstream:node-startup-controller
+  ref: baserock/morph
+  build-depends:
+  - DLT-daemon
+- name: googletest
+  repo: upstream:googletest
+  ref: baserock/morph
+  build-depends: []
+- name: googlemock
+  repo: upstream:googlemock
+  ref: baserock/morph
+  build-depends:
+  - googletest
+- name: audiomanager
+  repo: upstream:audiomanager
+  ref: baserock/genivi/baseline
+  build-depends:
+  - DLT-daemon
+  - sqlite3
+  - googletest
+  - googlemock
diff --git a/lua.morph b/lua.morph
index 299e1f3..a30b456 100644
--- a/lua.morph
+++ b/lua.morph
@@ -1,20 +1,12 @@
-{
-    "name": "lua",
-    "kind": "stratum",
-    "description": "Interpreter for the lua scripting language.",
-    "build-depends": [
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "tools"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "lua",
-            "repo": "upstream:lua",
-            "ref": "baserock/5.1-morph",
-            "build-depends": []
-        }
-    ]
-}
+name: lua
+kind: stratum
+description: Interpreter for the lua scripting language.
+build-depends:
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: tools
+chunks:
+- name: lua
+  repo: upstream:lua
+  ref: baserock/5.1-morph
+  build-depends: []
diff --git a/multimedia.morph b/multimedia.morph
index e1adc06..18279bb 100644
--- a/multimedia.morph
+++ b/multimedia.morph
@@ -1,38 +1,23 @@
-{
-    "name": "multimedia",
-    "kind": "stratum",
-    "description": "Codecs",
-    "build-depends": [
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "orc",
-            "repo": "upstream:orc",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "gstreamer",
-            "repo": "upstream:gstreamer",
-            "ref": "baserock/genivi/baseline",
-            "build-depends": [
-                "orc"
-            ]
-        }
-    ]
-}
+name: multimedia
+kind: stratum
+description: Codecs
+build-depends:
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
+chunks:
+- name: orc
+  repo: upstream:orc
+  ref: baserock/morph
+  build-depends: []
+- name: gstreamer
+  repo: upstream:gstreamer
+  ref: baserock/genivi/baseline
+  build-depends:
+  - orc
diff --git a/nfs.morph b/nfs.morph
index 4c88658..c0b1ee4 100644
--- a/nfs.morph
+++ b/nfs.morph
@@ -1,58 +1,38 @@
-{
-    "name": "nfs",
-    "kind": "stratum",
-    "description": "NFS utilities",
-    "build-depends": [
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "core"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "libevent",
-            "repo": "upstream:libevent",
-            "ref": "release-2.0.20-stable",
-            "build-depends": []
-        },
-        {
-            "name": "sqlite3",
-            "repo": "upstream:sqlite3",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "tcp-wrappers",
-            "repo": "upstream:tcp-wrappers",
-            "ref": "baserock/fedora-patches",
-            "build-depends": []
-        },
-        {
-            "name": "ti-rpc",
-            "repo": "upstream:ti-rpc",
-            "ref": "baserock/master",
-            "build-depends": []
-        },
-        {
-            "name": "rpcbind",
-            "repo": "upstream:rpcbind",
-            "ref": "baserock/master",
-            "build-depends": [
-                "ti-rpc",
-                "tcp-wrappers"
-            ]
-        },
-        {
-            "name": "nfs-utils",
-            "repo": "upstream:nfs-utils",
-            "ref": "baserock/master",
-            "build-depends": [
-                "libevent",
-                "sqlite3",
-                "tcp-wrappers",
-                "ti-rpc"
-            ]
-        }
-    ]
-}
+name: nfs
+kind: stratum
+description: NFS utilities
+build-depends:
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: core
+chunks:
+- name: libevent
+  repo: upstream:libevent
+  ref: release-2.0.20-stable
+  build-depends: []
+- name: sqlite3
+  repo: upstream:sqlite3
+  ref: baserock/morph
+  build-depends: []
+- name: tcp-wrappers
+  repo: upstream:tcp-wrappers
+  ref: baserock/fedora-patches
+  build-depends: []
+- name: ti-rpc
+  repo: upstream:ti-rpc
+  ref: baserock/master
+  build-depends: []
+- name: rpcbind
+  repo: upstream:rpcbind
+  ref: baserock/master
+  build-depends:
+  - ti-rpc
+  - tcp-wrappers
+- name: nfs-utils
+  repo: upstream:nfs-utils
+  ref: baserock/master
+  build-depends:
+  - libevent
+  - sqlite3
+  - tcp-wrappers
+  - ti-rpc
diff --git a/qt4-devel-system-x86_64-generic.morph b/qt4-devel-system-x86_64-generic.morph
index 823d690..3ac7181 100644
--- a/qt4-devel-system-x86_64-generic.morph
+++ b/qt4-devel-system-x86_64-generic.morph
@@ -1,73 +1,48 @@
-{
-    "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",
-            "ref": "master"
-        },
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "bsp-x86_64-generic",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "tools",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-common",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-x86_64-generic",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "qt4-tools",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "qt4-sdk",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "lua",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "enlightenment",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "configuration-extensions": [
-        "set-hostname",
-        "ssh",
-        "add-config-files",
-	"simple-network",
-	"nfsboot",
-	"install-files"
-    ]
-}
+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
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: tools
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-common
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: qt4-tools
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: qt4-sdk
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: lua
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: enlightenment
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/qt4-sdk.morph b/qt4-sdk.morph
index f1b7366..6b1ff1a 100644
--- a/qt4-sdk.morph
+++ b/qt4-sdk.morph
@@ -1,20 +1,12 @@
-{
-    "name": "qt4-sdk",
-    "description": "Qt4 Desktop Environment, IDE and Example Apps",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "qt4-tools"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "qt-creator",
-            "repo": "upstream:qt-creator",
-            "ref": "baserock/morph/2.7",
-            "build-depends": []
-        }
-    ]
-}
+name: qt4-sdk
+description: Qt4 Desktop Environment, IDE and Example Apps
+kind: stratum
+build-depends:
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: qt4-tools
+chunks:
+- name: qt-creator
+  repo: upstream:qt-creator
+  ref: baserock/morph/2.7
+  build-depends: []
diff --git a/qt4-tools.morph b/qt4-tools.morph
index 0756ae6..e743094 100644
--- a/qt4-tools.morph
+++ b/qt4-tools.morph
@@ -1,60 +1,38 @@
-{
-    "name": "qt4-tools",
-    "description": "Qt4 Development Libraries and Tools",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "tools"
-        },
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "x-x86_64-generic"
-        },
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "multimedia"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "icu",
-            "repo": "upstream:icu",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "sqlite3",
-            "repo": "upstream:sqlite3",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "ruby-1.8",
-            "repo": "upstream:ruby",
-            "ref": "baserock/morph/ruby_1_8_7",
-            "build-depends": []
-        },
-        {
-            "name": "ruby-1.9",
-            "repo": "upstream:ruby",
-            "ref": "baserock/morph/ruby_1_9_3",
-            "build-depends": [
-                "ruby-1.8"
-            ]
-        },
-        {
-            "name": "qt4-tools",
-            "repo": "upstream:qt4-tools",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "icu",
-                "ruby-1.9",
-                "sqlite3"
-            ]
-        }
-    ]
-}
+name: qt4-tools
+description: Qt4 Development Libraries and Tools
+kind: stratum
+build-depends:
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: tools
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: x-x86_64-generic
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: multimedia
+chunks:
+- name: icu
+  repo: upstream:icu
+  ref: baserock/morph
+  build-depends: []
+- name: sqlite3
+  repo: upstream:sqlite3
+  ref: baserock/morph
+  build-depends: []
+- name: ruby-1.8
+  repo: upstream:ruby
+  ref: baserock/morph/ruby_1_8_7
+  build-depends: []
+- name: ruby-1.9
+  repo: upstream:ruby
+  ref: baserock/morph/ruby_1_9_3
+  build-depends:
+  - ruby-1.8
+- name: qt4-tools
+  repo: upstream:qt4-tools
+  ref: baserock/morph
+  build-depends:
+  - icu
+  - ruby-1.9
+  - sqlite3
diff --git a/qt5-devel-system-x86_64-generic.morph b/qt5-devel-system-x86_64-generic.morph
index f27d545..68ecd43 100644
--- a/qt5-devel-system-x86_64-generic.morph
+++ b/qt5-devel-system-x86_64-generic.morph
@@ -1,73 +1,48 @@
-{
-    "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",
-            "ref": "master"
-        },
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "bsp-x86_64-generic",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "tools",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-common",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-x86_64-generic",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "qt5-tools",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "qt5-sdk",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "lua",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "enlightenment",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "configuration-extensions": [
-        "set-hostname",
-        "ssh",
-        "add-config-files",
-	"simple-network",
-	"nfsboot",
-	"install-files"
-    ]
-}
+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
+  ref: master
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: bsp-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: tools
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-common
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-x86_64-generic
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: qt5-tools
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: qt5-sdk
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: lua
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: enlightenment
+  repo: baserock:baserock/morphs
+  ref: master
+configuration-extensions:
+- set-hostname
+- ssh
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
diff --git a/qt5-sdk.morph b/qt5-sdk.morph
index 8662656..2db2f83 100644
--- a/qt5-sdk.morph
+++ b/qt5-sdk.morph
@@ -1,26 +1,16 @@
-{
-    "name": "qt5-sdk",
-    "description": "Qt5 Desktop Environment, IDE and Example Apps",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "qt5-tools"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "qt-creator",
-            "repo": "upstream:qt-creator",
-            "ref": "baserock/morph/2.7",
-            "build-depends": []
-        },
-        {
-            "name": "snowshoe",
-            "repo": "upstream:snowshoe",
-            "ref": "baserock/morph",
-            "build-depends": []
-        }
-    ]
-}
+name: qt5-sdk
+description: Qt5 Desktop Environment, IDE and Example Apps
+kind: stratum
+build-depends:
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: qt5-tools
+chunks:
+- name: qt-creator
+  repo: upstream:qt-creator
+  ref: baserock/morph/2.7
+  build-depends: []
+- name: snowshoe
+  repo: upstream:snowshoe
+  ref: baserock/morph
+  build-depends: []
diff --git a/qt5-tools.morph b/qt5-tools.morph
index b0d1bd6..9ae6ed7 100644
--- a/qt5-tools.morph
+++ b/qt5-tools.morph
@@ -1,223 +1,147 @@
-{
-    "name": "qt5-tools",
-    "description": "Qt5 Development Libraries and Tools",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "tools"
-        },
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "x-x86_64-generic"
-        },
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "multimedia"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "icu",
-            "repo": "upstream:icu",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "sqlite3",
-            "repo": "upstream:sqlite3",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "ruby-1.8",
-            "repo": "upstream:ruby",
-            "ref": "baserock/morph/ruby_1_8_7",
-            "build-depends": []
-        },
-        {
-            "name": "ruby-1.9",
-            "repo": "upstream:ruby",
-            "ref": "baserock/morph/ruby_1_9_3",
-            "build-depends": [
-                "ruby-1.8"
-            ]
-        },
-        {
-            "name": "qtbase",
-            "repo": "upstream:qt5/qtbase",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "icu"
-            ]
-        },
-        {
-            "name": "qtsvg",
-            "repo": "upstream:qt5/qtsvg",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase"
-            ]
-        },
-        {
-            "name": "qtjsbackend",
-            "repo": "upstream:qt5/qtjsbackend",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase"
-            ]
-        },
-        {
-            "name": "qtscript",
-            "repo": "upstream:qt5/qtscript",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase",
-                "qtjsbackend"
-            ]
-        },
-        {
-            "name": "qtdeclarative",
-            "repo": "upstream:qt5/qtdeclarative",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase",
-                "qtjsbackend",
-                "qtscript"
-            ]
-        },
-        {
-            "name": "qtquick1",
-            "repo": "upstream:qt5/qtquick1",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase",
-                "qtjsbackend",
-                "qtscript"
-            ]
-        },
-        {
-            "name": "qtquickcontrols",
-            "repo": "upstream:qt5/qtquickcontrols",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase",
-                "qtjsbackend",
-                "qtdeclarative"
-            ]
-        },
-        {
-            "name": "qtsensors",
-            "repo": "upstream:qt5/qtsensors",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase"
-            ]
-        },
-        {
-            "name": "qtserialport",
-            "repo": "upstream:qt5/qtserialport",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase"
-            ]
-        },
-        {
-            "name": "qtx11extras",
-            "repo": "upstream:qt5/qtx11extras",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase"
-            ]
-        },
-        {
-            "name": "qtwebkit",
-            "repo": "upstream:qt5/qtwebkit",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase",
-                "sqlite3",
-                "icu",
-                "ruby-1.9",
-                "qtjsbackend",
-                "qtdeclarative"
-            ]
-        },
-        {
-            "name": "qtwebkit-examples",
-            "repo": "upstream:qt5/qtwebkit-examples",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase",
-                "qtjsbackend",
-                "qtdeclarative",
-                "qtwebkit"
-            ]
-        },
-        {
-            "name": "qtmultimedia",
-            "repo": "upstream:qt5/qtmultimedia",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase"
-            ]
-        },
-        {
-            "name": "qtxmlpatterns",
-            "repo": "upstream:qt5/qtxmlpatterns",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase"
-            ]
-        },
-        {
-            "name": "qtdoc",
-            "repo": "upstream:qt5/qtdoc",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase"
-            ]
-        },
-        {
-            "name": "qtgraphicaleffects",
-            "repo": "upstream:qt5/qtgraphicaleffects",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase",
-                "qtjsbackend",
-                "qtdeclarative"
-            ]
-        },
-        {
-            "name": "qtimageformats",
-            "repo": "upstream:qt5/qtimageformats",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase"
-            ]
-        },
-        {
-            "name": "qttools",
-            "repo": "upstream:qt5/qttools",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase",
-                "qtjsbackend",
-                "qtdeclarative",
-                "qtwebkit"
-            ]
-        },
-        {
-            "name": "qttranslations",
-            "repo": "upstream:qt5/qttranslations",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "qtbase",
-                "qttools"
-            ]
-        }
-    ]
-}
+name: qt5-tools
+description: Qt5 Development Libraries and Tools
+kind: stratum
+build-depends:
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: tools
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: x-x86_64-generic
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: multimedia
+chunks:
+- name: icu
+  repo: upstream:icu
+  ref: baserock/morph
+  build-depends: []
+- name: sqlite3
+  repo: upstream:sqlite3
+  ref: baserock/morph
+  build-depends: []
+- name: ruby-1.8
+  repo: upstream:ruby
+  ref: baserock/morph/ruby_1_8_7
+  build-depends: []
+- name: ruby-1.9
+  repo: upstream:ruby
+  ref: baserock/morph/ruby_1_9_3
+  build-depends:
+  - ruby-1.8
+- name: qtbase
+  repo: upstream:qt5/qtbase
+  ref: baserock/morph
+  build-depends:
+  - icu
+- name: qtsvg
+  repo: upstream:qt5/qtsvg
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+- name: qtjsbackend
+  repo: upstream:qt5/qtjsbackend
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+- name: qtscript
+  repo: upstream:qt5/qtscript
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+  - qtjsbackend
+- name: qtdeclarative
+  repo: upstream:qt5/qtdeclarative
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+  - qtjsbackend
+  - qtscript
+- name: qtquick1
+  repo: upstream:qt5/qtquick1
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+  - qtjsbackend
+  - qtscript
+- name: qtquickcontrols
+  repo: upstream:qt5/qtquickcontrols
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+  - qtjsbackend
+  - qtdeclarative
+- name: qtsensors
+  repo: upstream:qt5/qtsensors
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+- name: qtserialport
+  repo: upstream:qt5/qtserialport
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+- name: qtx11extras
+  repo: upstream:qt5/qtx11extras
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+- name: qtwebkit
+  repo: upstream:qt5/qtwebkit
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+  - sqlite3
+  - icu
+  - ruby-1.9
+  - qtjsbackend
+  - qtdeclarative
+- name: qtwebkit-examples
+  repo: upstream:qt5/qtwebkit-examples
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+  - qtjsbackend
+  - qtdeclarative
+  - qtwebkit
+- name: qtmultimedia
+  repo: upstream:qt5/qtmultimedia
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+- name: qtxmlpatterns
+  repo: upstream:qt5/qtxmlpatterns
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+- name: qtdoc
+  repo: upstream:qt5/qtdoc
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+- name: qtgraphicaleffects
+  repo: upstream:qt5/qtgraphicaleffects
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+  - qtjsbackend
+  - qtdeclarative
+- name: qtimageformats
+  repo: upstream:qt5/qtimageformats
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+- name: qttools
+  repo: upstream:qt5/qttools
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+  - qtjsbackend
+  - qtdeclarative
+  - qtwebkit
+- name: qttranslations
+  repo: upstream:qt5/qttranslations
+  ref: baserock/morph
+  build-depends:
+  - qtbase
+  - qttools
diff --git a/tools.morph b/tools.morph
index 4711f31..7aa85a2 100644
--- a/tools.morph
+++ b/tools.morph
@@ -1,176 +1,115 @@
-{
-    "name": "tools",
-    "description": "Extra development tools included in the devel system",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "repo": "baserock:baserock/morphs",
-            "ref": "master",
-            "morph": "foundation"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "patch",
-            "repo": "upstream:patch",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "python-setuptools",
-            "repo": "upstream:python-setuptools",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "python-ttystatus",
-            "repo": "upstream:python-ttystatus",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "pyyaml",
-            "repo": "upstream:pyyaml",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "python-setuptools"
-            ]
-        },
-        {
-            "name": "python-coveragepy",
-            "repo": "upstream:python-coveragepy",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "python-setuptools"
-            ]
-        },
-        {
-            "name": "python-coverage-test-runner",
-            "repo": "upstream:python-coverage-test-runner",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "python-coveragepy"
-            ]
-        },
-        {
-            "name": "cliapp",
-            "repo": "upstream:cliapp",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "python-coverage-test-runner"
-            ]
-        },
-        {
-            "name": "cmdtest",
-            "repo": "upstream:cmdtest",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "cliapp",
-                "python-ttystatus"
-            ]
-        },
-        {
-            "name": "coreutils",
-            "repo": "upstream:coreutils",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "patch"
-            ]
-        },
-        {
-            "name": "distcc",
-            "repo": "upstream:distcc",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "e2fsprogs",
-            "repo": "upstream:e2fsprogs",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "file",
-            "repo": "upstream:file",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "gdb",
-            "repo": "upstream:gdb",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "less",
-            "repo": "upstream:less",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "linux-user-chroot",
-            "repo": "upstream:linux-user-chroot",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "lsof",
-            "repo": "upstream:lsof",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "morph",
-            "repo": "baserock:baserock/morph",
-            "ref": "master",
-            "build-depends": [
-                "cliapp",
-                "cmdtest",
-                "python-coverage-test-runner",
-                "pyyaml"
-            ]
-        },
-        {
-            "name": "pv",
-            "repo": "upstream:pv",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "rsync",
-            "repo": "upstream:rsync",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "strace",
-            "repo": "upstream:strace",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "vala",
-            "repo": "upstream:vala",
-            "ref": "baserock/bootstrap",
-            "build-depends": []
-        },
-        {
-            "name": "vim",
-            "repo": "upstream:vim",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "screen",
-            "repo": "upstream:screen",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "u-boot",
-            "repo": "upstream:u-boot",
-            "ref": "baserock/morph",
-            "build-depends": []
-        }
-    ]
-}
+name: tools
+description: Extra development tools included in the devel system
+kind: stratum
+build-depends:
+- repo: baserock:baserock/morphs
+  ref: master
+  morph: foundation
+chunks:
+- name: patch
+  repo: upstream:patch
+  ref: baserock/morph
+  build-depends: []
+- name: python-setuptools
+  repo: upstream:python-setuptools
+  ref: baserock/morph
+  build-depends: []
+- name: python-ttystatus
+  repo: upstream:python-ttystatus
+  ref: baserock/morph
+  build-depends: []
+- name: pyyaml
+  repo: upstream:pyyaml
+  ref: baserock/morph
+  build-depends:
+  - python-setuptools
+- name: python-coveragepy
+  repo: upstream:python-coveragepy
+  ref: baserock/morph
+  build-depends:
+  - python-setuptools
+- name: python-coverage-test-runner
+  repo: upstream:python-coverage-test-runner
+  ref: baserock/morph
+  build-depends:
+  - python-coveragepy
+- name: cliapp
+  repo: upstream:cliapp
+  ref: baserock/morph
+  build-depends:
+  - python-coverage-test-runner
+- name: cmdtest
+  repo: upstream:cmdtest
+  ref: baserock/morph
+  build-depends:
+  - cliapp
+  - python-ttystatus
+- name: coreutils
+  repo: upstream:coreutils
+  ref: baserock/morph
+  build-depends:
+  - patch
+- name: distcc
+  repo: upstream:distcc
+  ref: baserock/morph
+  build-depends: []
+- name: e2fsprogs
+  repo: upstream:e2fsprogs
+  ref: baserock/morph
+  build-depends: []
+- name: file
+  repo: upstream:file
+  ref: baserock/morph
+  build-depends: []
+- name: gdb
+  repo: upstream:gdb
+  ref: baserock/morph
+  build-depends: []
+- name: less
+  repo: upstream:less
+  ref: baserock/morph
+  build-depends: []
+- name: linux-user-chroot
+  repo: upstream:linux-user-chroot
+  ref: baserock/morph
+  build-depends: []
+- name: lsof
+  repo: upstream:lsof
+  ref: baserock/morph
+  build-depends: []
+- name: morph
+  repo: baserock:baserock/morph
+  ref: master
+  build-depends:
+  - cliapp
+  - cmdtest
+  - python-coverage-test-runner
+  - pyyaml
+- name: pv
+  repo: upstream:pv
+  ref: baserock/morph
+  build-depends: []
+- name: rsync
+  repo: upstream:rsync
+  ref: baserock/morph
+  build-depends: []
+- name: strace
+  repo: upstream:strace
+  ref: baserock/morph
+  build-depends: []
+- name: vala
+  repo: upstream:vala
+  ref: baserock/bootstrap
+  build-depends: []
+- name: vim
+  repo: upstream:vim
+  ref: baserock/morph
+  build-depends: []
+- name: screen
+  repo: upstream:screen
+  ref: baserock/morph
+  build-depends: []
+- name: u-boot
+  repo: upstream:u-boot
+  ref: baserock/morph
+  build-depends: []
diff --git a/wayland-armv7-versatile.morph b/wayland-armv7-versatile.morph
index 304a7ad..f6ad8af 100644
--- a/wayland-armv7-versatile.morph
+++ b/wayland-armv7-versatile.morph
@@ -1,51 +1,30 @@
-{
-    "name": "wayland-armv7-versatile",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-common",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "libxkbcommon",
-            "repo": "upstream:xorg-lib-libxkbcommon",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "wayland",
-            "repo": "upstream:wayland",
-            "ref": "baserock/genivi/wayland",
-            "build-depends": [
-                "libxkbcommon"
-            ]
-        },
-        {
-            "name": "mesa-wayland",
-            "repo": "upstream:mesa",
-            "ref": "baserock/genivi/baseline-armv7-versatile",
-            "build-depends": [
-                "wayland"
-            ]
-        }
-    ]
-}
-
+name: wayland-armv7-versatile
+kind: stratum
+build-depends:
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-common
+  repo: baserock:baserock/morphs
+  ref: master
+chunks:
+- name: libxkbcommon
+  repo: upstream:xorg-lib-libxkbcommon
+  ref: baserock/morph
+  build-depends: []
+- name: wayland
+  repo: upstream:wayland
+  ref: baserock/genivi/wayland
+  build-depends:
+  - libxkbcommon
+- name: mesa-wayland
+  repo: upstream:mesa
+  ref: baserock/genivi/baseline-armv7-versatile
+  build-depends:
+  - wayland
diff --git a/wayland-x86_64-generic.morph b/wayland-x86_64-generic.morph
index 95b3379..0de02ad 100644
--- a/wayland-x86_64-generic.morph
+++ b/wayland-x86_64-generic.morph
@@ -1,50 +1,30 @@
-{
-    "name": "wayland-x86_64-generic",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-common",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "libxkbcommon",
-            "repo": "upstream:xorg-lib-libxkbcommon",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "wayland",
-            "repo": "upstream:wayland",
-            "ref": "baserock/genivi/wayland",
-            "build-depends": [
-                "libxkbcommon"
-            ]
-        },
-        {
-            "name": "mesa-wayland",
-            "repo": "upstream:mesa",
-            "ref": "baserock/genivi/morph",
-            "build-depends": [
-                "wayland"
-            ]
-        }
-    ]
-}
+name: wayland-x86_64-generic
+kind: stratum
+build-depends:
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-common
+  repo: baserock:baserock/morphs
+  ref: master
+chunks:
+- name: libxkbcommon
+  repo: upstream:xorg-lib-libxkbcommon
+  ref: baserock/morph
+  build-depends: []
+- name: wayland
+  repo: upstream:wayland
+  ref: baserock/genivi/wayland
+  build-depends:
+  - libxkbcommon
+- name: mesa-wayland
+  repo: upstream:mesa
+  ref: baserock/genivi/morph
+  build-depends:
+  - wayland
diff --git a/x-armv7-versatile.morph b/x-armv7-versatile.morph
index 7d02344..98c06bc 100644
--- a/x-armv7-versatile.morph
+++ b/x-armv7-versatile.morph
@@ -1,249 +1,162 @@
-{
-    "name": "x-armv7-versatile",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-common",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "mesa-x",
-            "repo": "upstream:mesa",
-            "ref": "baserock/genivi/baseline-armv7-versatile",
-            "build-depends": []
-        },
-        {
-            "name": "xorg-lib-libxkbfile",
-            "repo": "upstream:xorg-lib-libxkbfile",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "pixman",
-            "repo": "upstream:pixman",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "xorg-font-util",
-            "repo": "upstream:xorg-font-util",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "xorg-lib-libfontenc",
-            "repo": "upstream:xorg-lib-libfontenc",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-font-util"
-            ]
-        },
-        {
-            "name": "freetype2",
-            "repo": "upstream:freetype2",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "fontconfig",
-            "repo": "upstream:fontconfig",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "freetype2"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXfont",
-            "repo": "upstream:xorg-lib-libXfont",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "freetype2",
-                "xorg-lib-libfontenc"
-            ]
-        },
-        {
-            "name": "xorg-lib-libICE",
-            "repo": "upstream:xorg-lib-libICE",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "xorg-lib-libSM",
-            "repo": "upstream:xorg-lib-libSM",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libICE"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXt",
-            "repo": "upstream:xorg-lib-libXt",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libSM"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXmu",
-            "repo": "upstream:xorg-lib-libXmu",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libXt"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXpm",
-            "repo": "upstream:xorg-lib-libXpm",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libXt"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXaw",
-            "repo": "upstream:xorg-lib-libXaw",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libXmu",
-                "xorg-lib-libXpm",
-                "xorg-lib-libXt"
-            ]
-        },
-        {
-            "name": "libsha1",
-            "repo": "upstream:libsha1",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "xserver",
-            "repo": "upstream:xserver",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "libsha1",
-                "mesa-x",
-                "pixman",
-                "xorg-font-util",
-                "xorg-lib-libXaw",
-                "xorg-lib-libXfont",
-                "xorg-lib-libXmu",
-                "xorg-lib-libXpm",
-                "xorg-lib-libXt",
-                "xorg-lib-libfontenc",
-                "xorg-lib-libxkbfile"
-            ]
-        },
-        {
-            "name": "xorg-driver-xf86-video-cirrus",
-            "repo": "upstream:xorg-driver-xf86-video-cirrus",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xserver"
-            ]
-        },
-        {
-            "name": "xorg-driver-xf86-video-fbdev",
-            "repo": "upstream:xorg-driver-xf86-video-fbdev",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xserver"
-            ]
-        },
-        {
-            "name": "xorg-driver-xf86-video-vesa",
-            "repo": "upstream:xorg-driver-xf86-video-vesa",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xserver"
-            ]
-        },
-        {
-            "name": "xorg-driver-xf86-input-evdev",
-            "repo": "upstream:xorg-driver-xf86-input-evdev",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xserver"
-            ]
-        },
-        {
-            "name": "xorg-driver-xf86-input-keyboard",
-            "repo": "upstream:xorg-driver-xf86-input-keyboard",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xserver"
-            ]
-        },
-        {
-            "name": "xorg-driver-xf86-input-mouse",
-            "repo": "upstream:xorg-driver-xf86-input-mouse",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xserver"
-            ]
-        },
-        {
-            "name": "xorg-app-xkbcomp",
-            "repo": "upstream:xorg-app-xkbcomp",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libxkbfile"
-            ]
-        },
-        {
-            "name": "xkeyboard-config",
-            "repo": "upstream:xkeyboard-config",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-app-xkbcomp"
-            ]
-        },
-        {
-            "name": "xorg-app-xinit",
-            "repo": "upstream:xorg-app-xinit",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "xorg-lib-libXft",
-            "repo": "upstream:xorg-lib-libXft",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "fontconfig",
-                "freetype2"
-            ]
-        },
-        {
-            "name": "xcb-util",
-            "repo": "upstream:xcb-util",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "xterm",
-            "repo": "upstream:xterm",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libXaw",
-                "xorg-lib-libxkbfile"
-            ]
-        }
-    ]
-}
+name: x-armv7-versatile
+kind: stratum
+build-depends:
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-common
+  repo: baserock:baserock/morphs
+  ref: master
+chunks:
+- name: mesa-x
+  repo: upstream:mesa
+  ref: baserock/genivi/baseline-armv7-versatile
+  build-depends: []
+- name: xorg-lib-libxkbfile
+  repo: upstream:xorg-lib-libxkbfile
+  ref: baserock/morph
+  build-depends: []
+- name: pixman
+  repo: upstream:pixman
+  ref: baserock/morph
+  build-depends: []
+- name: xorg-font-util
+  repo: upstream:xorg-font-util
+  ref: baserock/morph
+  build-depends: []
+- name: xorg-lib-libfontenc
+  repo: upstream:xorg-lib-libfontenc
+  ref: baserock/morph
+  build-depends:
+  - xorg-font-util
+- name: freetype2
+  repo: upstream:freetype2
+  ref: baserock/morph
+  build-depends: []
+- name: fontconfig
+  repo: upstream:fontconfig
+  ref: baserock/morph
+  build-depends:
+  - freetype2
+- name: xorg-lib-libXfont
+  repo: upstream:xorg-lib-libXfont
+  ref: baserock/morph
+  build-depends:
+  - freetype2
+  - xorg-lib-libfontenc
+- name: xorg-lib-libICE
+  repo: upstream:xorg-lib-libICE
+  ref: baserock/morph
+  build-depends: []
+- name: xorg-lib-libSM
+  repo: upstream:xorg-lib-libSM
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libICE
+- name: xorg-lib-libXt
+  repo: upstream:xorg-lib-libXt
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libSM
+- name: xorg-lib-libXmu
+  repo: upstream:xorg-lib-libXmu
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libXt
+- name: xorg-lib-libXpm
+  repo: upstream:xorg-lib-libXpm
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libXt
+- name: xorg-lib-libXaw
+  repo: upstream:xorg-lib-libXaw
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libXmu
+  - xorg-lib-libXpm
+  - xorg-lib-libXt
+- name: libsha1
+  repo: upstream:libsha1
+  ref: baserock/morph
+  build-depends: []
+- name: xserver
+  repo: upstream:xserver
+  ref: baserock/morph
+  build-depends:
+  - libsha1
+  - mesa-x
+  - pixman
+  - xorg-font-util
+  - xorg-lib-libXaw
+  - xorg-lib-libXfont
+  - xorg-lib-libXmu
+  - xorg-lib-libXpm
+  - xorg-lib-libXt
+  - xorg-lib-libfontenc
+  - xorg-lib-libxkbfile
+- name: xorg-driver-xf86-video-cirrus
+  repo: upstream:xorg-driver-xf86-video-cirrus
+  ref: baserock/morph
+  build-depends:
+  - xserver
+- name: xorg-driver-xf86-video-fbdev
+  repo: upstream:xorg-driver-xf86-video-fbdev
+  ref: baserock/morph
+  build-depends:
+  - xserver
+- name: xorg-driver-xf86-video-vesa
+  repo: upstream:xorg-driver-xf86-video-vesa
+  ref: baserock/morph
+  build-depends:
+  - xserver
+- name: xorg-driver-xf86-input-evdev
+  repo: upstream:xorg-driver-xf86-input-evdev
+  ref: baserock/morph
+  build-depends:
+  - xserver
+- name: xorg-driver-xf86-input-keyboard
+  repo: upstream:xorg-driver-xf86-input-keyboard
+  ref: baserock/morph
+  build-depends:
+  - xserver
+- name: xorg-driver-xf86-input-mouse
+  repo: upstream:xorg-driver-xf86-input-mouse
+  ref: baserock/morph
+  build-depends:
+  - xserver
+- name: xorg-app-xkbcomp
+  repo: upstream:xorg-app-xkbcomp
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libxkbfile
+- name: xkeyboard-config
+  repo: upstream:xkeyboard-config
+  ref: baserock/morph
+  build-depends:
+  - xorg-app-xkbcomp
+- name: xorg-app-xinit
+  repo: upstream:xorg-app-xinit
+  ref: baserock/morph
+  build-depends: []
+- name: xorg-lib-libXft
+  repo: upstream:xorg-lib-libXft
+  ref: baserock/morph
+  build-depends:
+  - fontconfig
+  - freetype2
+- name: xcb-util
+  repo: upstream:xcb-util
+  ref: baserock/morph
+  build-depends: []
+- name: xterm
+  repo: upstream:xterm
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libXaw
+  - xorg-lib-libxkbfile
diff --git a/x-common.morph b/x-common.morph
index 4b09f41..586fb41 100644
--- a/x-common.morph
+++ b/x-common.morph
@@ -1,495 +1,338 @@
-{
-    "name": "x-common",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "llvm",
-            "repo": "upstream:llvm",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "libpng",
-            "repo": "upstream:libpng",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "libjpeg",
-            "repo": "upstream:libjpeg",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "xorg-util-macros",
-            "repo": "upstream:xorg-util-macros",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "xorg-proto-bigreqsproto",
-            "repo": "upstream:xorg-proto-bigreqsproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-compositeproto",
-            "repo": "upstream:xorg-proto-compositeproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-damageproto",
-            "repo": "upstream:xorg-proto-damageproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-dmxproto",
-            "repo": "upstream:xorg-proto-dmxproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-fixesproto",
-            "repo": "upstream:xorg-proto-fixesproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-fontsproto",
-            "repo": "upstream:xorg-proto-fontsproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-glproto",
-            "repo": "upstream:xorg-proto-glproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-inputproto",
-            "repo": "upstream:xorg-proto-inputproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-kbproto",
-            "repo": "upstream:xorg-proto-kbproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-xineramaproto",
-            "repo": "upstream:xorg-proto-xineramaproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-randrproto",
-            "repo": "upstream:xorg-proto-randrproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-recordproto",
-            "repo": "upstream:xorg-proto-recordproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-renderproto",
-            "repo": "upstream:xorg-proto-renderproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-resourceproto",
-            "repo": "upstream:xorg-proto-resourceproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-scrnsaverproto",
-            "repo": "upstream:xorg-proto-scrnsaverproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-videoproto",
-            "repo": "upstream:xorg-proto-videoproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-xcmiscproto",
-            "repo": "upstream:xorg-proto-xcmiscproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-xextproto",
-            "repo": "upstream:xorg-proto-xextproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-xf86bigfontproto",
-            "repo": "upstream:xorg-proto-xf86bigfontproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-xf86dgaproto",
-            "repo": "upstream:xorg-proto-xf86dgaproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-xf86driproto",
-            "repo": "upstream:xorg-proto-xf86driproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-xf86vidmodeproto",
-            "repo": "upstream:xorg-proto-xf86vidmodeproto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-x11proto",
-            "repo": "upstream:xorg-proto-x11proto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-proto-dri2proto",
-            "repo": "upstream:xorg-proto-dri2proto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xcb-pthread-stubs",
-            "repo": "upstream:xcb-pthread-stubs",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xcb-proto",
-            "repo": "upstream:xcb-proto",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXau",
-            "repo": "upstream:xorg-lib-libXau",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-proto-x11proto",
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xcb-libxcb",
-            "repo": "upstream:xcb-libxcb",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xcb-proto",
-                "xcb-pthread-stubs",
-                "xorg-lib-libXau",
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-lib-libxtrans",
-            "repo": "upstream:xorg-lib-libxtrans",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-lib-libX11",
-            "repo": "upstream:xorg-lib-libX11",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xcb-libxcb",
-                "xorg-lib-libXau",
-                "xorg-lib-libxtrans",
-                "xorg-proto-bigreqsproto",
-                "xorg-proto-inputproto",
-                "xorg-proto-kbproto",
-                "xorg-proto-x11proto",
-                "xorg-proto-xcmiscproto",
-                "xorg-proto-xextproto",
-                "xorg-proto-xf86bigfontproto",
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-lib-libpciaccess",
-            "repo": "upstream:xorg-lib-libpciaccess",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "drm",
-            "repo": "upstream:drm",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xcb-pthread-stubs",
-                "xorg-lib-libpciaccess"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXext",
-            "repo": "upstream:xorg-lib-libXext",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libX11",
-                "xorg-lib-libXau",
-                "xorg-proto-x11proto",
-                "xorg-proto-xextproto",
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXi",
-            "repo": "upstream:xorg-lib-libXi",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libX11",
-                "xorg-lib-libXext",
-                "xorg-proto-inputproto",
-                "xorg-proto-x11proto",
-                "xorg-proto-xextproto",
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-util-makedepend",
-            "repo": "upstream:xorg-util-makedepend",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-proto-x11proto",
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXfixes",
-            "repo": "upstream:xorg-lib-libXfixes",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libXext",
-                "xorg-proto-fixesproto",
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXcomposite",
-            "repo": "upstream:xorg-lib-libXcomposite",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libX11",
-                "xorg-lib-libXfixes",
-                "xorg-proto-compositeproto",
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXrender",
-            "repo": "upstream:xorg-lib-libXrender",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libX11",
-                "xorg-proto-renderproto",
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXrandr",
-            "repo": "upstream:xorg-lib-libXrandr",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libX11",
-                "xorg-lib-libXext",
-                "xorg-lib-libXrender",
-                "xorg-proto-randrproto",
-                "xorg-proto-renderproto",
-                "xorg-proto-xextproto",
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXinerama",
-            "repo": "upstream:xorg-lib-libXinerama",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libX11",
-                "xorg-lib-libXext",
-                "xorg-proto-xextproto",
-                "xorg-proto-xineramaproto",
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-lib-libdmx",
-            "repo": "upstream:xorg-lib-libdmx",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libX11",
-                "xorg-lib-libXext",
-                "xorg-proto-dmxproto",
-                "xorg-proto-xextproto",
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXtst",
-            "repo": "upstream:xorg-lib-libXtst",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libX11",
-                "xorg-lib-libXext",
-                "xorg-lib-libXi",
-                "xorg-proto-inputproto",
-                "xorg-proto-recordproto",
-                "xorg-proto-xextproto",
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXRes",
-            "repo": "upstream:xorg-lib-libXRes",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libX11",
-                "xorg-lib-libXext",
-                "xorg-proto-resourceproto",
-                "xorg-proto-xextproto",
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXdamage",
-            "repo": "upstream:xorg-lib-libXdamage",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libXfixes",
-                "xorg-proto-damageproto",
-                "xorg-util-macros"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXcursor",
-            "repo": "upstream:xorg-lib-libXcursor",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-util-macros", 
-                "xorg-lib-libXrender",
-                "xorg-lib-libXfixes",
-                "xorg-proto-fixesproto",
-                "xorg-lib-libXau",
-                "xorg-lib-libX11"]
-        },
-        {
-            "name": "xorg-proto-printproto",
-            "repo": "upstream:xorg-proto-printproto",
-            "ref": "baserock/morph",
-            "build-depends": ["xorg-util-macros"]
-        },
-        {
-            "name": "xorg-lib-libXp",
-            "repo": "upstream:xorg-lib-libXp",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-proto-printproto",
-                "xorg-proto-xextproto",
-                "xorg-lib-libXext",
-                "xorg-lib-libX11"]
-        },
-        {
-            "name": "xorg-lib-libXScrnSaver",
-            "repo": "upstream:xorg-lib-libXScrnSaver",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-proto-scrnsaverproto",
-                "xorg-proto-xextproto",
-                "xorg-lib-libXext",
-                "xorg-lib-libX11"]
-        }
-    ]
-}
+name: x-common
+kind: stratum
+build-depends:
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
+chunks:
+- name: llvm
+  repo: upstream:llvm
+  ref: baserock/morph
+  build-depends: []
+- name: libpng
+  repo: upstream:libpng
+  ref: baserock/morph
+  build-depends: []
+- name: libjpeg
+  repo: upstream:libjpeg
+  ref: baserock/morph
+  build-depends: []
+- name: xorg-util-macros
+  repo: upstream:xorg-util-macros
+  ref: baserock/morph
+  build-depends: []
+- name: xorg-proto-bigreqsproto
+  repo: upstream:xorg-proto-bigreqsproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-compositeproto
+  repo: upstream:xorg-proto-compositeproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-damageproto
+  repo: upstream:xorg-proto-damageproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-dmxproto
+  repo: upstream:xorg-proto-dmxproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-fixesproto
+  repo: upstream:xorg-proto-fixesproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-fontsproto
+  repo: upstream:xorg-proto-fontsproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-glproto
+  repo: upstream:xorg-proto-glproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-inputproto
+  repo: upstream:xorg-proto-inputproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-kbproto
+  repo: upstream:xorg-proto-kbproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-xineramaproto
+  repo: upstream:xorg-proto-xineramaproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-randrproto
+  repo: upstream:xorg-proto-randrproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-recordproto
+  repo: upstream:xorg-proto-recordproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-renderproto
+  repo: upstream:xorg-proto-renderproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-resourceproto
+  repo: upstream:xorg-proto-resourceproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-scrnsaverproto
+  repo: upstream:xorg-proto-scrnsaverproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-videoproto
+  repo: upstream:xorg-proto-videoproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-xcmiscproto
+  repo: upstream:xorg-proto-xcmiscproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-xextproto
+  repo: upstream:xorg-proto-xextproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-xf86bigfontproto
+  repo: upstream:xorg-proto-xf86bigfontproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-xf86dgaproto
+  repo: upstream:xorg-proto-xf86dgaproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-xf86driproto
+  repo: upstream:xorg-proto-xf86driproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-xf86vidmodeproto
+  repo: upstream:xorg-proto-xf86vidmodeproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-x11proto
+  repo: upstream:xorg-proto-x11proto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-proto-dri2proto
+  repo: upstream:xorg-proto-dri2proto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xcb-pthread-stubs
+  repo: upstream:xcb-pthread-stubs
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xcb-proto
+  repo: upstream:xcb-proto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-lib-libXau
+  repo: upstream:xorg-lib-libXau
+  ref: baserock/morph
+  build-depends:
+  - xorg-proto-x11proto
+  - xorg-util-macros
+- name: xcb-libxcb
+  repo: upstream:xcb-libxcb
+  ref: baserock/morph
+  build-depends:
+  - xcb-proto
+  - xcb-pthread-stubs
+  - xorg-lib-libXau
+  - xorg-util-macros
+- name: xorg-lib-libxtrans
+  repo: upstream:xorg-lib-libxtrans
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-lib-libX11
+  repo: upstream:xorg-lib-libX11
+  ref: baserock/morph
+  build-depends:
+  - xcb-libxcb
+  - xorg-lib-libXau
+  - xorg-lib-libxtrans
+  - xorg-proto-bigreqsproto
+  - xorg-proto-inputproto
+  - xorg-proto-kbproto
+  - xorg-proto-x11proto
+  - xorg-proto-xcmiscproto
+  - xorg-proto-xextproto
+  - xorg-proto-xf86bigfontproto
+  - xorg-util-macros
+- name: xorg-lib-libpciaccess
+  repo: upstream:xorg-lib-libpciaccess
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: drm
+  repo: upstream:drm
+  ref: baserock/morph
+  build-depends:
+  - xcb-pthread-stubs
+  - xorg-lib-libpciaccess
+- name: xorg-lib-libXext
+  repo: upstream:xorg-lib-libXext
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libX11
+  - xorg-lib-libXau
+  - xorg-proto-x11proto
+  - xorg-proto-xextproto
+  - xorg-util-macros
+- name: xorg-lib-libXi
+  repo: upstream:xorg-lib-libXi
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libX11
+  - xorg-lib-libXext
+  - xorg-proto-inputproto
+  - xorg-proto-x11proto
+  - xorg-proto-xextproto
+  - xorg-util-macros
+- name: xorg-util-makedepend
+  repo: upstream:xorg-util-makedepend
+  ref: baserock/morph
+  build-depends:
+  - xorg-proto-x11proto
+  - xorg-util-macros
+- name: xorg-lib-libXfixes
+  repo: upstream:xorg-lib-libXfixes
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libXext
+  - xorg-proto-fixesproto
+  - xorg-util-macros
+- name: xorg-lib-libXcomposite
+  repo: upstream:xorg-lib-libXcomposite
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libX11
+  - xorg-lib-libXfixes
+  - xorg-proto-compositeproto
+  - xorg-util-macros
+- name: xorg-lib-libXrender
+  repo: upstream:xorg-lib-libXrender
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libX11
+  - xorg-proto-renderproto
+  - xorg-util-macros
+- name: xorg-lib-libXrandr
+  repo: upstream:xorg-lib-libXrandr
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libX11
+  - xorg-lib-libXext
+  - xorg-lib-libXrender
+  - xorg-proto-randrproto
+  - xorg-proto-renderproto
+  - xorg-proto-xextproto
+  - xorg-util-macros
+- name: xorg-lib-libXinerama
+  repo: upstream:xorg-lib-libXinerama
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libX11
+  - xorg-lib-libXext
+  - xorg-proto-xextproto
+  - xorg-proto-xineramaproto
+  - xorg-util-macros
+- name: xorg-lib-libdmx
+  repo: upstream:xorg-lib-libdmx
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libX11
+  - xorg-lib-libXext
+  - xorg-proto-dmxproto
+  - xorg-proto-xextproto
+  - xorg-util-macros
+- name: xorg-lib-libXtst
+  repo: upstream:xorg-lib-libXtst
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libX11
+  - xorg-lib-libXext
+  - xorg-lib-libXi
+  - xorg-proto-inputproto
+  - xorg-proto-recordproto
+  - xorg-proto-xextproto
+  - xorg-util-macros
+- name: xorg-lib-libXRes
+  repo: upstream:xorg-lib-libXRes
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libX11
+  - xorg-lib-libXext
+  - xorg-proto-resourceproto
+  - xorg-proto-xextproto
+  - xorg-util-macros
+- name: xorg-lib-libXdamage
+  repo: upstream:xorg-lib-libXdamage
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libXfixes
+  - xorg-proto-damageproto
+  - xorg-util-macros
+- name: xorg-lib-libXcursor
+  repo: upstream:xorg-lib-libXcursor
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+  - xorg-lib-libXrender
+  - xorg-lib-libXfixes
+  - xorg-proto-fixesproto
+  - xorg-lib-libXau
+  - xorg-lib-libX11
+- name: xorg-proto-printproto
+  repo: upstream:xorg-proto-printproto
+  ref: baserock/morph
+  build-depends:
+  - xorg-util-macros
+- name: xorg-lib-libXp
+  repo: upstream:xorg-lib-libXp
+  ref: baserock/morph
+  build-depends:
+  - xorg-proto-printproto
+  - xorg-proto-xextproto
+  - xorg-lib-libXext
+  - xorg-lib-libX11
+- name: xorg-lib-libXScrnSaver
+  repo: upstream:xorg-lib-libXScrnSaver
+  ref: baserock/morph
+  build-depends:
+  - xorg-proto-scrnsaverproto
+  - xorg-proto-xextproto
+  - xorg-lib-libXext
+  - xorg-lib-libX11
diff --git a/x-x86_64-generic.morph b/x-x86_64-generic.morph
index 440a01f..d5f2e0b 100644
--- a/x-x86_64-generic.morph
+++ b/x-x86_64-generic.morph
@@ -1,281 +1,184 @@
-{
-    "name": "x-x86_64-generic",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "core",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "genivi-foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        },
-        {
-            "morph": "x-common",
-            "repo": "baserock:baserock/morphs",
-            "ref": "master"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "mesa-x",
-            "repo": "upstream:mesa",
-            "ref": "baserock/genivi/morph",
-            "build-depends": []
-        },
-        {
-            "name": "xorg-lib-libxkbfile",
-            "repo": "upstream:xorg-lib-libxkbfile",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "pixman",
-            "repo": "upstream:pixman",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "xorg-font-util",
-            "repo": "upstream:xorg-font-util",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "xorg-lib-libfontenc",
-            "repo": "upstream:xorg-lib-libfontenc",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-font-util"
-            ]
-        },
-        {
-            "name": "freetype2",
-            "repo": "upstream:freetype2",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "fontconfig",
-            "repo": "upstream:fontconfig",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "freetype2"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXfont",
-            "repo": "upstream:xorg-lib-libXfont",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "freetype2",
-                "xorg-lib-libfontenc"
-            ]
-        },
-        {                           
-            "name": "freefont-otf",
-            "repo": "upstream:freefont-otf",
-            "ref": "baserock/morph",        
-            "build-depends": []             
-        },
-        {
-            "name": "xorg-lib-libICE",
-            "repo": "upstream:xorg-lib-libICE",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "xorg-lib-libSM",
-            "repo": "upstream:xorg-lib-libSM",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libICE"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXt",
-            "repo": "upstream:xorg-lib-libXt",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libSM"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXmu",
-            "repo": "upstream:xorg-lib-libXmu",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libXt"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXpm",
-            "repo": "upstream:xorg-lib-libXpm",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libXt"
-            ]
-        },
-        {
-            "name": "xorg-lib-libXaw",
-            "repo": "upstream:xorg-lib-libXaw",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libXmu",
-                "xorg-lib-libXpm",
-                "xorg-lib-libXt"
-            ]
-        },
-        {
-            "name": "libsha1",
-            "repo": "upstream:libsha1",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "xserver",
-            "repo": "upstream:xserver",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "libsha1",
-                "mesa-x",
-                "pixman",
-                "xorg-font-util",
-                "xorg-lib-libXaw",
-                "xorg-lib-libXfont",
-                "xorg-lib-libXmu",
-                "xorg-lib-libXpm",
-                "xorg-lib-libXt",
-                "xorg-lib-libfontenc",
-                "xorg-lib-libxkbfile"
-            ]
-        },
-        {
-            "name": "xorg-driver-xf86-video-cirrus",
-            "repo": "upstream:xorg-driver-xf86-video-cirrus",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xserver"
-            ]
-        },
-        {
-            "name": "xorg-driver-xf86-video-fbdev",
-            "repo": "upstream:xorg-driver-xf86-video-fbdev",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xserver"
-            ]
-        },
-        {
-            "name": "xorg-driver-xf86-video-vesa",
-            "repo": "upstream:xorg-driver-xf86-video-vesa",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xserver"
-            ]
-        },
-        {
-            "name": "xorg-driver-xf86-input-evdev",
-            "repo": "upstream:xorg-driver-xf86-input-evdev",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xserver"
-            ]
-        },
-        {
-            "name": "xorg-driver-xf86-input-keyboard",
-            "repo": "upstream:xorg-driver-xf86-input-keyboard",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xserver"
-            ]
-        },
-        {
-            "name": "xorg-driver-xf86-input-mouse",
-            "repo": "upstream:xorg-driver-xf86-input-mouse",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xserver"
-            ]
-        },
-        {
-            "name": "xorg-app-xkbcomp",
-            "repo": "upstream:xorg-app-xkbcomp",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libxkbfile"
-            ]
-        },
-        {
-            "name": "xkeyboard-config",
-            "repo": "upstream:xkeyboard-config",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-app-xkbcomp"
-            ]
-        },
-        {
-            "name": "xorg-app-xinit",
-            "repo": "upstream:xorg-app-xinit",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "xorg-lib-libXft",
-            "repo": "upstream:xorg-lib-libXft",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "fontconfig",
-                "freetype2"
-            ]
-        },
-        {
-            "name": "xcb-util",
-            "repo": "upstream:xcb-util",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-	{
-	    "name": "util-wm",
-            "repo": "upstream:util-wm",
-            "ref": "baserock/morph",
-            "build-depends": []
-	},
-	{
-            "name": "util-keysyms",
-            "repo": "upstream:util-keysyms",
-            "ref": "baserock/morph",
-            "build-depends": []
-	},
-	{
-            "name": "util-image",
-            "repo": "upstream:util-image",
-            "ref": "baserock/morph",
-            "build-depends": ["xcb-util"]
-	},
-        {
-            "name": "xterm",
-            "repo": "upstream:xterm",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libXaw",
-                "xorg-lib-libxkbfile"
-            ]
-        },
-        {              
-            "name": "xorg-app-xauth",
-            "repo": "upstream:xorg-app-xauth",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "xorg-lib-libXmu"
-            ]                                  
-        }
-    ]
-}
+name: x-x86_64-generic
+kind: stratum
+build-depends:
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: genivi-foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: x-common
+  repo: baserock:baserock/morphs
+  ref: master
+chunks:
+- name: mesa-x
+  repo: upstream:mesa
+  ref: baserock/genivi/morph
+  build-depends: []
+- name: xorg-lib-libxkbfile
+  repo: upstream:xorg-lib-libxkbfile
+  ref: baserock/morph
+  build-depends: []
+- name: pixman
+  repo: upstream:pixman
+  ref: baserock/morph
+  build-depends: []
+- name: xorg-font-util
+  repo: upstream:xorg-font-util
+  ref: baserock/morph
+  build-depends: []
+- name: xorg-lib-libfontenc
+  repo: upstream:xorg-lib-libfontenc
+  ref: baserock/morph
+  build-depends:
+  - xorg-font-util
+- name: freetype2
+  repo: upstream:freetype2
+  ref: baserock/morph
+  build-depends: []
+- name: fontconfig
+  repo: upstream:fontconfig
+  ref: baserock/morph
+  build-depends:
+  - freetype2
+- name: xorg-lib-libXfont
+  repo: upstream:xorg-lib-libXfont
+  ref: baserock/morph
+  build-depends:
+  - freetype2
+  - xorg-lib-libfontenc
+- name: freefont-otf
+  repo: upstream:freefont-otf
+  ref: baserock/morph
+  build-depends: []
+- name: xorg-lib-libICE
+  repo: upstream:xorg-lib-libICE
+  ref: baserock/morph
+  build-depends: []
+- name: xorg-lib-libSM
+  repo: upstream:xorg-lib-libSM
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libICE
+- name: xorg-lib-libXt
+  repo: upstream:xorg-lib-libXt
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libSM
+- name: xorg-lib-libXmu
+  repo: upstream:xorg-lib-libXmu
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libXt
+- name: xorg-lib-libXpm
+  repo: upstream:xorg-lib-libXpm
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libXt
+- name: xorg-lib-libXaw
+  repo: upstream:xorg-lib-libXaw
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libXmu
+  - xorg-lib-libXpm
+  - xorg-lib-libXt
+- name: libsha1
+  repo: upstream:libsha1
+  ref: baserock/morph
+  build-depends: []
+- name: xserver
+  repo: upstream:xserver
+  ref: baserock/morph
+  build-depends:
+  - libsha1
+  - mesa-x
+  - pixman
+  - xorg-font-util
+  - xorg-lib-libXaw
+  - xorg-lib-libXfont
+  - xorg-lib-libXmu
+  - xorg-lib-libXpm
+  - xorg-lib-libXt
+  - xorg-lib-libfontenc
+  - xorg-lib-libxkbfile
+- name: xorg-driver-xf86-video-cirrus
+  repo: upstream:xorg-driver-xf86-video-cirrus
+  ref: baserock/morph
+  build-depends:
+  - xserver
+- name: xorg-driver-xf86-video-fbdev
+  repo: upstream:xorg-driver-xf86-video-fbdev
+  ref: baserock/morph
+  build-depends:
+  - xserver
+- name: xorg-driver-xf86-video-vesa
+  repo: upstream:xorg-driver-xf86-video-vesa
+  ref: baserock/morph
+  build-depends:
+  - xserver
+- name: xorg-driver-xf86-input-evdev
+  repo: upstream:xorg-driver-xf86-input-evdev
+  ref: baserock/morph
+  build-depends:
+  - xserver
+- name: xorg-driver-xf86-input-keyboard
+  repo: upstream:xorg-driver-xf86-input-keyboard
+  ref: baserock/morph
+  build-depends:
+  - xserver
+- name: xorg-driver-xf86-input-mouse
+  repo: upstream:xorg-driver-xf86-input-mouse
+  ref: baserock/morph
+  build-depends:
+  - xserver
+- name: xorg-app-xkbcomp
+  repo: upstream:xorg-app-xkbcomp
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libxkbfile
+- name: xkeyboard-config
+  repo: upstream:xkeyboard-config
+  ref: baserock/morph
+  build-depends:
+  - xorg-app-xkbcomp
+- name: xorg-app-xinit
+  repo: upstream:xorg-app-xinit
+  ref: baserock/morph
+  build-depends: []
+- name: xorg-lib-libXft
+  repo: upstream:xorg-lib-libXft
+  ref: baserock/morph
+  build-depends:
+  - fontconfig
+  - freetype2
+- name: xcb-util
+  repo: upstream:xcb-util
+  ref: baserock/morph
+  build-depends: []
+- name: util-wm
+  repo: upstream:util-wm
+  ref: baserock/morph
+  build-depends: []
+- name: util-keysyms
+  repo: upstream:util-keysyms
+  ref: baserock/morph
+  build-depends: []
+- name: util-image
+  repo: upstream:util-image
+  ref: baserock/morph
+  build-depends:
+  - xcb-util
+- name: xterm
+  repo: upstream:xterm
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libXaw
+  - xorg-lib-libxkbfile
+- name: xorg-app-xauth
+  repo: upstream:xorg-app-xauth
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libXmu