Firehose test commit

42 files changed, 562 insertions, 38 deletions

diff --git a/strata/bsp-armv8l64-generic.morph b/strata/bsp-armv8l64-generic.morph
index ca74dbe3..ca52426e 100644
--- a/strata/bsp-armv8l64-generic.morph
+++ b/strata/bsp-armv8l64-generic.morph
@@ -10,5 +10,5 @@ chunks:
 - name: linux-armv8l64-generic
   morph: strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph
   repo: upstream:linux
-  ref: 5f06398ae6a04f414932243de38b5cf3d264ff84
-  unpetrify-ref: baserock/apm-xgene-m400-moonshot-cartridge
+  ref: 097f70b3c4d84ffccca15195bdfde3a37c0a7c0f
+  unpetrify-ref: master
diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph
index 31d8374c..db08f54b 100644
--- a/strata/bsp-x86_64-generic.morph
+++ b/strata/bsp-x86_64-generic.morph
@@ -9,9 +9,9 @@ build-depends:
 chunks:
 - name: linux-x86-64-generic
   morph: strata/bsp-x86_64-generic/linux-x86-64-generic.morph
-  repo: upstream:linux
-  ref: 39a8804455fb23f09157341d3ba7db6d7ae6ee76
-  unpetrify-ref: v4.0
+  repo: upstream:linux-stable
+  ref: 64291f7db5bd8150a74ad2036f1037e6a0428df2
+  unpetrify-ref: v4.2
 - name: nasm
   morph: strata/bsp-x86_64-generic/nasm.morph
   repo: upstream:nasm
diff --git a/strata/core.morph b/strata/core.morph
index 5ef86c1b..30add442 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -311,8 +311,8 @@ chunks:
 - name: util-linux
   morph: strata/core/util-linux.morph
   repo: upstream:util-linux
-  ref: 34760e62e0d5a25262a6aa801b2f1df61216363f
-  unpetrify-ref: v2.26.1
+  ref: cd150a429d15a7c96918aa2432532ced0bd27465
+  unpetrify-ref: v2.27
   build-depends:
   - autoconf
   - automake
diff --git a/strata/core/python-setuptools.morph b/strata/core/python-setuptools.morph
deleted file mode 100644
index fa436c60..00000000
--- a/strata/core/python-setuptools.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: python-setuptools
-kind: chunk
-build-commands:
-- python setup.py build
-install-commands:
-- python setup.py install --prefix=/usr --root "$DESTDIR"
diff --git a/strata/core/readline.morph b/strata/core/readline.morph
index 511e124c..08c9586c 100644
--- a/strata/core/readline.morph
+++ b/strata/core/readline.morph
@@ -4,3 +4,5 @@ build-system: autotools
 pre-configure-commands:
 - cp /usr/share/automake*/config.guess support
 - cp /usr/share/automake*/config.sub support
+build-commands:
+- make SHLIB_LIBS=-lncurses
diff --git a/strata/coreutils-common/coreutils.morph b/strata/coreutils-common/coreutils.morph
index 19542d79..3071cb9e 100644
--- a/strata/coreutils-common/coreutils.morph
+++ b/strata/coreutils-common/coreutils.morph
@@ -1,9 +1,10 @@
 name: coreutils
 kind: chunk
 build-system: autotools
-configure-commands:
+pre-configure-commands:
 - sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
 - bash bootstrap --skip-po --no-git --gnulib-srcdir=gnulib
+configure-commands:
 - FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix="$PREFIX" --disable-nls
 build-commands:
 - make WERROR_CFLAGS=
diff --git a/strata/foundation.morph b/strata/foundation.morph
index ff18e4e7..3fd3dbde 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -42,14 +42,14 @@ chunks:
 - name: libgcrypt
   repo: upstream:libgcrypt
   ref: 412eed473b557ed2172d81d76fa1e1f53c973a67
-  build-system: autotools
   build-depends:
   - libgpg-error
+  build-system: autotools
 - name: systemd
   morph: strata/foundation/systemd.morph
   repo: upstream:systemd
-  ref: e1439a1472c5f691733b8ef10e702beac2496a63
-  unpetrify-ref: v225
+  ref: 9dc5db34adbd6fa3d2ac08d9610d401ba69cde93
+  unpetrify-ref: master
   build-depends:
   - dbus-pre
   - kmod
