Rename x-generic to x-wayland.

Any systems that depend on xorg server currently don't work, as the
x-generic stratum only provides XWaylanf now.

This patch does not fix the breakage, but does make the breakage
easier to spot.

16 files changed, 71 insertions, 66 deletions

diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph
index 541b4f7a..eaa169cc 100644
--- a/strata/enlightenment.morph
+++ b/strata/enlightenment.morph
@@ -3,7 +3,7 @@ kind: stratum
 description: Enlightenment Desktop and Window Manager
 build-depends:
 - morph: strata/tools.morph
-- morph: strata/x-generic.morph
+- morph: strata/x-wayland.morph
 - morph: strata/lua.morph
 - morph: strata/audio-bluetooth.morph
 - morph: strata/multimedia.morph
diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph
index baa935f5..c987751a 100644
--- a/strata/graphics-common.morph
+++ b/strata/graphics-common.morph
@@ -58,3 +58,23 @@ chunks:
   unpetrify-ref: baserock/0.9.12
   build-depends:
   - freetype2
+- name: xorg-font-util
+  repo: upstream:xorg-font-util
+  ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - freetype2
+- name: xorg-lib-libfontenc
+  repo: upstream:xorg-lib-libfontenc
+  ref: f5d1208172e965fdd7fae8927bd3e29b3cc3a975
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - freetype2
+  - xorg-font-util
+- name: xorg-lib-libXfont
+  repo: upstream:xorg-lib-libXfont
+  ref: ad4f4d8a2d0730c0ea3c09210bf921638b4682bc
+  unpetrify-ref: libXfont-1.5.0
+  build-depends:
+  - freetype2
+  - xorg-lib-libfontenc
diff --git a/strata/gtk2.morph b/strata/gtk2.morph
index 8ac31eaa..43bd0ccc 100644
--- a/strata/gtk2.morph
+++ b/strata/gtk2.morph
@@ -3,7 +3,7 @@ kind: stratum
 description: the gtk2 stratum
 build-depends:
 - morph: strata/gtk-deps.morph
-- morph: strata/x-generic.morph
+- morph: strata/x-wayland.morph
 chunks:
 - name: gtk+
   morph: strata/gtk2/gtk+.morph
diff --git a/strata/qt4-tools.morph b/strata/qt4-tools.morph
index 18d2cc5f..d00b2e98 100644
--- a/strata/qt4-tools.morph
+++ b/strata/qt4-tools.morph
@@ -3,7 +3,7 @@ kind: stratum
 description: Qt4 Development Libraries and Tools
 build-depends:
 - morph: strata/tools.morph
-- morph: strata/x-generic.morph
+- morph: strata/x-wayland.morph
 - morph: strata/multimedia-gstreamer-0.10.morph
 chunks:
 - name: icu
diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph
index 34e57bc4..23eb2a86 100644
--- a/strata/qt5-tools.morph
+++ b/strata/qt5-tools.morph
@@ -3,7 +3,7 @@ kind: stratum
 description: Qt5 Development Libraries and Tools
 build-depends:
 - morph: strata/tools.morph
-- morph: strata/x-generic.morph
+- morph: strata/x-wayland.morph
 chunks:
 - name: icu
   morph: strata/qt5-tools/icu.morph
diff --git a/strata/virtualbox-guest-x86_64.morph b/strata/virtualbox-guest-x86_64.morph
index 7ac14158..7ca15d3a 100644
--- a/strata/virtualbox-guest-x86_64.morph
+++ b/strata/virtualbox-guest-x86_64.morph
@@ -6,7 +6,7 @@ build-depends:
 - morph: strata/tools.morph
 - morph: strata/bsp-x86_64-generic.morph
 - morph: strata/x-common.morph
-- morph: strata/x-generic.morph
+- morph: strata/x-wayland.morph
 chunks:
 - name: yasm
   morph: strata/virtualbox-guest-x86_64/yasm.morph
diff --git a/strata/x-common.morph b/strata/x-common.morph
index 8191b30f..c2981f41 100644
--- a/strata/x-common.morph
+++ b/strata/x-common.morph
@@ -233,3 +233,19 @@ chunks:
   - xorg-proto-fixesproto
   - xorg-lib-libXau
   - xorg-lib-libX11
