Reorganized the chunks to match the new architecture design

24 files changed, 310 insertions, 1159 deletions

diff --git a/alsa.morph b/alsa.morph
deleted file mode 100644
index ce05395..0000000
--- a/alsa.morph
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "name": "alsa",
-    "description": "Components required for a ALSA sound.",
-    "kind": "stratum",
-    "build-depends": [],
-    "chunks": [
-        {
-            "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"
-            ]
-        }
-    ]
-}
diff --git a/audio-bluetooth.morph b/audio-bluetooth.morph
new file mode 100644
index 0000000..0a7b77b
--- /dev/null
+++ b/audio-bluetooth.morph
@@ -0,0 +1,160 @@
+{
+    "name": "audio-bluetooth",
+    "description": "Components required for audio and bluetooth.",
+    "kind": "stratum",
+    "build-depends": [],
+    "chunks": [
+        {
+            "name": "libunistring",
+            "repo": "upstream:libunistring",
+            "ref": "baserock/morph",
+            "build-depends": []
+        },
+        {
+            "name": "libatomic_ops",
+            "repo": "upstream:libatomic_ops",
+            "ref": "libatomic_ops-7_2d",
+            "build-depends": []
+        },
+        {
+            "name": "bdwgc",
+            "repo": "upstream:bdwgc",
+            "ref": "gc7_3alpha2",
+            "build-depends": [
+                "libatomic_ops"
+            ]
+        },
+        {
+            "name": "guile",
+            "repo": "upstream:guile",
+            "ref": "baserock/morph",
+            "build-depends": [
+                "libunistring",
+                "bdwgc"
+            ]
+        },
+        {
+            "name": "autogen",
+            "repo": "upstream:autogen",
+            "ref": "baserock/morph",
+            "build-depends": [
+                "guile"
+            ]
+        },
+        {
+            "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": "ct/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": "0.47",
+            "build-depends": [
+                "bluez",
+                "libical"
+            ]
+        },
+        {
+            "name": "speex",
+            "repo": "upstream:speex",
+            "ref": "speex-1.2rc1",
+            "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": "20120614",
+            "build-depends": []
+        },
+        {
+            "name": "ofono",
+            "repo": "upstream:ofono",
+            "ref": "baserock/morph",
+            "build-depends": [
+                "mobile-broadband-provider-info",
+                "dbus-glib",
+                "bluez"
+            ]
+        },
+        {
+            "name": "json-c",
+            "repo": "upstream:json-c",
+            "ref": "baserock/morph",
+            "build-depends": []
+        },
+        {
+            "name": "libsndfile",
+            "repo": "upstream:libsndfile",
+            "ref": "master",
+            "build-depends": [
+                 "autogen"
+            ]
+        },
+        {
+            "name": "libgdbm",
+            "repo": "upstream:gdbm",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "libtool",
+            "repo": "upstream:libtool",
+            "ref": "baserock/morph",
+            "build-depends": []
+        },
+        {
+            "name": "pulseaudio",
+            "repo": "upstream:pulseaudio",
+            "ref": "baserock/morph",
+            "build-depends": [
+                "libsndfile",
+                "libatomic_ops",
+                "speex",
+                "libtool",
+                "json-c",
+                "alsa-lib",
+                "bluez",
+                "libgdbm"
+            ]
+        }
+    ]
+}
diff --git a/autogen.morph b/autogen.morph
deleted file mode 100644
index 2300a26..0000000
--- a/autogen.morph
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "name": "autogen",
-    "description": "Components required for autogen.",
-    "kind": "stratum",
-    "build-depends": [],
-    "chunks": [
-        {
-            "name": "libunistring",
-            "repo": "upstream:libunistring",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "libatomic_ops",
-            "repo": "upstream:libatomic_ops",
-            "ref": "libatomic_ops-7_2d",
-            "build-depends": []
-        },
-        {
-            "name": "bdwgc",
-            "repo": "upstream:bdwgc",
-            "ref": "gc7_3alpha2",
-            "build-depends": [
-                "libatomic_ops"
-            ]
-        },
-        {
-            "name": "guile",
-            "repo": "upstream:guile",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "libunistring",
-                "bdwgc"
-            ]
-        },
-        {
-            "name": "autogen",
-            "repo": "upstream:autogen",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "guile"
-            ]
-        }
-    ]
-}
diff --git a/bluetooth.morph b/bluetooth.morph
deleted file mode 100644
index 91c25f9..0000000
--- a/bluetooth.morph
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-    "name": "bluetooth",
-    "description": "Components required for bluetooth.",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "utility",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "alsa",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "dbus-glib",
-            "repo": "upstream:dbus-glib",
-            "ref": "master",
-            "build-depends": []
-        },
-        {
-            "name": "bluez",
-            "repo": "upstream:bluez",
-            "ref": "ct/genivi/baseline",
-            "build-depends": []
-        },
-        {
-            "name": "bluez-tools",
-            "repo": "upstream:bluez-tools",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "dbus-glib"
-            ]
-        },
-        {
-            "name": "libical",
-            "repo": "upstream:libical",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "obexd",
-            "repo": "upstream:obexd",
-            "ref": "0.47",
-            "build-depends": [
-                "bluez",
-                "libical"
-            ]
-        },
-        {
-            "name": "speex",
-            "repo": "upstream:speex",
-            "ref": "speex-1.2rc1",
-            "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": "20120614",
-            "build-depends": []
-        },
-        {
-            "name": "ofono",
-            "repo": "upstream:ofono",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "mobile-broadband-provider-info",
-                "dbus-glib",
-                "bluez"
-            ]
-        }
-    ]
-}
diff --git a/connman.morph b/connectivity.morph
index 7576462..3d9df36 100644
--- a/connman.morph
+++ b/connectivity.morph
@@ -1,16 +1,22 @@
 {
-    "name": "connman",
-    "description": "Components required for a ConnMan.",
+    "name": "connectivity",
     "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "crypt",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        }
-    ],
+    "build-depends": [],
     "chunks": [
-        
+        {
+            "name": "libnl",
+            "repo": "upstream:libnl",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "wpa_supplicant",
+            "repo": "upstream:hostap",
+            "ref": "ct/genivi/morph",
+            "build-depends": [
+                "libnl"
+            ]
+        },
         {
             "name": "iptables",
             "repo": "upstream:iptables",
diff --git a/crypt.morph b/crypt.morph
deleted file mode 100644
index 7501506..0000000
--- a/crypt.morph
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "crypt",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "utility",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "nettle",
-            "repo": "upstream:nettle",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "gnutls",
-            "repo": "upstream:gnutls",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "nettle"
-            ]
-        },
-        {
-            "name": "openssl",
-            "repo": "upstream:openssl",
-            "ref": "baserock/morph",
-            "build-depends": []
-        }
-    ]
-}
diff --git a/cxx.morph b/cxx.morph
deleted file mode 100644
index 61b26b7..0000000
--- a/cxx.morph
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "name": "cxx",
-    "description": "A dynamic build of libstdc++ for use at runtime",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "utility",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "binutils",
-            "repo": "upstream:binutils-redhat",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "mpfr",
-            "repo": "upstream:mpfr",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "mpc",
-            "repo": "upstream:mpc",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "mpfr"
-            ]
-        },
-        {
-            "name": "cxx-dynamic",
-            "repo": "upstream:gcc-tarball",
-            "ref": "ct/genivi/morph",
-            "build-depends": [
-                "mpc",
-                "binutils"
-            ]
-        }
-    ]
-}
diff --git a/devel.morph b/devel.morph
deleted file mode 100644
index 56e051d..0000000
--- a/devel.morph
+++ /dev/null
@@ -1,507 +0,0 @@
-{
-    "name": "devel",
-    "description": "The set of programs that, when combined with foundation, are able to build devel and foundation. This is somewhat analogous to debian's build-essential",
-    "kind": "stratum",
-    "chunks": [
-        {
-            "name": "linux-api-headers",
-            "repo": "upstream:linux",
-            "ref": "ct/genivi/baseline",
-            "build-depends": []
-        },
-        {
-            "name": "eglibc",
-            "repo": "upstream:eglibc2",
-            "ref": "baserock/2.15-morph",
-            "build-depends": [
-                "linux-api-headers"
-            ]
-        },
-        {
-            "name": "binutils",
-            "repo": "upstream:binutils-redhat",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "eglibc"
-            ]
-        },
-        {
-            "name": "gmp",
-            "repo": "upstream:gmp",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "eglibc"
-            ]
-        },
-        {
-            "name": "mpfr",
-            "repo": "upstream:mpfr",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "gmp"
-            ]
-        },
-        {
-            "name": "mpc",
-            "repo": "upstream:mpc",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "mpfr"
-            ]
-        },
-        {
-            "name": "gcc",
-            "repo": "upstream:gcc-tarball",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "mpc",
-                "binutils",
-                "eglibc"
-            ]
-        },
-        {
-            "name": "make",
-            "repo": "upstream:make",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "gcc"
-            ]
-        },
-        {
-            "name": "patch",
-            "repo": "upstream:patch",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "ncurses",
-            "repo": "upstream:ncurses",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "gperf",
-            "repo": "upstream:gperf",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "coreutils",
-            "repo": "upstream:coreutils",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "m4",
-            "repo": "upstream:m4",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "bison",
-            "repo": "upstream:bison",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "readline",
-            "repo": "upstream:readline",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make",
-                "ncurses"
-            ]
-        },
-        {
-            "name": "bash",
-            "repo": "upstream:bash",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make",
-                "readline"
-            ]
-        },
-        {
-            "name": "gdbm",
-            "repo": "upstream:gdbm",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "perl",
-            "repo": "upstream:perl",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make",
-                "gdbm"
-            ]
-        },
-        {
-            "name": "autoconf",
-            "repo": "upstream:autoconf",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "m4"
-            ]
-        },
-        {
-            "name": "automake",
-            "repo": "upstream:automake",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "autoconf",
-                "perl"
-            ]
-        },
-        {
-            "name": "libtool",
-            "repo": "upstream:libtool",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "bash"
-            ]
-        },
-        {
-            "name": "gawk",
-            "repo": "upstream:gawk",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "help2man",
-            "repo": "upstream:help2man",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "perl"
-            ]
-        },
-        {
-            "name": "flex",
-            "repo": "upstream:flex",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "gettext",
-            "repo": "upstream:gettext",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make",
-                "perl"
-            ]
-        },
-        {
-            "name": "pkg-config",
-            "repo": "upstream:pkg-config",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "linux-user-chroot",
-            "repo": "upstream:linux-user-chroot",
-            "ref": "master",
-            "build-depends": [
-                "make",
-                "autoconf",
-                "automake",
-                "libtool"
-            ]
-        },
-        {
-            "name": "groff",
-            "repo": "upstream:groff",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "gtk-doc-stub",
-            "repo": "upstream:gtk-doc-stub",
-            "ref": "master",
-            "build-depends": [
-                "bash",
-                "make"
-            ]
-        },
-        {
-            "name": "texinfo-tarball",
-            "repo": "upstream:texinfo-tarball",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "vim",
-            "repo": "upstream:vim",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make",
-                "ncurses",
-                "texinfo-tarball"
-            ]
-        },
-        {
-            "name": "openssl",
-            "repo": "upstream:openssl",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "curl",
-            "repo": "upstream:curl",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make",
-                "openssl"
-            ]
-        },
-        {
-            "name": "cpython",
-            "repo": "upstream:cpython",
-            "ref": "baserock/morph-2.7",
-            "build-depends": [
-                "make",
-                "readline",
-                "openssl"
-            ]
-        },
-        {
-            "name": "error-perl-tarball",
-            "repo": "upstream:error-perl-tarball",
-            "ref": "master",
-            "build-depends": [
-                "perl"
-            ]
-        },
-        {
-            "name": "git",
-            "repo": "upstream:git",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make",
-                "openssl",
-                "curl",
-                "cpython",
-                "error-perl-tarball"
-            ]
-        },
-        {
-            "name": "openssh",
-            "repo": "upstream:openssh",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make",
-                "autoconf",
-                "automake",
-                "libtool",
-                "gettext",
-                "openssl"
-            ]
-        },
-        {
-            "name": "python-setuptools",
-            "repo": "upstream:python-setuptools",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "cpython"
-            ]
-        },
-        {
-            "name": "python-coveragepy",
-            "repo": "upstream:python-coveragepy",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "cpython",
-                "python-setuptools"
-            ]
-        },
-        {
-            "name": "python-coverage-test-runner",
-            "repo": "upstream:python-coverage-test-runner",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "cpython",
-                "python-coveragepy"
-            ]
-        },
-        {
-            "name": "cliapp",
-            "repo": "upstream:cliapp",
-            "ref": "trunk",
-            "build-depends": [
-                "cpython",
-                "python-coverage-test-runner"
-            ]
-        },
-        {
-            "name": "python-ttystatus",
-            "repo": "upstream:python-ttystatus",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "cpython"
-            ]
-        },
-        {
-            "name": "cmdtest",
-            "repo": "upstream:cmdtest",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "cpython",
-                "python-ttystatus"
-            ]
-        },
-        {
-            "name": "libxml2",
-            "repo": "upstream:libxml2",
-            "ref": "master",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "libxslt",
-            "repo": "upstream:libxslt",
-            "ref": "master",
-            "build-depends": [
-                "libxml2"
-            ]
-        },
-        {
-            "name": "XML-Parser",
-            "repo": "upstream:XML-Parser",
-            "ref": "master",
-            "build-depends": [
-                "make",
-                "perl",
-                "libxml2"
-            ]
-        },
-        {
-            "name": "intltool",
-            "repo": "upstream:intltool",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "perl",
-                "XML-Parser"
-            ]
-        },
-        {
-            "name": "morph",
-            "repo": "baserock:morph",
-            "ref": "master",
-            "build-depends": [
-                "cliapp",
-                "cmdtest",
-                "python-coverage-test-runner"
-            ]
-        },
-        {
-            "name": "pv",
-            "repo": "upstream:pv",
-            "ref": "master",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "lzo",
-            "repo": "upstream:lzo",
-            "ref": "master",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "distcc",
-            "repo": "upstream:distcc",
-            "ref": "master",
-            "build-depends": [
-                "make",
-                "lzo"
-            ]
-        },
-        {
-            "name": "strace",
-            "repo": "upstream:strace",
-            "ref": "master",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "vala",
-            "repo": "upstream:vala",
-            "ref": "master",
-            "build-depends": [
-                "autoconf",
-                "automake",
-                "make"
-            ]
-        },
-        {
-            "name": "cmake",
-            "repo": "upstream:cmake",
-            "ref": "master",
-            "build-depends": [
-                "bash",
-                "make"
-            ]
-        },
-        {
-            "name": "less",
-            "repo": "upstream:less",
-            "ref": "master",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "lsof",
-            "repo": "upstream:lsof",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "rsync",
-            "repo": "upstream:rsync",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "make"
-            ]
-        },
-        {
-            "name": "gdb",
-            "repo": "upstream:gdb",
-            "ref": "refs/heads/master",
-            "build-depends": [
-                "make"
-            ]
-        }
-    ]
-}
diff --git a/filesys.morph b/filesys.morph
deleted file mode 100644
index 6aad604..0000000
--- a/filesys.morph
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "name": "filesys",
-    "kind": "stratum",
-    "build-depends": [],
-    "chunks": [
-        {
-            "name": "linuxquota",
-            "repo": "upstream:linuxquota",
-            "ref": "ct/genivi/morph",
-            "build-depends": []
-        },
-        {
-            "name": "fuse",
-            "repo": "upstream:fuse",
-            "ref": "ct/genivi/morph",
-            "build-depends": []
-        }
-    ]
-}
diff --git a/foundation.morph b/foundation.morph
index 4017fce..8bb1bd3 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -16,6 +16,35 @@
             "build-depends": []
         },
         {
+            "name": "binutils",
+            "repo": "upstream:binutils-redhat",
+            "ref": "baserock/morph",
+            "build-depends": []
+        },
+        {
+            "name": "mpfr",
+            "repo": "upstream:mpfr",
+            "ref": "baserock/morph",
+            "build-depends": []
+        },
+        {
+            "name": "mpc",
+            "repo": "upstream:mpc",
+            "ref": "baserock/morph",
+            "build-depends": [
+                "mpfr"
+            ]
+        },
+        {
+            "name": "cxx-dynamic",
+            "repo": "upstream:gcc-tarball",
+            "ref": "ct/genivi/morph",
+            "build-depends": [
+                "mpc",
+                "binutils"
+            ]
+        },
+        {
             "name": "zlib",
             "repo": "upstream:zlib",
             "ref": "baserock/morph",
@@ -142,6 +171,12 @@
             ]
         },
         {
+            "name": "dbus-glib",
+            "repo": "upstream:dbus-glib",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
             "name": "gobject-introspection",
             "repo": "upstream:gobject-introspection",
             "ref": "baserock/morph",
@@ -177,6 +212,61 @@
             "build-depends": [
                 "eglibc"
             ]
+        },
+        {
+            "name": "gmp",
+            "repo": "upstream:gmp",
+            "ref": "baserock/morph",
+            "build-depends": []
+        },
+        {
+            "name": "ncurses",
+            "repo": "upstream:ncurses",
+            "ref": "baserock/wide",
+            "build-depends": []
+        },
+        {
+            "name": "linuxquota",
+            "repo": "upstream:linuxquota",
+            "ref": "ct/genivi/morph",
+            "build-depends": []
+        },
+        {
+            "name": "fuse",
+            "repo": "upstream:fuse",
+            "ref": "ct/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"
+            ]
+        },
+        {
+            "name": "openssl",
+            "repo": "upstream:openssl",
+            "ref": "baserock/morph",
+            "build-depends": []
+        },
+        {
+            "name": "curl",
+            "repo": "upstream:curl",
+            "ref": "baserock/morph",
+            "build-depends": [
+                "openssl",
+                "gnutls"
+            ]
         }
     ]
 }