@@ -58,16 +58,16 @@ chunks:
   repo: upstream:libusb
   ref: e11525c66c7dd2db466c8f5785ff0b37d6a99ec9
   unpetrify-ref: v1.0.19
-  build-system: autotools
   build-depends:
   - systemd
+  build-system: autotools
 - name: usbutils
   repo: upstream:usbutils
   ref: c37f146eb2c6642c600f1b025a6d56996b0697ff
   unpetrify-ref: baserock/v008
-  build-system: autotools
   build-depends:
   - libusb
+  build-system: autotools
 - name: lzo
   morph: strata/foundation/lzo.morph
   repo: upstream:lzo
diff --git a/strata/glib-common.morph b/strata/glib-common.morph
index 09c88dfe..861c5fc4 100644
--- a/strata/glib-common.morph
+++ b/strata/glib-common.morph
@@ -16,13 +16,13 @@ chunks:
   build-system: autotools
 - name: glib
   repo: upstream:glib
-  ref: 966ffb16f6bd54cb3d928a55d00d0eda73592094
-  unpetrify-ref: 2.44.0
+  ref: 5475be0c1053df95ac560a94b918445411b3639e
+  unpetrify-ref: 2.45.8
   build-system: autotools
 - name: gobject-introspection
   repo: upstream:gobject-introspection
-  ref: c0243e116c5e261c262dded9f4d7726a770c5a19
-  unpetrify-ref: GOBJECT_INTROSPECTION_1_44_0
+  ref: a984a0f57a8ab178762d5942e2d552121edae091
+  unpetrify-ref: 1.46.0
   build-system: autotools
   build-depends:
   - glib