+- name: xorg-lib-libxkbfile
+  repo: upstream:xorg-lib-libxkbfile
+  ref: 7381c2f9013ef7784c78091fa671e652a62ca706
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - xorg-proto-kbproto
+  - xorg-lib-libX11
+  - xcb-libxcb
+- name: xorg-app-xkbcomp
+  repo: upstream:xorg-app-xkbcomp
+  ref: 705b9bbb426410f9510601c7010da51184919b36
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - xorg-lib-libX11
+  - xcb-libxcb
+  - xorg-lib-libxkbfile
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
deleted file mode 100644
index 572932b4..00000000
--- a/strata/x-generic.morph
+++ /dev/null
@@ -1,52 +0,0 @@
-name: x-generic
-kind: stratum
-build-depends:
-- morph: strata/foundation.morph
-- morph: strata/libdrm-common.morph
-- morph: strata/mesa-common.morph
-- morph: strata/x-common.morph
-- morph: strata/graphics-common.morph
-chunks:
-- name: libepoxy
-  repo: upstream:libepoxy
-  ref: 7422de5b4be7b19d789136b3bb5f932de42db27c
-  unpetrify-ref: v1.2
-  build-depends: []
-- name: xorg-lib-libxkbfile
-  repo: upstream:xorg-lib-libxkbfile
-  ref: 7381c2f9013ef7784c78091fa671e652a62ca706
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: xorg-font-util
-  repo: upstream:xorg-font-util
-  ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: xorg-lib-libfontenc
-  repo: upstream:xorg-lib-libfontenc
-  ref: f5d1208172e965fdd7fae8927bd3e29b3cc3a975
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-font-util
-- name: xorg-lib-libXfont
-  repo: upstream:xorg-lib-libXfont
-  ref: ad4f4d8a2d0730c0ea3c09210bf921638b4682bc
-  unpetrify-ref: libXfont-1.5.0
-  build-depends:
-  - xorg-lib-libfontenc
-- name: xserver
-  morph: strata/x-generic/xserver.morph
-  repo: upstream:xserver
-  ref: 4393c7f1ba6140a02232f04fbb434a80d663a99d
-  unpetrify-ref: xorg-server-1.16.2
-  build-depends:
-  - libepoxy
-  - xorg-font-util
-  - xorg-lib-libXfont
-  - xorg-lib-libxkbfile
-- name: xorg-app-xkbcomp
-  repo: upstream:xorg-app-xkbcomp
-  ref: 705b9bbb426410f9510601c7010da51184919b36
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-lib-libxkbfile
diff --git a/strata/x-wayland.morph b/strata/x-wayland.morph
new file mode 100644
index 00000000..6d068684
--- /dev/null
+++ b/strata/x-wayland.morph
@@ -0,0 +1,21 @@
+name: x-wayland
+kind: stratum
+build-depends:
+- morph: strata/foundation.morph
+- morph: strata/libdrm-common.morph
+- morph: strata/mesa-common.morph
+- morph: strata/x-common.morph
+- morph: strata/graphics-common.morph
+chunks:
+- name: libepoxy
+  repo: upstream:libepoxy
+  ref: 7422de5b4be7b19d789136b3bb5f932de42db27c
+  unpetrify-ref: v1.2
+  build-depends: []
+- name: xserver
+  morph: strata/x-wayland/xserver.morph
+  repo: upstream:xserver
+  ref: 4393c7f1ba6140a02232f04fbb434a80d663a99d
+  unpetrify-ref: xorg-server-1.16.2
+  build-depends:
+  - libepoxy
diff --git a/strata/x-generic/util-keysyms.morph b/strata/x-wayland/util-keysyms.morph
index ddae3707..ddae3707 100644
--- a/strata/x-generic/util-keysyms.morph
+++ b/strata/x-wayland/util-keysyms.morph
diff --git a/strata/x-generic/xserver.morph b/strata/x-wayland/xserver.morph
index ca678331..ca678331 100644
--- a/strata/x-generic/xserver.morph
+++ b/strata/x-wayland/xserver.morph
diff --git a/strata/xfce.morph b/strata/xfce.morph
index 5678c1fc..cd22f57c 100644
--- a/strata/xfce.morph
+++ b/strata/xfce.morph
@@ -3,7 +3,7 @@ kind: stratum
 description: xfce stratum
 build-depends:
 - morph: strata/gtk2.morph
-- morph: strata/x-generic.morph
+- morph: strata/x-wayland.morph
 chunks:
 - name: libcroco
   repo: upstream:libcroco
diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph
index b4e20ec7..829d9d56 100644
--- a/systems/gitlab-ci-runner.morph
+++ b/systems/gitlab-ci-runner.morph
@@ -19,8 +19,8 @@ strata:
   morph: strata/audio-bluetooth.morph
 - name: x-common
   morph: strata/x-common.morph
-- name: x-generic
-  morph: strata/x-generic.morph
+- name: x-wayland
+  morph: strata/x-wayland.morph
 - name: multimedia
   morph: strata/multimedia.morph
 - name: genivi
diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph
index 9a23bdeb..1448e55c 100644
--- a/systems/qt4-devel-system-x86_64-generic.morph
+++ b/systems/qt4-devel-system-x86_64-generic.morph
@@ -20,8 +20,8 @@ strata:
   morph: strata/tools.morph
 - name: x-common
   morph: strata/x-common.morph
-- name: x-generic
-  morph: strata/x-generic.morph
+- name: x-wayland
+  morph: strata/x-wayland.morph
 - name: qt4-tools
   morph: strata/qt4-tools.morph
 - name: qt4-sdk
diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph
index 1a78ff4f..eaed6664 100644
--- a/systems/qt5-devel-system-x86_64-generic.morph
+++ b/systems/qt5-devel-system-x86_64-generic.morph
@@ -20,8 +20,8 @@ strata:
   morph: strata/tools.morph
 - name: x-common
   morph: strata/x-common.morph
-- name: x-generic
-  morph: strata/x-generic.morph
+- name: x-wayland
+  morph: strata/x-wayland.morph
 - name: qt5-tools
   morph: strata/qt5-tools.morph
 - name: qt5-tools-qtwebkit
diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph
index b84eaeb5..e3d97a02 100644
--- a/systems/weston-system-x86_64-generic.morph
+++ b/systems/weston-system-x86_64-generic.morph
@@ -35,8 +35,8 @@ strata:
   morph: strata/weston-common.morph
 - name: x-common
   morph: strata/x-common.morph
-- name: x-generic
-  morph: strata/x-generic.morph
+- name: x-wayland
+  morph: strata/x-wayland.morph
 configuration-extensions:
 - set-hostname
 - add-config-files