Merge remote-tracking branch 'origin/master' into baserock/samthursfield/highbank-be

Conflicts:
	build-essential.morph
	build-essential.morph.yaml

24 files changed, 2045 insertions, 78 deletions

diff --git a/audio-bluetooth.morph b/audio-bluetooth.morph
new file mode 100644
index 0000000..69b0472
--- /dev/null
+++ b/audio-bluetooth.morph
@@ -0,0 +1,128 @@
+{
+    "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/build-essential.morph b/build-essential.morph
index 3153bb8..3fa11a1 100644
--- a/build-essential.morph
+++ b/build-essential.morph
@@ -6,7 +6,7 @@
         {
             "name": "stage1-binutils",
             "repo": "upstream:binutils-redhat",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "baserock/build-essential",
             "build-mode": "bootstrap",
             "prefix": "/tools",
             "build-depends": []
@@ -14,7 +14,7 @@
         {
             "name": "stage1-gcc",
             "repo": "upstream:gcc-tarball",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "baserock/build-essential",
             "build-mode": "bootstrap",
             "prefix": "/tools",
             "build-depends": [
@@ -24,7 +24,7 @@
         {
             "name": "stage2-linux-api-headers",
             "repo": "upstream:linux",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "baserock/build-essential",
             "build-mode": "bootstrap",
             "prefix": "/tools",
             "build-depends": [
@@ -35,7 +35,7 @@
         {
             "name": "stage2-eglibc",
             "repo": "upstream:eglibc2",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "baserock/2.15-build-essential",
             "build-mode": "bootstrap",
             "prefix": "/tools",
             "build-depends": [
@@ -45,33 +45,47 @@
             ]
         },
         {
+            "name": "stage2-zlib",
+            "repo": "upstream:zlib",
+            "ref": "baserock/build-essential",
+            "build-mode": "bootstrap",
+            "prefix": "/tools",
+            "build-depends": [
+                "stage1-binutils",
+                "stage1-gcc",
+                "stage2-eglibc"
+            ]
+        },
+        {
             "name": "stage2-binutils",
             "repo": "upstream:binutils-redhat",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "baserock/build-essential",
             "build-mode": "bootstrap",
             "prefix": "/tools",
             "build-depends": [
                 "stage1-binutils",
                 "stage1-gcc",
-                "stage2-eglibc"
+                "stage2-eglibc",
+                "stage2-zlib"
             ]
         },
         {
             "name": "stage2-gcc",
             "repo": "upstream:gcc-tarball",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "baserock/build-essential",
             "build-mode": "bootstrap",
             "prefix": "/tools",
             "build-depends": [
                 "stage1-binutils",
                 "stage1-gcc",
-                "stage2-eglibc"
+                "stage2-eglibc",
+                "stage2-zlib"
             ]
         },
         {
             "name": "stage2-busybox",
             "repo": "upstream:busybox",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "baserock/build-essential",
             "build-mode": "bootstrap",
             "prefix": "/tools",
             "build-depends": [
@@ -83,7 +97,7 @@
         {
             "name": "stage2-fhs-dirs",
             "repo": "baserock:baserock/fhs-dirs",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "master",
             "build-mode": "bootstrap",
             "prefix": "/tools",
             "build-depends": []
@@ -91,7 +105,7 @@
         {
             "name": "stage2-gawk",
             "repo": "upstream:gawk",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "baserock/build-essential",
             "build-mode": "bootstrap",
             "prefix": "/tools",
             "build-depends": [
@@ -103,7 +117,7 @@
         {
             "name": "stage2-make",
             "repo": "upstream:make",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "baserock/build-essential",
             "build-mode": "bootstrap",
             "prefix": "/tools",
             "build-depends": [
@@ -115,7 +129,7 @@
         {
             "name": "fhs-dirs",
             "repo": "baserock:baserock/fhs-dirs",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "master",
             "build-mode": "staging",
             "prefix": "/usr",
             "build-depends": [
@@ -126,13 +140,14 @@
                 "stage2-gawk",
                 "stage2-gcc",
                 "stage2-linux-api-headers",
-                "stage2-make"
+                "stage2-make",
+                "stage2-zlib"
             ]
         },
         {
             "name": "linux-api-headers",
             "repo": "upstream:linux",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "baserock/build-essential",
             "build-mode": "staging",
             "prefix": "/usr",
             "build-depends": [
@@ -143,7 +158,8 @@
                 "stage2-gawk",
                 "stage2-gcc",
                 "stage2-linux-api-headers",
-                "stage2-make"
+                "stage2-make",
+                "stage2-zlib"
             ]
         },
         {
@@ -161,13 +177,33 @@
                 "stage2-gcc",
                 "stage2-linux-api-headers",
                 "stage2-make",
+                "stage2-zlib",
                 "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",
+                "stage2-zlib",
+                "eglibc"
+            ]
+        },
+        {
             "name": "binutils",
             "repo": "upstream:binutils-redhat",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "baserock/build-essential",
             "build-mode": "staging",
             "prefix": "/usr",
             "build-depends": [
@@ -179,13 +215,15 @@
                 "stage2-gcc",
                 "stage2-linux-api-headers",
                 "stage2-make",
-                "eglibc"
+                "stage2-zlib",
+                "eglibc",
+                "zlib"
             ]
         },
         {
             "name": "busybox",
             "repo": "upstream:busybox",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "baserock/build-essential",
             "build-mode": "staging",
             "prefix": "/usr",
             "build-depends": [
@@ -197,13 +235,14 @@
                 "stage2-gcc",
                 "stage2-linux-api-headers",
                 "stage2-make",
+                "stage2-zlib",
                 "eglibc"
             ]
         },
         {
             "name": "gawk",
             "repo": "upstream:gawk",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "baserock/build-essential",
             "build-mode": "staging",
             "prefix": "/usr",
             "build-depends": [
@@ -215,13 +254,14 @@
                 "stage2-gcc",
                 "stage2-linux-api-headers",
                 "stage2-make",
+                "stage2-zlib",
                 "eglibc"
             ]
         },
         {
             "name": "gcc",
             "repo": "upstream:gcc-tarball",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "baserock/build-essential",
             "build-mode": "staging",
             "prefix": "/usr",
             "build-depends": [
@@ -233,13 +273,15 @@
                 "stage2-gcc",
                 "stage2-linux-api-headers",
                 "stage2-make",
-                "eglibc"
+                "stage2-zlib",
+                "eglibc",
+                "zlib"
             ]
         },
         {
             "name": "make",
             "repo": "upstream:make",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "baserock/build-essential",
             "build-mode": "staging",
             "prefix": "/usr",
             "build-depends": [
@@ -251,13 +293,14 @@
                 "stage2-gcc",
                 "stage2-linux-api-headers",
                 "stage2-make",
+                "stage2-zlib",
                 "eglibc"
             ]
         },
         {
             "name": "ccache",
             "repo": "upstream:ccache",
-            "ref": "baserock/samthursfield/build-essential-2",
+            "ref": "baserock/build-essential",
             "build-mode": "staging",
             "prefix": "/usr",
             "build-depends": [
@@ -269,7 +312,9 @@
                 "stage2-gcc",
                 "stage2-linux-api-headers",
                 "stage2-make",
-                "eglibc"
+                "stage2-zlib",
+                "eglibc",
+                "zlib"
             ]
         }
     ]
diff --git a/build-essential.morph.yaml b/build-essential.morph.yaml
index 873a30a..f2bd1ac 100644
--- a/build-essential.morph.yaml
+++ b/build-essential.morph.yaml
@@ -12,14 +12,14 @@ chunks:
 
     - name: stage1-binutils
       repo: upstream:binutils-redhat
-      ref: baserock/samthursfield/build-essential-2
+      ref: baserock/build-essential
       build-mode: bootstrap
       prefix: /tools
       build-depends: []
 
     - name: stage1-gcc
       repo: upstream:gcc-tarball
-      ref: baserock/samthursfield/build-essential-2
+      ref: baserock/build-essential
       build-mode: bootstrap
       prefix: /tools
       build-depends:
@@ -35,7 +35,7 @@ chunks:
 
     - name: stage2-linux-api-headers
       repo: upstream:linux
-      ref: baserock/samthursfield/build-essential-2
+      ref: baserock/build-essential
       build-mode: bootstrap
       prefix: /tools
       build-depends:
@@ -44,7 +44,7 @@ chunks:
 
     - name: stage2-eglibc
       repo: upstream:eglibc2
-      ref: baserock/samthursfield/build-essential-2
+      ref: baserock/2.15-build-essential
       build-mode: bootstrap
       prefix: /tools
       build-depends:
@@ -52,29 +52,41 @@ chunks:
           - stage1-gcc
           - stage2-linux-api-headers
 
+    - name: stage2-zlib
+      repo: upstream:zlib
+      ref: baserock/build-essential
+      build-mode: bootstrap
+      prefix: /tools
+      build-depends:
+          - stage1-binutils
+          - stage1-gcc
+          - stage2-eglibc
+
     - name: stage2-binutils
       repo: upstream:binutils-redhat
-      ref: baserock/samthursfield/build-essential-2
+      ref: baserock/build-essential
       build-mode: bootstrap
       prefix: /tools
       build-depends:
           - stage1-binutils
           - stage1-gcc
           - stage2-eglibc
+          - stage2-zlib
 
     - name: stage2-gcc
       repo: upstream:gcc-tarball
-      ref: baserock/samthursfield/build-essential-2
+      ref: baserock/build-essential
       build-mode: bootstrap
       prefix: /tools
       build-depends:
           - stage1-binutils
           - stage1-gcc
           - stage2-eglibc
+          - stage2-zlib
 
     - name: stage2-busybox
       repo: upstream:busybox
-      ref: baserock/samthursfield/build-essential-2
+      ref: baserock/build-essential
       build-mode: bootstrap
       prefix: /tools
       build-depends:
@@ -84,14 +96,14 @@ chunks:
 
     - name: stage2-fhs-dirs
       repo: baserock:baserock/fhs-dirs
-      ref: baserock/samthursfield/build-essential-2 
+      ref: master
       build-mode: bootstrap
       prefix: /tools
       build-depends: []
 
     - name: stage2-gawk
       repo: upstream:gawk
-      ref: baserock/samthursfield/build-essential-2
+      ref: baserock/build-essential
       build-mode: bootstrap
       prefix: /tools
       build-depends:
@@ -101,7 +113,7 @@ chunks:
 
     - name: stage2-make
       repo: upstream:make
-      ref: baserock/samthursfield/build-essential-2
+      ref: baserock/build-essential
       build-mode: bootstrap
       prefix: /tools
       build-depends:
@@ -127,7 +139,7 @@ chunks:
 
     - name: fhs-dirs
       repo: baserock:baserock/fhs-dirs
-      ref: baserock/samthursfield/build-essential-2
+      ref: master
       build-mode: staging
       prefix: /usr
       build-depends:
@@ -139,10 +151,11 @@ chunks:
           - stage2-gcc
           - stage2-linux-api-headers
           - stage2-make
+          - stage2-zlib
 
     - name: linux-api-headers
       repo: upstream:linux
-      ref: baserock/samthursfield/build-essential-2
+      ref: baserock/build-essential
       build-mode: staging
       prefix: /usr
       build-depends:
@@ -154,6 +167,7 @@ chunks:
           - stage2-gcc
           - stage2-linux-api-headers
           - stage2-make
+          - stage2-zlib
 
     - name: eglibc
       repo: upstream:eglibc2
@@ -169,11 +183,29 @@ chunks:
           - stage2-gcc
           - stage2-linux-api-headers
           - stage2-make
+          - stage2-zlib
           - 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
+          - stage2-zlib
+          - eglibc
+
     - name: binutils
       repo: upstream:binutils-redhat
-      ref: baserock/samthursfield/build-essential-2
+      ref: baserock/build-essential
       build-mode: staging
       prefix: /usr
       build-depends:
@@ -185,11 +217,13 @@ chunks:
           - stage2-gcc
           - stage2-linux-api-headers
           - stage2-make
+          - stage2-zlib
           - eglibc
+          - zlib
 
     - name: busybox
       repo: upstream:busybox
-      ref: baserock/samthursfield/build-essential-2
+      ref: baserock/build-essential
       build-mode: staging
       prefix: /usr
       build-depends:
@@ -201,11 +235,12 @@ chunks:
           - stage2-gcc
           - stage2-linux-api-headers
           - stage2-make
+          - stage2-zlib
           - eglibc
 
     - name: gawk
       repo: upstream:gawk
-      ref: baserock/samthursfield/build-essential-2
+      ref: baserock/build-essential
       build-mode: staging
       prefix: /usr
       build-depends:
@@ -217,11 +252,12 @@ chunks:
           - stage2-gcc
           - stage2-linux-api-headers
           - stage2-make
+          - stage2-zlib
           - eglibc
 
     - name: gcc
       repo: upstream:gcc-tarball
-      ref: baserock/samthursfield/build-essential-2
+      ref: baserock/build-essential
       build-mode: staging
       prefix: /usr
       build-depends:
@@ -233,11 +269,13 @@ chunks:
           - stage2-gcc
           - stage2-linux-api-headers
           - stage2-make
+          - stage2-zlib
           - eglibc
+          - zlib
 
     - name: make
       repo: upstream:make
-      ref: baserock/samthursfield/build-essential-2
+      ref: baserock/build-essential
       build-mode: staging
       prefix: /usr
       build-depends:
@@ -249,13 +287,14 @@ chunks:
           - stage2-gcc
           - stage2-linux-api-headers
           - stage2-make
+          - stage2-zlib
           - eglibc
 
     # Extras that need to be in build-essential but don't need bootstrapping.
 
     - name: ccache
       repo: upstream:ccache
-      ref: baserock/samthursfield/build-essential-2
+      ref: baserock/build-essential
       build-mode: staging
       prefix: /usr
       build-depends:
@@ -267,4 +306,6 @@ chunks:
           - stage2-gcc
           - stage2-linux-api-headers
           - stage2-make
+          - stage2-zlib
           - eglibc
+          - zlib
diff --git a/connectivity.morph b/connectivity.morph
new file mode 100644
index 0000000..282a80e
--- /dev/null
+++ b/connectivity.morph
@@ -0,0 +1,51 @@
+{
+    "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 368487c..5d94fbf 100644
--- a/core.morph
+++ b/core.morph
@@ -11,6 +11,12 @@
     ],
     "chunks": [
         {
+            "name": "cmake",
+            "repo": "upstream:cmake",
+            "ref": "baserock/morph",
+            "build-depends": []
+        },
+        {
             "name": "gdbm",
             "repo": "upstream:gdbm",
             "ref": "baserock/build-essential",
@@ -71,12 +77,6 @@
             ]
         },
         {
-            "name": "zlib",
-            "repo": "upstream:zlib",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
             "name": "autoconf",
             "repo": "upstream:autoconf",
             "ref": "baserock/build-essential",
@@ -120,6 +120,23 @@
             ]
         },
         {
+            "name": "openssl",
+            "repo": "upstream:openssl",
+            "ref": "baserock/morph",
+            "build-depends": [
+                "perl"
+            ]
+        },
+        {
+            "name": "cpython",
+            "repo": "upstream:cpython",
+            "ref": "baserock/morph-2.7",
+            "build-depends": [
+                "openssl",
+                "readline"
+            ]
+        },
+        {
             "name": "libtool",
             "repo": "upstream:libtool",
             "ref": "baserock/build-essential",
@@ -128,8 +145,8 @@
             ]
         },
         {
-            "name": "libxml2",
-            "repo": "upstream:libxml2",
+            "name": "gtk-doc-stub",
+            "repo": "upstream:gtk-doc-stub",
             "ref": "baserock/morph",
             "build-depends": [
                 "autoconf",
@@ -138,21 +155,14 @@
             ]
         },
         {
-            "name": "openssl",
-            "repo": "upstream:openssl",
+            "name": "libxml2",
+            "repo": "upstream:libxml2",
             "ref": "baserock/morph",
             "build-depends": [
-                "perl"
-            ]
-        },
-        {
-            "name": "cpython",
-            "repo": "upstream:cpython",
-            "ref": "baserock/morph-2.7",
-            "build-depends": [
-                "openssl",
-                "readline",
-                "zlib"
+                "autoconf",
+                "automake",
+                "cpython",
+                "libtool"
             ]
         },
         {
@@ -197,8 +207,7 @@
                 "error-perl-tarball",
                 "gettext",
                 "libexpat",
-                "openssl",
-                "zlib"
+                "openssl"
             ]
         },
         {
diff --git a/foundation.morph b/foundation.morph
index 9159c9d..878d0e1 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -117,12 +117,6 @@
             ]
         },
         {
-            "name": "gtk-doc-stub",
-            "repo": "upstream:gtk-doc-stub",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
             "name": "help2man",
             "repo": "upstream:help2man",
             "ref": "baserock/morph",
diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7-versatile.morph
new file mode 100644
index 0000000..2aaf934
--- /dev/null
+++ b/genivi-baseline-system-armv7-versatile.morph
@@ -0,0 +1,70 @@
+{
+    "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"
+        }
+    ]
+}
diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph
new file mode 100644
index 0000000..e658479
--- /dev/null
+++ b/genivi-baseline-system-x86_64-generic.morph
@@ -0,0 +1,70 @@
+{
+    "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"
+        }
+    ]
+}
diff --git a/genivi-devel-system-armv7-versatile.morph b/genivi-devel-system-armv7-versatile.morph
new file mode 100644
index 0000000..0642d19
--- /dev/null
+++ b/genivi-devel-system-armv7-versatile.morph
@@ -0,0 +1,75 @@
+{
+    "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"
+        }
+    ]
+}
diff --git a/genivi-devel-system-x86_64-generic.morph b/genivi-devel-system-x86_64-generic.morph
new file mode 100644
index 0000000..7399515
--- /dev/null
+++ b/genivi-devel-system-x86_64-generic.morph
@@ -0,0 +1,75 @@
+{
+    "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"
+        }
+    ]
+}
diff --git a/genivi-foundation.morph b/genivi-foundation.morph
new file mode 100644
index 0000000..872eba9
--- /dev/null
+++ b/genivi-foundation.morph
@@ -0,0 +1,59 @@
+{
+    "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": "gmp",
+            "repo": "upstream:gmp",
+            "ref": "baserock/morph",
+            "build-depends": []
+        },
+        {
+            "name": "linuxquota",
+            "repo": "upstream:linuxquota",
+            "ref": "baserock/genivi/morph",
+            "build-depends": []
+        },
+        {
+            "name": "nettle",
+            "repo": "upstream:nettle",
+            "ref": "baserock/morph",
+            "build-depends": [
+                "gmp"
+            ]
+        },
+        {
+            "name": "gnutls",
+            "repo": "upstream:gnutls",
+            "ref": "baserock/morph",
+            "build-depends": [
+                "nettle"
+            ]
+        }
+    ]
+}
diff --git a/genivi-staging.morph b/genivi-staging.morph
new file mode 100644
index 0000000..eebb447
--- /dev/null
+++ b/genivi-staging.morph
@@ -0,0 +1,27 @@
+{
+    "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
new file mode 100644
index 0000000..9ee91d1
--- /dev/null
+++ b/genivi-wayland-armv7-versatile.morph
@@ -0,0 +1,40 @@
+{
+    "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
new file mode 100644
index 0000000..33039aa
--- /dev/null
+++ b/genivi-wayland-x86_64-generic.morph
@@ -0,0 +1,40 @@
+{
+    "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
new file mode 100644
index 0000000..edfbe14
--- /dev/null
+++ b/genivi-x-armv7-versatile.morph
@@ -0,0 +1,40 @@
+{
+    "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
new file mode 100644
index 0000000..dd4e4de
--- /dev/null
+++ b/genivi-x-x86_64-generic.morph
@@ -0,0 +1,40 @@
+{
+    "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
new file mode 100644
index 0000000..148605e
--- /dev/null
+++ b/genivi.morph
@@ -0,0 +1,69 @@
+{
+    "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/multimedia.morph b/multimedia.morph
new file mode 100644
index 0000000..e1adc06
--- /dev/null
+++ b/multimedia.morph
@@ -0,0 +1,38 @@
+{
+    "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/tools.morph b/tools.morph
index 6ab9769..55e2fdb 100644
--- a/tools.morph
+++ b/tools.morph
@@ -76,12 +76,6 @@
             ]
         },
         {
-            "name": "cmake",
-            "repo": "upstream:cmake",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
             "name": "coreutils",
             "repo": "upstream:coreutils",
             "ref": "baserock/morph",
@@ -104,6 +98,12 @@
             "build-depends": []
         },
         {
+            "name": "file",
+            "repo": "upstream:file",
+            "ref": "baserock/morph",
+            "build-depends": []
+        },
+        {
             "name": "gdb",
             "repo": "upstream:gdb",
             "ref": "baserock/morph",
diff --git a/wayland-armv7-versatile.morph b/wayland-armv7-versatile.morph
new file mode 100644
index 0000000..304a7ad
--- /dev/null
+++ b/wayland-armv7-versatile.morph
@@ -0,0 +1,51 @@
+{
+    "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
new file mode 100644
index 0000000..95b3379
--- /dev/null
+++ b/wayland-x86_64-generic.morph
@@ -0,0 +1,50 @@
+{
+    "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
new file mode 100644
index 0000000..7d02344
--- /dev/null
+++ b/x-armv7-versatile.morph
@@ -0,0 +1,249 @@
+{
+    "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
new file mode 100644
index 0000000..c5c2749
--- /dev/null
+++ b/x-common.morph
@@ -0,0 +1,457 @@
+{
+    "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"
+            ]
+        }
+    ]
+}
diff --git a/x-x86_64-generic.morph b/x-x86_64-generic.morph
new file mode 100644
index 0000000..302917f
--- /dev/null
+++ b/x-x86_64-generic.morph
@@ -0,0 +1,249 @@
+{
+    "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": "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"
+            ]
+        }
+    ]
+}