diff --git a/strata/gnome.morph b/strata/gnome.morph
new file mode 100644
index 00000000..792a0953
--- /dev/null
+++ b/strata/gnome.morph
@@ -0,0 +1,359 @@
+name: gnome
+kind: stratum
+description: GNOME stratum
+build-depends:
+- morph: strata/input-common.morph
+- morph: strata/tools.morph
+- morph: strata/gtk3.morph
+- morph: strata/audio-bluetooth.morph
+- morph: strata/libsoup-common.morph
+- morph: strata/NetworkManager-common.morph
+- morph: strata/multimedia-gstreamer.morph
+- morph: strata/network-security.morph
+- morph: strata/python-pygobject.morph
+- morph: strata/python3-core.morph
+- morph: strata/wayland-generic.morph
+- morph: strata/x-generic.morph
+chunks:
+- name: dconf
+  morph: strata/gnome/dconf.morph
+  repo: upstream:dconf
+  ref: 7c0beccf286a1dbd396fda7d40b438598a6ce7f4
+  unpetrify-ref: master
+- name: cogl
+  morph: strata/gnome/cogl.morph
+  repo: upstream:gnome/cogl
+  ref: 85e0b084592e6beef2987b02e34a3909f35708e0
+  unpetrify-ref: cogl-1.22
+- name: json-glib
+  repo: upstream:json-glib
+  ref: bfbc0b48e9256473491755766c079f73bee80724
+  unpetrify-ref: master
+  build-system: autotools
+- name: clutter
+  morph: strata/gnome/clutter.morph
+  repo: upstream:gnome/clutter
+  ref: 8e52f8c61ef2192eaf7f2208a922d3530df47d9b
+  unpetrify-ref: master
+  build-depends:
+  - cogl
+  - json-glib
+- name: gsettings-desktop-schemas
+  repo: upstream:gnome/gsettings-desktop-schemas
+  ref: db40812cd79f64c98432efd1b632c5633a27f77e
+  unpetrify-ref: master
+  build-system: autotools
+- name: itstool
+  repo: upstream:itstool
+  ref: 359be5c350fc3d869807f663cee2b028adf1f5d7
+  unpetrify-ref: master
+  build-system: autotools
+- name: yelp-xsl
+  repo: upstream:yelp-xsl
+  ref: 2dcf168dde754d18152b008473269a803d6e650b
+  unpetrify-ref: master
+  build-depends:
+  - itstool
+  build-system: autotools
+- name: yelp-tools
+  repo: upstream:yelp-tools
+  ref: 6df6bf24e385bbc1ac0b800be8a6e878f18a775c
+  unpetrify-ref: master
+  build-depends:
+  - itstool
+  - yelp-xsl
+  build-system: autotools
+- name: iso-codes
+  repo: upstream:iso-codes
+  ref: 18ac112b4b84c8f03743565fde3512a637820761
+  unpetrify-ref: master
+  build-system: autotools
+- name: gnome-desktop
+  repo: upstream:gnome/gnome-desktop
+  ref: 1dbe40fac0e9924552ce2692ec141e86ce3d5633
+  unpetrify-ref: master
+  build-depends:
+  - gsettings-desktop-schemas
+  - iso-codes
+  - yelp-tools
+  build-system: autotools
+- name: libnotify
+  repo: upstream:gnome/libnotify
+  ref: 2f2c5649ef210b1dffeb46cddf062d20e1518ccf
+  unpetrify-ref: master
+  build-system: autotools
+- name: lcms2
+  repo: upstream:lcms2
+  ref: ff42eeaf932b64af997681f0eed6be3b67ebeb18
+  unpetrify-ref: baserock/gnome
+  build-system: autotools
+- name: gconf
+  morph: strata/gnome/gconf.morph
+  repo: upstream:gconf
+  ref: 4ef012c2a62d9abd759adb3aeb9d3b9cee17f721
+  unpetrify-ref: master
+- name: ibus
+  morph: strata/gnome/ibus.morph
+  repo: upstream:ibus
+  ref: 1d678673e18e132ed53df32502b779b0a56314d5
+  unpetrify-ref: master
+  build-depends:
+  - dconf
+  - gconf
+  - iso-codes
+  - libnotify
+- name: libcanberra
+  repo: upstream:libcanberra
+  ref: c0620e432650e81062c1967cc669829dbd29b310
+  unpetrify-ref: master
+  build-system: autotools
+- name: upower
+  morph: strata/gnome/upower.morph
+  repo: upstream:upower
+  ref: 0825c162d3dc909966b10fecabbc2c1da364c1a6
+  unpetrify-ref: master
+- name: gusb
+  repo: upstream:gusb
+  ref: 0c5eb813279c67607e17dfd99087358d34c6c8f5
+  unpetrify-ref: master
+  build-system: autotools
+- name: mozjs17
+  morph: strata/gnome/mozjs17.morph
+  repo: upstream:mozilla/mozjs17
+  ref: c8e33aaaba2787d3c94eba00257051400d106e76
+  unpetrify-ref: baserock/gnome
+- name: polkit
+  morph: strata/gnome/polkit.morph
+  repo: upstream:polkit
+  ref: 5a7e3b76aa45eea43e4bdc403ddd4c6e1a4c6542
+  unpetrify-ref: master
+  build-depends:
+  - mozjs17
+- name: colord
+  repo: upstream:colord
+  ref: e68f251b753297fcd1fc2bb7356588945bd3e69b
+  unpetrify-ref: baserock/gnome
+  build-depends:
+  - gusb
+  - lcms2
+  - polkit
+  build-system: autotools
+- name: geocode-glib
+  repo: upstream:gnome/geocode-glib
+  ref: a3e183e40053b4bd0fd0b25a070f60597270397a
+  unpetrify-ref: master
+  build-depends:
+  - json-glib
+  build-system: autotools
+- name: libmbim
+  repo: upstream:libmbim
+  ref: 6cf74ebfae1dccf807bb34d88f2cd024d4b14da7
+  unpetrify-ref: master
+  build-system: autotools
+- name: libqmi
+  repo: upstream:libqmi
+  ref: 97aaa6855d071f64ec2e28df1b9f816da02a3e07
+  unpetrify-ref: master
+  build-system: autotools
+- name: ModemManager
+  repo: upstream:ModemManager
+  ref: 0ca68657fbcd5bace3d303a0babe2da292784385
+  unpetrify-ref: master
+  build-depends:
+  - libmbim
+  - libqmi
+  - polkit
+  build-system: autotools
+- name: geoclue
+  morph: strata/gnome/geoclue.morph
+  repo: upstream:geoclue
+  ref: 93241301b9c47a5e7a61978cf5154752c85bd183
+  unpetrify-ref: master
+  build-depends:
+  - json-glib
+  - ModemManager
+- name: libgweather
+  repo: upstream:gnome/libgweather
+  ref: 5b8aed611f24d03434eed35e438cea213b894b7c
+  unpetrify-ref: master
+  build-depends:
+  - geocode-glib
+  build-system: autotools
+- name: gnome-settings-daemon
+  morph: strata/gnome/gnome-settings-daemon.morph
+  repo: upstream:gnome-settings-daemon
+  ref: 8d4904fb35e8aa8b9b0b135b6026464c8e40d254
+  unpetrify-ref: baserock/3.18.0/disable_wacom
+  build-depends:
+  - colord
+  - geoclue
+  - geocode-glib
+  - gnome-desktop
+  - gsettings-desktop-schemas
+  - ibus
+  - libcanberra
+  - libgweather
+  - libnotify
+  - lcms2
+  - upower
+- name: zenity
+  repo: upstream:zenity
+  ref: d7135db2bdfdca812c0165f90e4611af9c7c6a50
+  unpetrify-ref: master
+  build-depends:
+  - yelp-tools
+  build-system: autotools
+- name: mozjs24
+  morph: strata/gnome/mozjs24.morph
+  repo: upstream:mozilla/mozjs24
+  ref: 334066c83de6c96320b63663a35d53159158c9b7
+  unpetrify-ref: baserock/gnome
+- name: gjs
+  repo: upstream:gjs
+  ref: 5d480f519e2b7e95cf1fad2f9f1a8e798fd5fe49
+  unpetrify-ref: master
+  build-depends:
+  - mozjs24
+  build-system: autotools
+- name: telepathy-glib
+  morph: strata/gnome/telepathy-glib.morph
+  repo: upstream:telepathy-glib
+  ref: d27684c488ceee4f2f54f549738adab0e2e8165d
+  unpetrify-ref: master
+- name: startup-notification
+  repo: upstream:startup-notification
+  ref: 07237ff25d6171e1b548118442ddba4259a53ba5
+  unpetrify-ref: master
+  build-system: autotools
+- name: libtasn1
+  repo: upstream:libtasn1
+  ref: 7f3a9c2294cdebd9e63fe007150c181b980865ef
+  unpetrify-ref: baserock/gnome
+  build-system: autotools
+- name: p11-kit
+  morph: strata/gnome/p11-kit.morph
+  repo: upstream:p11-kit
+  ref: 3a005e75a4e1b63db8e19ea0e73479588ab345a6
+  unpetrify-ref: master
+  build-depends:
+  - libtasn1
+- name: gcr
+  repo: upstream:gnome/gcr
+  ref: 1cce27499bcac6072e4ee516eaa1546eac56d687
+  unpetrify-ref: master
+  build-depends:
+  - p11-kit
+  build-system: autotools
+- name: libxkbcommon-x11
+  repo: upstream:xorg-lib-libxkbcommon
+  ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28
+  unpetrify-ref: xkbcommon-0.5.0
+  build-system: autotools
+- name: mutter
+  repo: upstream:mutter
+  ref: 35729e8659cc99f45d3564c33d44a475f20d0060
+  unpetrify-ref: 3.18.0
+  build-depends:
+  - clutter
+  - cogl
+  - gnome-desktop
+  - gnome-settings-daemon
+  - gsettings-desktop-schemas
+  - libxkbcommon-x11
+  - startup-notification
+  - upower
+  - zenity
+  build-system: autotools
+- name: libxklavier
+  repo: upstream:libxklavier
+  ref: 65c132a65e90a42e898f07243ef544109ada53c9
+  unpetrify-ref: master
+  build-depends:
+  - iso-codes
+  build-system: autotools
+- name: m4-common
+  repo: upstream:m4-common
+  ref: 4b704704f5e826b73b79ccfddaf215a510c104c4
+  unpetrify-ref: baserock/morph
+  build-system: autotools
+- name: libgee
+  repo: upstream:gnome/libgee
+  ref: 4301ab58efc217409c588a5527f68990b4e3d220
+  unpetrify-ref: master
+  build-depends:
+  - m4-common
+  build-system: autotools
+- name: caribou
+  morph: strata/gnome/caribou.morph
+  repo: upstream:caribou
+  ref: 489fce995da8fc2817a8fd35b56532acd31a278a
+  unpetrify-ref: master
+  build-depends:
+  - clutter
+  - libgee
+  - libxklavier
+- name: icu
+  morph: strata/gnome/icu.morph
+  repo: upstream:icu
+  ref: ba023548a3bff7277cbea4acade3042ce9d8949e
+  unpetrify-ref: baserock/morph
+- name: libsecret
+  morph: strata/gnome/libsecret.morph
+  repo: upstream:gnome/libsecret
+  ref: 4d76cf7dd8e55d93bb58164a1fff38113ba97af5
+  unpetrify-ref: master
+- name: evolution-data-server
+  morph: strata/gnome/evolution-data-server.morph
+  repo: upstream:evolution-data-server
+  ref: a65ecdfb144bd74d0fc8103765aac128148a8e26
+  unpetrify-ref: master
+  build-depends:
+  - gcr
+  - icu
+  - libgweather
+  - libsecret
+- name: gnome-shell
+  morph: strata/gnome/gnome-shell.morph
+  repo: upstream:gnome/gnome-shell
+  ref: 7d01383b8ee4919534a5df11e4f22ab43c240d4e
+  unpetrify-ref: baserock/3.18.0
+  build-depends:
+  - caribou
+  - clutter
+  - evolution-data-server
+  - gcr
+  - gjs
+  - libcanberra
+  - mutter
+  - polkit
+  - startup-notification
+  - telepathy-glib
+- name: gnome-session
+  morph: strata/gnome/gnome-session.morph
+  repo: upstream:gnome/gnome-session
+  ref: e5c28ee81c91d659e592de55e0fc42e8e936d128
+  unpetrify-ref: master
+  build-depends:
+  - gnome-desktop
+  - json-glib
+- name: d-feet
+  morph: strata/gnome/d-feet.morph
+  repo: upstream:gnome/d-feet
+  ref: a526f5325f179482f915216f7781232899be5600
+  unpetrify-ref: master
+  build-depends:
+  - yelp-tools
+- name: gnome-keyring
+  morph: strata/gnome/gnome-keyring.morph
+  repo: upstream:gnome-keyring
+  ref: 4307ec560e48ab5b05fecaa12b98978eab4e1b82
+  unpetrify-ref: master
+  build-depends:
+  - gcr
+- name: gvfs
+  morph: strata/gnome/gvfs.morph
+  repo: upstream:gvfs
+  ref: d037b5fd56cae878ed7bb5269a40e4bd046551d7
+  unpetrify-ref: master
+  build-depends:
+  - gcr
diff --git a/strata/gnome/autoconf-archive.morph b/strata/gnome/autoconf-archive.morph
new file mode 100644
index 00000000..de05f0aa
--- /dev/null
+++ b/strata/gnome/autoconf-archive.morph
@@ -0,0 +1,5 @@
+name: autoconf-archive
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- ./bootstrap.sh
diff --git a/strata/gnome/caribou.morph b/strata/gnome/caribou.morph
new file mode 100644
index 00000000..19dd6ca4
--- /dev/null
+++ b/strata/gnome/caribou.morph
@@ -0,0 +1,5 @@
+name: caribou
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-gtk2-module
diff --git a/strata/gnome/clutter.morph b/strata/gnome/clutter.morph
new file mode 100644
index 00000000..cb677d8e
--- /dev/null
+++ b/strata/gnome/clutter.morph
@@ -0,0 +1,6 @@
+name: clutter
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --enable-wayland-backend --enable-wayland-compositor
+  --enable-egl-backend --enable-evdev-input --enable-x11-backend
diff --git a/strata/gnome/cogl.morph b/strata/gnome/cogl.morph
new file mode 100644
index 00000000..95ab78e3
--- /dev/null
+++ b/strata/gnome/cogl.morph
@@ -0,0 +1,6 @@
+name: cogl
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --enable-wayland-egl-platform --enable-wayland-egl-server
+  --enable-kms-egl-platform --enable-xlib-egl-platform --enable-cogl-gst
diff --git a/strata/gnome/d-feet.morph b/strata/gnome/d-feet.morph
new file mode 100644
index 00000000..8d3e201b
--- /dev/null
+++ b/strata/gnome/d-feet.morph
@@ -0,0 +1,5 @@
+name: d-feet
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-tests
diff --git a/strata/gnome/dconf.morph b/strata/gnome/dconf.morph
new file mode 100644
index 00000000..b9ea35a7
--- /dev/null
+++ b/strata/gnome/dconf.morph
@@ -0,0 +1,5 @@
+name: dconf
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-man
diff --git a/strata/gnome/evolution-data-server.morph b/strata/gnome/evolution-data-server.morph
new file mode 100644
index 00000000..aa44ca07
--- /dev/null
+++ b/strata/gnome/evolution-data-server.morph
@@ -0,0 +1,5 @@
+name: evolution-data-server
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-goa --disable-uoa --with-libdb=no --disable-google --with-nss-includes=/usr/include/nss --with-nspr-includes=/usr/include/nspr
diff --git a/strata/gnome/gconf.morph b/strata/gnome/gconf.morph
new file mode 100644
index 00000000..05fdee0e
--- /dev/null
+++ b/strata/gnome/gconf.morph
@@ -0,0 +1,5 @@
+name: gconf
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-orbit --disable-documentation
diff --git a/strata/gnome/geoclue.morph b/strata/gnome/geoclue.morph
new file mode 100644
index 00000000..ce91eff9
--- /dev/null
+++ b/strata/gnome/geoclue.morph
@@ -0,0 +1,5 @@
+name: geoclue
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-nmea-source
diff --git a/strata/gnome/gnome-keyring.morph b/strata/gnome/gnome-keyring.morph
new file mode 100644
index 00000000..bdc2ca70
--- /dev/null
+++ b/strata/gnome/gnome-keyring.morph
@@ -0,0 +1,5 @@
+name: gnome-keyring
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-doc
diff --git a/strata/gnome/gnome-session.morph b/strata/gnome/gnome-session.morph
new file mode 100644
index 00000000..d61cb5e9
--- /dev/null
+++ b/strata/gnome/gnome-session.morph
@@ -0,0 +1,5 @@
+name: gnome-session
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-man --enable-systemd
diff --git a/strata/gnome/gnome-settings-daemon.morph b/strata/gnome/gnome-settings-daemon.morph
new file mode 100644
index 00000000..bb1123cb
--- /dev/null
+++ b/strata/gnome/gnome-settings-daemon.morph
@@ -0,0 +1,5 @@
+name: gnome-settings-daemon
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-cups --disable-man
diff --git a/strata/gnome/gnome-shell.morph b/strata/gnome/gnome-shell.morph
new file mode 100644
index 00000000..d8180fb2
--- /dev/null
+++ b/strata/gnome/gnome-shell.morph
@@ -0,0 +1,5 @@
+name: gnome-shell
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-man --enable-compile-warnings=maximum
diff --git a/strata/gnome/gnulib.morph b/strata/gnome/gnulib.morph
new file mode 100644
index 00000000..f1837c94
--- /dev/null
+++ b/strata/gnome/gnulib.morph
@@ -0,0 +1,8 @@
+name: gnulib
+kind: chunk
+build-system: manual
+pre-configure-commands:
+- mkdir -p "$DESTDIR$PREFIX"/share/gnulib
+- cp -r * "$DESTDIR$PREFIX"/share/gnulib
+- mkdir -p "$DESTDIR$PREFIX"/bin
+- ln -s "$DESTDIR$PREFIX"/share/gnulib/gnulib-tool "$DESTDIR$PREFIX"/bin/gnulib-tool
diff --git a/strata/gnome/gvfs.morph b/strata/gnome/gvfs.morph
new file mode 100644
index 00000000..f6bf47f3
--- /dev/null
+++ b/strata/gnome/gvfs.morph
@@ -0,0 +1,5 @@
+name: gvfs
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-gphoto2 --disable-documentation
diff --git a/strata/gnome/ibus.morph b/strata/gnome/ibus.morph
new file mode 100644
index 00000000..8d858a3e
--- /dev/null
+++ b/strata/gnome/ibus.morph
@@ -0,0 +1,5 @@
+name: ibus
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-gtk2 --disable-gtk3 --disable-xim --disable-tests --enable-wayland
diff --git a/strata/gnome/icu.morph b/strata/gnome/icu.morph
new file mode 100644
index 00000000..37dec07e
--- /dev/null
+++ b/strata/gnome/icu.morph
@@ -0,0 +1,8 @@
+name: icu
+kind: chunk
+configure-commands:
+- cd source; ./runConfigureICU Linux --prefix=/usr
+build-commands:
+- cd source; unset TARGET ; make
+install-commands:
+- cd source; unset TARGET ; make DESTDIR="$DESTDIR" install
diff --git a/strata/gnome/libsecret.morph b/strata/gnome/libsecret.morph
new file mode 100644
index 00000000..054b9f15
--- /dev/null
+++ b/strata/gnome/libsecret.morph
@@ -0,0 +1,5 @@
+name: libsecret
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-manpages
diff --git a/strata/gnome/mozjs17.morph b/strata/gnome/mozjs17.morph
new file mode 100644
index 00000000..971ebfd3
--- /dev/null
+++ b/strata/gnome/mozjs17.morph
@@ -0,0 +1,17 @@
+name: mozjs17
+kind: chunk
+build-system: manual
+configure-commands:
+- |
+  cd js/src;
+  ./configure --prefix="$PREFIX" \
+              --with-system-nspr \
+              --with-system-ffi \
+              --enable-threadsafe
+build-commands:
+- |
+  cd js/src;
+  make
+install-commands:
+- cd js/src;
+  make DESTDIR="$DESTDIR" install
diff --git a/strata/gnome/mozjs24.morph b/strata/gnome/mozjs24.morph
new file mode 100644
index 00000000..a88914c1
--- /dev/null
+++ b/strata/gnome/mozjs24.morph
@@ -0,0 +1,17 @@
+name: mozjs24
+kind: chunk
+build-system: manual
+configure-commands:
+- |
+  cd js/src;
+  ./configure --prefix="$PREFIX" \
+              --with-system-nspr \
+              --with-system-ffi \
+              --enable-threadsafe
+build-commands:
+- |
+  cd js/src;
+  make
+install-commands:
+- cd js/src;
+  make DESTDIR="$DESTDIR" install
diff --git a/strata/gnome/p11-kit.morph b/strata/gnome/p11-kit.morph
new file mode 100644
index 00000000..b5a67729
--- /dev/null
+++ b/strata/gnome/p11-kit.morph
@@ -0,0 +1,5 @@
+name: p11-kit
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --without-trust-paths
diff --git a/strata/gnome/polkit.morph b/strata/gnome/polkit.morph
new file mode 100644
index 00000000..a5d7eb1f
--- /dev/null
+++ b/strata/gnome/polkit.morph
@@ -0,0 +1,5 @@
+name: polkit
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-man-pages --disable-gtk-doc --enable-libsystemd-login=yes
diff --git a/strata/gnome/telepathy-glib.morph b/strata/gnome/telepathy-glib.morph
new file mode 100644
index 00000000..e16f3294
--- /dev/null
+++ b/strata/gnome/telepathy-glib.morph
@@ -0,0 +1,5 @@
+name: telepathy-glib
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-Werror
diff --git a/strata/gnome/upower.morph b/strata/gnome/upower.morph
new file mode 100644
index 00000000..889a32b9
--- /dev/null
+++ b/strata/gnome/upower.morph
@@ -0,0 +1,5 @@
+name: upower
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-man-pages
diff --git a/strata/gtk3.morph b/strata/gtk3.morph
index 9d3dde6f..33eaa469 100644
--- a/strata/gtk3.morph
+++ b/strata/gtk3.morph
@@ -4,6 +4,7 @@ description: the gtk3 stratum
 build-depends:
 - morph: strata/gtk-deps.morph
 - morph: strata/wayland-generic.morph