diff --git a/genivi-baseline-devel-system-x86_64-generic.morph b/genivi-baseline-devel-system-x86_64-generic.morph
deleted file mode 100644
index 6f5db37..0000000
--- a/genivi-baseline-devel-system-x86_64-generic.morph
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-    "name": "genivi-baseline-devel-system-x86_64-generic",
-    "description": "A GENIVI baseline development system for a 64-bit x86 system.",
-    "kind": "system",
-    "system-kind": "syslinux-disk",
-    "arch": "x86_64",
-    "disk-size": "2G",
-    "strata": [
-        {
-            "morph": "bsp-x86_64-generic",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "foundation",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "devel",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "cxx",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "utility",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "filesys",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "codecs",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "alsa",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "connman",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "bluetooth",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "pulseaudio",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "x",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "genivi-components",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "http",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "wireless",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        }
-    ]
-}
diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph
index 72f9221..62f3aa0 100644
--- a/genivi-baseline-system-x86_64-generic.morph
+++ b/genivi-baseline-system-x86_64-generic.morph
@@ -17,42 +17,12 @@
             "ref": "ct/genivi/baseline"
         },
         {
-            "morph": "cxx",
+            "morph": "connectivity",
             "repo": "baserock:baserock/morphs",
             "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "utility",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "filesys",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "codecs",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "alsa",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "connman",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "bluetooth",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
+        }
         {
-            "morph": "pulseaudio",
+            "morph": "audio-bluetooth",
             "repo": "baserock:baserock/morphs",
             "ref": "ct/genivi/baseline"
         },
