Merge the GENIVI baseline morphs

27 files changed, 1803 insertions, 39 deletions

diff --git a/audio-bluetooth.morph b/audio-bluetooth.morph
new file mode 100644
index 00000000..bfdd3c52
--- /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": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi-foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        }
+    ],
+    "chunks": [
+        {
+            "name": "libatomic_ops",
+            "repo": "upstream:libatomic_ops",
+            "ref": "libatomic_ops-7_2d",
+            "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": "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",
+                "bluez"
+            ]
+        },
+        {
+            "name": "json-c",
+            "repo": "upstream:json-c",
+            "ref": "baserock/morph",
+            "build-depends": []
+        },
+        {
+            "name": "libsndfile",
+            "repo": "upstream:libsndfile",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "pulseaudio",
+            "repo": "upstream:pulseaudio",
+            "ref": "baserock/morph",
+            "build-depends": [
+                "libsndfile",
+                "libatomic_ops",
+                "speex",
+                "json-c",
+                "alsa-lib",
+                "bluez"
+            ]
+        }
+    ]
+}
diff --git a/base-system-armv7-highbank.morph b/base-system-armv7-highbank.morph
index 22005cb8..6d15cd74 100644
--- a/base-system-armv7-highbank.morph
+++ b/base-system-armv7-highbank.morph
@@ -9,22 +9,22 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "bsp-armv7-highbank",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         }
     ]
 }
diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph
index 04db502d..5a339724 100644
--- a/base-system-armv7-versatile.morph
+++ b/base-system-armv7-versatile.morph
@@ -9,22 +9,22 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "bsp-armv7-versatile",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         }
     ]
 }
diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph
index 2e29dbe2..38610035 100644
--- a/base-system-x86_32-generic.morph
+++ b/base-system-x86_32-generic.morph
@@ -9,22 +9,22 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "bsp-x86_32-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         }
     ]
 }
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index 4ae4e713..98ffc682 100644
--- a/base-system-x86_64-generic.morph
+++ b/base-system-x86_64-generic.morph
@@ -9,22 +9,22 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "bsp-x86_64-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         }
     ]
 }
diff --git a/bsp-x86_32-generic.morph b/bsp-x86_32-generic.morph
index 0636f273..bd52755f 100644
--- a/bsp-x86_32-generic.morph
+++ b/bsp-x86_32-generic.morph
@@ -26,7 +26,9 @@
             "name": "syslinux",
             "repo": "upstream:syslinux",
             "ref": "baserock/morph",
-            "build-depends": ["nasm"]
+            "build-depends": [
+                "nasm"
+            ]
         }
     ]
 }
diff --git a/build-essential.morph b/build-essential.morph
index 5a3fb2c0..46a8e39b 100644
--- a/build-essential.morph
+++ b/build-essential.morph
@@ -28,9 +28,9 @@
             "build-depends": []
         },
         {
-            "name": "gcc",
+            "name": "gcc-shared",
             "repo": "upstream:gcc-tarball",
-            "ref": "baserock/build-essential",
+            "ref": "baserock/morph",
             "build-depends": []
         },
         {
diff --git a/connectivity.morph b/connectivity.morph
new file mode 100644
index 00000000..4e94fae4
--- /dev/null
+++ b/connectivity.morph
@@ -0,0 +1,51 @@
+{
+    "name": "connectivity",
+    "kind": "stratum",
+    "build-depends": [
+        {
+            "morph": "core",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi-foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        }
+    ],
+    "chunks": [
+        {
+            "name": "libnl",
+            "repo": "upstream:libnl",
+            "ref": "a2c4bd8f094a7247903578860a9c42049991860b",
+            "build-depends": []
+        },
+        {
+            "name": "wpa_supplicant",
+            "repo": "upstream:hostap",
+            "ref": "baserock/genivi/morph",
+            "build-depends": [
+                "libnl"
+            ]
+        },
+        {
+            "name": "iptables",
+            "repo": "upstream:iptables",
+            "ref": "v1.4.16.3",
+            "build-depends": []
+        },
+        {
+            "name": "connman",
+            "repo": "upstream:connman",
+            "ref": "baserock/morph",
+            "build-depends": [
+                "iptables"
+            ]
+        }
+    ]
+}
diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph
index ab735416..0da056f4 100644
--- a/devel-system-armv7-highbank.morph
+++ b/devel-system-armv7-highbank.morph
@@ -9,27 +9,27 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "bsp-armv7-highbank",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "tools",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         }
     ]
 }
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
index b10a52fe..fc0aebb9 100644
--- a/devel-system-armv7-versatile.morph
+++ b/devel-system-armv7-versatile.morph
@@ -9,27 +9,27 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "bsp-armv7-versatile",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "tools",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         }
     ]
 }
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index c0f4b877..2255b8ee 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -9,27 +9,27 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "bsp-x86_32-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "tools",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         }
     ]
 }
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index 48729610..875ec342 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -9,27 +9,27 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "bsp-x86_64-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         },
         {
             "morph": "tools",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "jonathan/genivi-baseline-merge"
         }
     ]
 }
diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7-versatile.morph
new file mode 100644
index 00000000..98b2ab37
--- /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": "disk",
+    "arch": "armv7",
+    "disk-size": "2G",
+    "strata": [
+        {
+            "morph": "build-essential",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "core",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi-foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "bsp-armv7-versatile",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "connectivity",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "audio-bluetooth",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "x-common",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "x-armv7-versatile",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "multimedia",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi-x-armv7-versatile",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        }
+    ]
+}
diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph
new file mode 100644
index 00000000..382697ba
--- /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": "syslinux-disk",
+    "arch": "x86_64",
+    "disk-size": "2G",
+    "strata": [
+        {
+            "morph": "build-essential",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "core",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi-foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "bsp-x86_64-generic",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "connectivity",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "audio-bluetooth",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "x-common",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "x-x86_64-generic",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "multimedia",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi-x-x86_64-generic",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        }
+    ]
+}
diff --git a/genivi-foundation.morph b/genivi-foundation.morph
new file mode 100644
index 00000000..fe6cdee5
--- /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": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        }
+    ],
+    "chunks": [
+        {
+            "name": "dbus-glib",
+            "repo": "upstream:dbus-glib",
+            "ref": "master",
+            "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 00000000..80a96ce8
--- /dev/null
+++ b/genivi-staging.morph
@@ -0,0 +1,39 @@
+{
+    "name": "genivi-staging",
+    "kind": "stratum",
+    "build-depends": [],
+    "chunks": [
+        {
+            "name": "linux-api-headers",
+            "repo": "upstream:linux",
+            "ref": "baserock/genivi/baseline",
+            "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": "libtool",
+            "repo": "upstream:libtool",
+            "ref": "baserock/morph",
+            "build-depends": []
+        }
+    ]
+}
diff --git a/genivi-wayland-armv7-versatile.morph b/genivi-wayland-armv7-versatile.morph
new file mode 100644
index 00000000..05d9a684
--- /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": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi-foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "wayland-armv7-versatile",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        }
+    ],
+    "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 00000000..3b01d36e
--- /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": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi-foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "wayland-x86_64-generic",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        }
+    ],
+    "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 00000000..143daf54
--- /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": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi-foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "x-armv7-versatile",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        }
+    ],
+    "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 00000000..bf7f39e6
--- /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": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi-foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "x-x86_64-generic",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        }
+    ],
+    "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 00000000..44895d46
--- /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": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi-foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        }
+    ],
+    "chunks": [
+        {
+            "name": "DLT-daemon",
+            "repo": "upstream:DLT-daemon",
+            "ref": "baserock/morphs",
+            "build-depends": []
+        },
+        {
+            "name": "sqlite3",
+            "repo": "upstream:sqlite3",
+            "ref": "master",
+            "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 00000000..3f50e250
--- /dev/null
+++ b/multimedia.morph
@@ -0,0 +1,38 @@
+{
+    "name": "multimedia",
+    "kind": "stratum",
+    "description": "Codecs",
+    "build-depends": [
+        {
+            "morph": "core",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi-foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        }
+    ],
+    "chunks": [
+        {
+            "name": "orc",
+            "repo": "upstream:orc",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "gstreamer",
+            "repo": "upstream:gstreamer",
+            "ref": "baserock/genivi/baseline",
+            "build-depends": [
+                "orc"
+            ]
+        }
+    ]
+}
diff --git a/wayland-armv7-versatile.morph b/wayland-armv7-versatile.morph
new file mode 100644
index 00000000..51799346
--- /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": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi-foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "x-common",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        }
+    ],
+    "chunks": [
+        {
+            "name": "libxkbcommon",
+            "repo": "upstream:xorg-lib-libxkbcommon",
+            "ref": "master",
+            "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 00000000..36a7adf0
--- /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": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi-foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "x-common",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        }
+    ],
+    "chunks": [
+        {
+            "name": "libxkbcommon",
+            "repo": "upstream:xorg-lib-libxkbcommon",
+            "ref": "master",
+            "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 00000000..c208cbd0
--- /dev/null
+++ b/x-armv7-versatile.morph
@@ -0,0 +1,260 @@
+{
+    "name": "x-armv7-versatile",
+    "kind": "stratum",
+    "build-depends": [
+        {
+            "morph": "core",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi-foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "x-common",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        }
+    ],
+    "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": "master",
+            "build-depends": []
+        },
+        {
+            "name": "pixman",
+            "repo": "upstream:pixman",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "xorg-font-util",
+            "repo": "upstream:xorg-font-util",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "xorg-lib-libfontenc",
+            "repo": "upstream:xorg-lib-libfontenc",
+            "ref": "master",
+            "build-depends": [
+                "xorg-font-util"
+            ]
+        },
+        {
+            "name": "freetype2",
+            "repo": "upstream:freetype2",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "fontconfig",
+            "repo": "upstream:fontconfig",
+            "ref": "master",
+            "build-depends": [
+                "freetype2"
+            ]
+        },
+        {
+            "name": "xorg-lib-libXfont",
+            "repo": "upstream:xorg-lib-libXfont",
+            "ref": "master",
+            "build-depends": [
+                "freetype2",
+                "xorg-lib-libfontenc"
+            ]
+        },
+        {
+            "name": "xorg-lib-libICE",
+            "repo": "upstream:xorg-lib-libICE",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "xorg-lib-libSM",
+            "repo": "upstream:xorg-lib-libSM",
+            "ref": "master",
+            "build-depends": [
+                "xorg-lib-libICE"
+            ]
+        },
+        {
+            "name": "xorg-lib-libXt",
+            "repo": "upstream:xorg-lib-libXt",
+            "ref": "master",
+            "build-depends": [
+                "xorg-lib-libSM"
+            ]
+        },
+        {
+            "name": "xorg-lib-libXmu",
+            "repo": "upstream:xorg-lib-libXmu",
+            "ref": "master",
+            "build-depends": [
+                "xorg-lib-libXt"
+            ]
+        },
+        {
+            "name": "xorg-lib-libXpm",
+            "repo": "upstream:xorg-lib-libXpm",
+            "ref": "master",
+            "build-depends": [
+                "xorg-lib-libXt"
+            ]
+        },
+        {
+            "name": "xorg-lib-libXaw",
+            "repo": "upstream:xorg-lib-libXaw",
+            "ref": "master",
+            "build-depends": [
+                "xorg-lib-libXmu",
+                "xorg-lib-libXpm",
+                "xorg-lib-libXt"
+            ]
+        },
+        {
+            "name": "fontutils",
+            "repo": "upstream:fontutils",
+            "ref": "baserock/morph",
+            "build-depends": [
+                "xorg-lib-libXaw",
+                "xorg-lib-libXfont",
+                "xorg-lib-libXt",
+                "xorg-lib-libfontenc"
+            ]
+        },
+        {
+            "name": "libsha1",
+            "repo": "upstream:libsha1",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "xserver",
+            "repo": "upstream:xserver",
+            "ref": "master",
+            "build-depends": [
+                "fontutils",
+                "libsha1",
+                "mesa-x",
+                "pixman",
+                "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": "master",
+            "build-depends": [
+                "xserver"
+            ]
+        },
+        {
+            "name": "xorg-driver-xf86-video-fbdev",
+            "repo": "upstream:xorg-driver-xf86-video-fbdev",
+            "ref": "master",
+            "build-depends": [
+                "xserver"
+            ]
+        },
+        {
+            "name": "xorg-driver-xf86-video-vesa",
+            "repo": "upstream:xorg-driver-xf86-video-vesa",
+            "ref": "master",
+            "build-depends": [
+                "xserver"
+            ]
+        },
+        {
+            "name": "xorg-driver-xf86-input-evdev",
+            "repo": "upstream:xorg-driver-xf86-input-evdev",
+            "ref": "master",
+            "build-depends": [
+                "xserver"
+            ]
+        },
+        {
+            "name": "xorg-driver-xf86-input-keyboard",
+            "repo": "upstream:xorg-driver-xf86-input-keyboard",
+            "ref": "master",
+            "build-depends": [
+                "xserver"
+            ]
+        },
+        {
+            "name": "xorg-driver-xf86-input-mouse",
+            "repo": "upstream:xorg-driver-xf86-input-mouse",
+            "ref": "master",
+            "build-depends": [
+                "xserver"
+            ]
+        },
+        {
+            "name": "xorg-app-xkbcomp",
+            "repo": "upstream:xorg-app-xkbcomp",
+            "ref": "master",
+            "build-depends": [
+                "xorg-lib-libxkbfile"
+            ]
+        },
+        {
+            "name": "xkeyboard-config",
+            "repo": "upstream:xkeyboard-config",
+            "ref": "master",
+            "build-depends": [
+                "xorg-app-xkbcomp"
+            ]
+        },
+        {
+            "name": "xorg-app-xinit",
+            "repo": "upstream:xorg-app-xinit",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "xorg-lib-libXft",
+            "repo": "upstream:xorg-lib-libXft",
+            "ref": "master",
+            "build-depends": [
+                "fontconfig",
+                "freetype2"
+            ]
+        },
+        {
+            "name": "xcb-util",
+            "repo": "upstream:xcb-util",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "xterm",
+            "repo": "upstream:xterm",
+            "ref": "master",
+            "build-depends": [
+                "xorg-lib-libXaw",
+                "xorg-lib-libxkbfile"
+            ]
+        }
+    ]
+}
diff --git a/x-common.morph b/x-common.morph
new file mode 100644
index 00000000..7cae45b0
--- /dev/null
+++ b/x-common.morph
@@ -0,0 +1,457 @@
+{
+    "name": "x-common",
+    "kind": "stratum",
+    "build-depends": [
+        {
+            "morph": "core",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi-foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        }
+    ],
+    "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",
+            "build-depends": []
+        },
+        {
+            "name": "xorg-proto-bigreqsproto",
+            "repo": "upstream:xorg-proto-bigreqsproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-compositeproto",
+            "repo": "upstream:xorg-proto-compositeproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-damageproto",
+            "repo": "upstream:xorg-proto-damageproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-dmxproto",
+            "repo": "upstream:xorg-proto-dmxproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-fixesproto",
+            "repo": "upstream:xorg-proto-fixesproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-fontsproto",
+            "repo": "upstream:xorg-proto-fontsproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-glproto",
+            "repo": "upstream:xorg-proto-glproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-inputproto",
+            "repo": "upstream:xorg-proto-inputproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-kbproto",
+            "repo": "upstream:xorg-proto-kbproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-xineramaproto",
+            "repo": "upstream:xorg-proto-xineramaproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-randrproto",
+            "repo": "upstream:xorg-proto-randrproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-recordproto",
+            "repo": "upstream:xorg-proto-recordproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-renderproto",
+            "repo": "upstream:xorg-proto-renderproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-resourceproto",
+            "repo": "upstream:xorg-proto-resourceproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-scrnsaverproto",
+            "repo": "upstream:xorg-proto-scrnsaverproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-videoproto",
+            "repo": "upstream:xorg-proto-videoproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-xcmiscproto",
+            "repo": "upstream:xorg-proto-xcmiscproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-xextproto",
+            "repo": "upstream:xorg-proto-xextproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-xf86bigfontproto",
+            "repo": "upstream:xorg-proto-xf86bigfontproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-xf86dgaproto",
+            "repo": "upstream:xorg-proto-xf86dgaproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-xf86driproto",
+            "repo": "upstream:xorg-proto-xf86driproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-xf86vidmodeproto",
+            "repo": "upstream:xorg-proto-xf86vidmodeproto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-x11proto",
+            "repo": "upstream:xorg-proto-x11proto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-proto-dri2proto",
+            "repo": "upstream:xorg-proto-dri2proto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xcb-pthread-stubs",
+            "repo": "upstream:xcb-pthread-stubs",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xcb-proto",
+            "repo": "upstream:xcb-proto",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-lib-libXau",
+            "repo": "upstream:xorg-lib-libXau",
+            "ref": "master",
+            "build-depends": [
+                "xorg-proto-x11proto",
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xcb-libxcb",
+            "repo": "upstream:xcb-libxcb",
+            "ref": "master",
+            "build-depends": [
+                "xcb-proto",
+                "xcb-pthread-stubs",
+                "xorg-lib-libXau",
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-lib-libxtrans",
+            "repo": "upstream:xorg-lib-libxtrans",
+            "ref": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-lib-libX11",
+            "repo": "upstream:xorg-lib-libX11",
+            "ref": "master",
+            "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": "master",
+            "build-depends": [
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "drm",
+            "repo": "upstream:drm",
+            "ref": "master",
+            "build-depends": [
+                "xcb-pthread-stubs",
+                "xorg-lib-libpciaccess"
+            ]
+        },
+        {
+            "name": "xorg-lib-libXext",
+            "repo": "upstream:xorg-lib-libXext",
+            "ref": "master",
+            "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": "master",
+            "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": "master",
+            "build-depends": [
+                "xorg-proto-x11proto",
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-lib-libXfixes",
+            "repo": "upstream:xorg-lib-libXfixes",
+            "ref": "master",
+            "build-depends": [
+                "xorg-lib-libXext",
+                "xorg-proto-fixesproto",
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-lib-libXcomposite",
+            "repo": "upstream:xorg-lib-libXcomposite",
+            "ref": "master",
+            "build-depends": [
+                "xorg-lib-libX11",
+                "xorg-lib-libXfixes",
+                "xorg-proto-compositeproto",
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-lib-libXrender",
+            "repo": "upstream:xorg-lib-libXrender",
+            "ref": "master",
+            "build-depends": [
+                "xorg-lib-libX11",
+                "xorg-proto-renderproto",
+                "xorg-util-macros"
+            ]
+        },
+        {
+            "name": "xorg-lib-libXrandr",
+            "repo": "upstream:xorg-lib-libXrandr",
+            "ref": "master",
+            "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": "master",
+            "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": "master",
+            "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": "master",
+            "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": "master",
+            "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": "master",
+            "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 00000000..7a18898d
--- /dev/null
+++ b/x-x86_64-generic.morph
@@ -0,0 +1,260 @@
+{
+    "name": "x-x86_64-generic",
+    "kind": "stratum",
+    "build-depends": [
+        {
+            "morph": "core",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "genivi-foundation",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        },
+        {
+            "morph": "x-common",
+            "repo": "baserock:baserock/morphs",
+            "ref": "jonathan/genivi-baseline-merge"
+        }
+    ],
+    "chunks": [
+        {
+            "name": "mesa-x",
+            "repo": "upstream:mesa",
+            "ref": "baserock/genivi/morph",
+            "build-depends": []
+        },
+        {
+            "name": "xorg-lib-libxkbfile",
+            "repo": "upstream:xorg-lib-libxkbfile",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "pixman",
+            "repo": "upstream:pixman",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "xorg-font-util",
+            "repo": "upstream:xorg-font-util",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "xorg-lib-libfontenc",
+            "repo": "upstream:xorg-lib-libfontenc",
+            "ref": "master",
+            "build-depends": [
+                "xorg-font-util"
+            ]
+        },
+        {
+            "name": "freetype2",
+            "repo": "upstream:freetype2",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "fontconfig",
+            "repo": "upstream:fontconfig",
+            "ref": "master",
+            "build-depends": [
+                "freetype2"
+            ]
+        },
+        {
+            "name": "xorg-lib-libXfont",
+            "repo": "upstream:xorg-lib-libXfont",
+            "ref": "master",
+            "build-depends": [
+                "freetype2",
+                "xorg-lib-libfontenc"
+            ]
+        },
+        {
+            "name": "xorg-lib-libICE",
+            "repo": "upstream:xorg-lib-libICE",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "xorg-lib-libSM",
+            "repo": "upstream:xorg-lib-libSM",
+            "ref": "master",
+            "build-depends": [
+                "xorg-lib-libICE"
+            ]
+        },
+        {
+            "name": "xorg-lib-libXt",
+            "repo": "upstream:xorg-lib-libXt",
+            "ref": "master",
+            "build-depends": [
+                "xorg-lib-libSM"
+            ]
+        },
+        {
+            "name": "xorg-lib-libXmu",
+            "repo": "upstream:xorg-lib-libXmu",
+            "ref": "master",
+            "build-depends": [
+                "xorg-lib-libXt"
+            ]
+        },
+        {
+            "name": "xorg-lib-libXpm",
+            "repo": "upstream:xorg-lib-libXpm",
+            "ref": "master",
+            "build-depends": [
+                "xorg-lib-libXt"
+            ]
+        },
+        {
+            "name": "xorg-lib-libXaw",
+            "repo": "upstream:xorg-lib-libXaw",
+            "ref": "master",
+            "build-depends": [
+                "xorg-lib-libXmu",
+                "xorg-lib-libXpm",
+                "xorg-lib-libXt"
+            ]
+        },
+        {
+            "name": "fontutils",
+            "repo": "upstream:fontutils",
+            "ref": "baserock/morph",
+            "build-depends": [
+                "xorg-lib-libXaw",
+                "xorg-lib-libXfont",
+                "xorg-lib-libXt",
+                "xorg-lib-libfontenc"
+            ]
+        },
+        {
+            "name": "libsha1",
+            "repo": "upstream:libsha1",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "xserver",
+            "repo": "upstream:xserver",
+            "ref": "master",
+            "build-depends": [
+                "fontutils",
+                "libsha1",
+                "mesa-x",
+                "pixman",
+                "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": "master",
+            "build-depends": [
+                "xserver"
+            ]
+        },
+        {
+            "name": "xorg-driver-xf86-video-fbdev",
+            "repo": "upstream:xorg-driver-xf86-video-fbdev",
+            "ref": "master",
+            "build-depends": [
+                "xserver"
+            ]
+        },
+        {
+            "name": "xorg-driver-xf86-video-vesa",
+            "repo": "upstream:xorg-driver-xf86-video-vesa",
+            "ref": "master",
+            "build-depends": [
+                "xserver"
+            ]
+        },
+        {
+            "name": "xorg-driver-xf86-input-evdev",
+            "repo": "upstream:xorg-driver-xf86-input-evdev",
+            "ref": "master",
+            "build-depends": [
+                "xserver"
+            ]
+        },
+        {
+            "name": "xorg-driver-xf86-input-keyboard",
+            "repo": "upstream:xorg-driver-xf86-input-keyboard",
+            "ref": "master",
+            "build-depends": [
+                "xserver"
+            ]
+        },
+        {
+            "name": "xorg-driver-xf86-input-mouse",
+            "repo": "upstream:xorg-driver-xf86-input-mouse",
+            "ref": "master",
+            "build-depends": [
+                "xserver"
+            ]
+        },
+        {
+            "name": "xorg-app-xkbcomp",
+            "repo": "upstream:xorg-app-xkbcomp",
+            "ref": "master",
+            "build-depends": [
+                "xorg-lib-libxkbfile"
+            ]
+        },
+        {
+            "name": "xkeyboard-config",
+            "repo": "upstream:xkeyboard-config",
+            "ref": "master",
+            "build-depends": [
+                "xorg-app-xkbcomp"
+            ]
+        },
+        {
+            "name": "xorg-app-xinit",
+            "repo": "upstream:xorg-app-xinit",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "xorg-lib-libXft",
+            "repo": "upstream:xorg-lib-libXft",
+            "ref": "master",
+            "build-depends": [
+                "fontconfig",
+                "freetype2"
+            ]
+        },
+        {
+            "name": "xcb-util",
+            "repo": "upstream:xcb-util",
+            "ref": "master",
+            "build-depends": []
+        },
+        {
+            "name": "xterm",
+            "repo": "upstream:xterm",
+            "ref": "master",
+            "build-depends": [
+                "xorg-lib-libXaw",
+                "xorg-lib-libxkbfile"
+            ]
+        }
+    ]
+}