+- morph: strata/x-common.morph
 chunks:
 - name: libepoxy
   repo: upstream:libepoxy
diff --git a/strata/gtk3/gtk3.morph b/strata/gtk3/gtk3.morph
index 4542dc15..76007474 100644
--- a/strata/gtk3/gtk3.morph
+++ b/strata/gtk3/gtk3.morph
@@ -4,7 +4,7 @@ build-system: autotools
 configure-commands:
 - gdk-pixbuf-query-loaders > loader.cache
 - NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --enable-wayland-backend
+- ./configure --prefix="$PREFIX"
 build-commands:
 - GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make
 install-commands:
diff --git a/strata/input-common.morph b/strata/input-common.morph
index 4a0326dd..c2ac35d7 100644
--- a/strata/input-common.morph
+++ b/strata/input-common.morph
@@ -3,6 +3,7 @@ kind: stratum
 build-depends:
 - morph: strata/foundation.morph
 - morph: strata/xorg-util-macros-common.morph
+- morph: strata/x-common.morph
 chunks:
 - name: mtdev
   repo: upstream:mtdev-git
@@ -21,14 +22,16 @@ chunks:
   build-system: autotools
 - name: libinput
   repo: upstream:libinput
-  ref: 12df380698531472d495534ed356722478563707
-  unpetrify-ref: 0.15.0
+  ref: a52cc616b4c00d0975a3311a2a06057bdb419ba2
+  unpetrify-ref: 1.0.1
   build-system: autotools
   build-depends:
   - mtdev
   - libevdev