@@ -62,17 +32,12 @@
             "ref": "ct/genivi/baseline"
         },
         {
-            "morph": "genivi-components",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "http",
+            "morph": "multimedia",
             "repo": "baserock:baserock/morphs",
             "ref": "ct/genivi/baseline"
         },
         {
-            "morph": "wireless",
+            "morph": "genivi",
             "repo": "baserock:baserock/morphs",
             "ref": "ct/genivi/baseline"
         }
diff --git a/genivi-baseline-vbox-system-x86_64-generic.morph b/genivi-baseline-vbox-system-x86_64-generic.morph
index 83a7e30..9341fdc 100644
--- a/genivi-baseline-vbox-system-x86_64-generic.morph
+++ b/genivi-baseline-vbox-system-x86_64-generic.morph
@@ -17,42 +17,12 @@
             "ref": "ct/genivi/baseline"
         },
         {
-            "morph": "devel",
+            "morph": "connectivity",
             "repo": "baserock:baserock/morphs",
             "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "cxx",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "utility",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "filesys",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "alsa",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "connman",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "bluetooth",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
+        }
         {
-            "morph": "pulseaudio",
+            "morph": "audio-bluetooth",
             "repo": "baserock:baserock/morphs",
             "ref": "ct/genivi/baseline"
         },
@@ -62,17 +32,12 @@
             "ref": "ct/genivi/baseline"
         },
         {
-            "morph": "genivi-components",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "http",
+            "morph": "multimedia",
             "repo": "baserock:baserock/morphs",
             "ref": "ct/genivi/baseline"
         },
         {
-            "morph": "wireless",
+            "morph": "genivi",
             "repo": "baserock:baserock/morphs",
             "ref": "ct/genivi/baseline"
         },
diff --git a/genivi-components.morph b/genivi.morph
index 304ea06..304ea06 100644
--- a/genivi-components.morph
+++ b/genivi.morph
diff --git a/http.morph b/http.morph
deleted file mode 100644
index 64a7e4c..0000000
--- a/http.morph
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "name": "http",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "crypt",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "curl",
-            "repo": "upstream:curl",
-            "ref": "baserock/morph",
-            "build-depends": []
-        }
-    ]
-}
diff --git a/image.morph b/image.morph
deleted file mode 100644
index 825d29a..0000000
--- a/image.morph
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "name": "image",
-    "kind": "stratum",
-    "build-depends": [],
-    "chunks": [
-        {
-            "name": "libpng",
-            "repo": "upstream:libpng",
-            "ref": "master",
-            "build-depends": []
-        },
-        {
-            "name": "libjpeg",
-            "repo": "upstream:libjpeg",
-            "ref": "master",
-            "build-depends": []
-        }
-    ]
-}
diff --git a/llvm.morph b/llvm.morph
deleted file mode 100644
index 495a8af..0000000
--- a/llvm.morph
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "name": "llvm",
-    "kind": "stratum",
-    "build-depends": [],
-    "chunks": [
-        {
-            "name": "llvm",
-            "repo": "upstream:llvm",
-            "ref": "baserock/morph",
-            "build-depends": []
-        }
-    ]
-}
diff --git a/codecs.morph b/multimedia.morph
index 6c8d0f3..fd011fe 100644
--- a/codecs.morph
+++ b/multimedia.morph
@@ -1,7 +1,19 @@
 {
-    "name": "codecs",
+    "name": "multimedia",
     "kind": "stratum",
     "description": "Codecs",
+    "build-depends": [
+        {
+            "morph": "audio-bluetooth",
+            "repo": "baserock:baserock/morphs",
+            "ref": "ct/genivi/baseline"
+        },
+        {
+            "morph": "x",
+            "repo": "baserock:baserock/morphs",
+            "ref": "ct/genivi/baseline"
+        }
+    ],
     "chunks": [
         {
             "name": "orc",
diff --git a/pulseaudio.morph b/pulseaudio.morph
deleted file mode 100644
index f58094a..0000000
--- a/pulseaudio.morph
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    "name": "pulseaudio",
-    "description": "Components required for pulseaudio.",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "utility",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "alsa",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "bluetooth",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "autogen",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "json-c",
-            "repo": "upstream:json-c",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "libsndfile",
-            "repo": "upstream:libsndfile",
-            "ref": "master",
-            "build-depends": []
-        },
-        {
-            "name": "libgdbm",
-            "repo": "upstream:gdbm",
-            "ref": "master",
-            "build-depends": []
-        },
-        {
-            "name": "libtool",
-            "repo": "upstream:libtool",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "pulseaudio",
-            "repo": "upstream:pulseaudio",
-            "ref": "baserock/morph",
-            "build-depends": [
-                "libsndfile",
-                "libtool",
-                "json-c",
-                "libgdbm"
-            ]
-        }
-    ]
-}
diff --git a/utility.morph b/utility.morph
deleted file mode 100644
index 9925571..0000000
--- a/utility.morph
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "name": "utility",
-    "description": "Low-level components required by multiple strata.",
-    "kind": "stratum",
-    "build-depends": [],
-    "chunks": [
-        {
-            "name": "gmp",
-            "repo": "upstream:gmp",
-            "ref": "baserock/morph",
-            "build-depends": []
-        },
-        {
-            "name": "ncurses",
-            "repo": "upstream:ncurses",
-            "ref": "baserock/wide",
-            "build-depends": []
-        }
-    ]
-}
diff --git a/vbox_drm.morph b/vbox_drm.morph
index 9ca4650..9575732 100644
--- a/vbox_drm.morph
+++ b/vbox_drm.morph
@@ -3,12 +3,7 @@
     "kind": "stratum",
     "build-depends": [
         {
-            "morph": "http",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "image",
+            "morph": "x",
             "repo": "baserock:baserock/morphs",
             "ref": "ct/genivi/baseline"
         }
diff --git a/weston.morph b/weston.morph
deleted file mode 100644
index 0b117e7..0000000
--- a/weston.morph
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "name": "weston",
-    "description": "Components required for wayland.",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "x",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        },
-        {
-            "morph": "image",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "libXcursor",
-            "repo": "upstream:xorg-lib-libXcursor",
-            "ref": "master",
-            "build-depends": []
-        },
-        {
-            "name": "cairo",
-            "repo": "upstream:cairo",
-            "ref": "ct/genivi/weston",
-            "build-depends": []
-        },
-        {
-            "name": "mtdev",
-            "repo": "upstream:mtdev",
-            "ref": "master",
-            "build-depends": []
-        },
-        {
-            "name": "linux-pam",
-            "repo": "upstream:linux-pam",
-            "ref": "master",
-            "build-depends": []
-        },
-        {
-            "name": "weston",
-            "repo": "upstream:weston",
-            "ref": "master",
-            "build-depends": [
-                "libXcursor",
-                "cairo",
-                "mtdev",
-                "linux-pam"
-            ]
-        }
-    ]
-}
diff --git a/wireless.morph b/wireless.morph
deleted file mode 100644
index 279759c..0000000
--- a/wireless.morph
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "name": "wireless",
-    "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "crypt",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        }
-    ],
-    "chunks": [
-        {
-            "name": "libnl",
-            "repo": "upstream:libnl",
-            "ref": "master",
-            "build-depends": []
-        },
-        {
-            "name": "wpa_supplicant",
-            "repo": "upstream:hostap",
-            "ref": "ct/genivi/morph",
-            "build-depends": [
-                "libnl"
-            ]
-        }
-    ]
-}
diff --git a/x.morph b/x.morph
index 1577381..9e0fb7f 100644
--- a/x.morph
+++ b/x.morph
@@ -1,15 +1,27 @@
 {
     "name": "x",
     "kind": "stratum",
-    "build-depends": [
-        {
-            "morph": "llvm",
-            "repo": "baserock:baserock/morphs",
-            "ref": "ct/genivi/baseline"
-        }
-    ],
+    "build-depends": [],
     "chunks": [
         {
+            "name": "llvm",
+            "repo": "upstream:llvm",
+            "ref": "baserock/morph",
+            "build-depends": []
+        },
+        {
+            "name": "libpng",
+            "repo": "upstream:libpng",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "libjpeg",
+            "repo": "upstream:libjpeg",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
             "name": "xorg-util-macros",
             "repo": "upstream:xorg-util-macros",
             "ref": "master",
@@ -461,6 +473,7 @@
             "repo": "upstream:mesa",
             "ref": "ct/genivi/wayland",
             "build-depends": [
+                "llvm",
                 "wayland",
                 "drm",
                 "xorg-lib-libX11",