-- name: libxkbcommon
-  morph: strata/input-common/libxkbcommon.morph
+- name: libxkbcommon-no-x11
   repo: upstream:xorg-lib-libxkbcommon
   ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28
+  morph: strata/input-common/libxkbcommon-no-x11.morph
   unpetrify-ref: xkbcommon-0.5.0
+  build-depends:
+    - xkeyboard-config
diff --git a/strata/input-common/libxkbcommon-no-x11.morph b/strata/input-common/libxkbcommon-no-x11.morph
new file mode 100644
index 00000000..1c8a1cb5
--- /dev/null
+++ b/strata/input-common/libxkbcommon-no-x11.morph
@@ -0,0 +1,12 @@
+name: libxkbcommon-no-x11
+kind: chunk
+
+description: |
+  xkbcommon is a library to handle keyboard descriptions.
+
+  This version is built without X11 support. If built with X11 support,
+  it depends on the xcb-xkb library.
+
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-x11
diff --git a/strata/input-common/libxkbcommon.morph b/strata/input-common/libxkbcommon.morph
deleted file mode 100644
index 04048abb..00000000
--- a/strata/input-common/libxkbcommon.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: libxkbcommon
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --disable-x11
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
index 93baee53..50faeaa9 100644
--- a/strata/mesa-common.morph
+++ b/strata/mesa-common.morph
@@ -6,6 +6,7 @@ build-depends:
 - morph: strata/libdrm-common.morph
 - morph: strata/wayland-generic.morph
 - morph: strata/python-core.morph
+- morph: strata/x-common.morph
 chunks:
 - name: mesa
   morph: strata/mesa-common/mesa.morph
diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph
index 2a3fe96a..24c290cd 100644
--- a/strata/mesa-common/mesa.morph
+++ b/strata/mesa-common/mesa.morph
@@ -16,7 +16,6 @@ configure-commands:
   esac
   ./autogen.sh --prefix="$PREFIX" \
       --enable-gles2 \
-      --disable-glx \
-      --with-egl-platforms=drm,wayland \
+      --with-egl-platforms=drm,wayland,x11 \
       --with-gallium-drivers="$GALLIUMDRIVERS" \
       --with-dri-drivers="$DRIDRIVERS"
diff --git a/strata/python-core.morph b/strata/python-core.morph
index 630a8073..3cc4a174 100644
--- a/strata/python-core.morph
+++ b/strata/python-core.morph
@@ -5,10 +5,10 @@ build-depends:
 - morph: strata/core.morph
 chunks:
 - name: python-setuptools
-  morph: strata/core/python-setuptools.morph
   repo: upstream:python-setuptools-bitbucket
   ref: 0aa6a4de5931d02876428388678802db2371fd37
   unpetrify-ref: baserock/master
+  build-system: python-distutils
 - name: mako
   repo: upstream:python-packages/mako.git
   ref: 285bc818a50ccc0f9549630f7c4f4c250585c3e7
diff --git a/strata/virtualization/libosinfo.morph b/strata/virtualization/libosinfo.morph
index d5679965..51b41b38 100644
--- a/strata/virtualization/libosinfo.morph
+++ b/strata/virtualization/libosinfo.morph
@@ -2,5 +2,10 @@ name: libosinfo
 kind: chunk
 build-system: autotools
 configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --disable-gtk-doc --disable-tests --disable-vala
-  --with-usb-ids-path=usb.ids --with-pci-ids-path=pci.ids
+- |
+  ./autogen.sh --prefix="$PREFIX" \
+               --disable-gtk-doc \
+               --disable-tests \
+               --disable-vala \
+               --with-usb-ids-path=usb.ids --with-pci-ids-path=pci.ids \
+               --disable-werror