Update infrastructure systems to latest Baserock reference definitions

178 files changed, 2731 insertions, 570 deletions

diff --git a/DEFAULTS b/DEFAULTS
new file mode 100644
index 00000000..83f0afed
--- /dev/null
+++ b/DEFAULTS
@@ -0,0 +1,212 @@
+# Baserock definitions defaults
+# =============================
+#
+# The DEFAULTS file is treated specially by Baserock build tools.
+#
+# For more information, see: <http://wiki.baserock.org/definitions/current>.
+
+
+# Predefined build commands
+# -------------------------
+#
+# Common patterns in build instructions can be defined here, which can save
+# users from having to write lots of similar-looking chunk .morph files.
+#
+# There are pre- and post- variants for each set of commands. These exist so
+# you can add more commands without having to copy the defaults. For example,
+# to create an extra symlink after running `make install`, you can use
+# post-install-commands. Since these exist as a way of extending the defaults,
+# you cannot set default values for the pre- and post- commands.
+#
+# The set of environment variables available when these commands are executed
+# is not formally specified right now, but you can assume PREFIX, DESTDIR and
+# MORPH_ARCH are all set.
+#
+build-systems:
+  manual:
+    # The special, default 'no-op' build system.
+    configure-commands: []
+    build-commands: []
+    install-commands: []
+    strip-commands: []
+
+  autotools:
+    # GNU Autoconf and GNU Automake, or anything which follow the same pattern.
+    #
+    # See also: https://github.com/cgwalters/build-api/blob/master/build-api.md
+    configure-commands:
+    - >-
+      export NOCONFIGURE=1;
+      if [ -e autogen ]; then ./autogen;
+      elif [ -e autogen.sh ]; then ./autogen.sh;
+      elif [ -e bootstrap ]; then ./bootstrap;
+      elif [ -e bootstrap.sh ]; then ./bootstrap.sh;
+      elif [ ! -e ./configure ]; then autoreconf -ivf;
+      fi
+    - ./configure --prefix="$PREFIX"
+                  --sysconfdir=/etc
+                  --localstatedir=/var
+
+    build-commands:
+    - make
+    install-commands:
+    - make DESTDIR="$DESTDIR" install
+    strip-commands:
+      # TODO: Make idempotent when files are hardlinks
+      # Strip all ELF binary files that are executable or named like a library.
+      # .so files for C, .cmxs for OCaml and .node for Node.
+      #
+      # The file name and permissions checks are done with the `find` command before
+      # the ELF header is checked with the shell command, because it is a lot cheaper
+      # to check the mode and file name first, because it is a metadata check, rather
+      # than a subprocess and a file read.
+      #
+      # `file` is not used, to keep the dependency requirements down.
+      - &generic-strip-command |
+        find "$DESTDIR" -type f \
+          '(' -perm -111 -o -name '*.so*' -o -name '*.cmxs' -o -name '*.node' ')' \
+          -exec sh -ec \
+          'read -n4 hdr <"$1" # check for elf header
+           if [ "$hdr" != "$(printf \\x7fELF)" ]; then
+               exit 0
+           fi
+           debugfile="$DESTDIR$PREFIX/lib/debug/$(basename "$1")"
+           mkdir -p "$(dirname "$debugfile")"
+           objcopy --only-keep-debug "$1" "$debugfile"
+           chmod 644 "$debugfile"
+           strip --remove-section=.comment --remove-section=.note --strip-unneeded "$1"
+           objcopy --add-gnu-debuglink "$debugfile" "$1"' - {} ';'
+
+  python-distutils:
+    # The Python distutils build systems.
+    configure-commands: []
+    build-commands:
+    - python setup.py build
+    install-commands:
+    - python setup.py install --prefix "$PREFIX" --root "$DESTDIR"
+    strip-commands:
+      - *generic-strip-command
+
+  python3-distutils:
+    # The Python distutils build systems.
+    configure-commands: []
+    build-commands:
+    - python3 setup.py build
+    install-commands:
+    - python3 setup.py install --prefix "$PREFIX" --root "$DESTDIR"
+    strip-commands:
+    - *generic-strip-command
+
+  cpan:
+    # The Perl ExtUtil::MakeMaker build system. This is called the 'cpan' build
+    # system for historical reasons.
+    #
+    # To install perl distributions into the correct location in our chroot
+    # we need to set PREFIX to <destdir>/<prefix> in the configure-commands.
+    #
+    # The mapping between PREFIX and the final installation
+    # directories is complex and depends upon the configuration of perl
+    # see,
+    # https://metacpan.org/pod/distribution/perl/INSTALL#Installation-Directories
+    # and ExtUtil::MakeMaker's documentation for more details.
+    configure-commands:
+      - perl Makefile.PL PREFIX=$DESTDIR$PREFIX
+    build-commands:
+    - make
+    install-commands:
+    - make install
+    strip-commands:
+      - *generic-strip-command
+
+  module-build:
+    # The Module::Build build system
+    #
+    # See the comment in ExtUtilsMakeMakerBuildSystem to see why --prefix is
+    # set to $DESTDIR$PREFIX here (--prefix in Module::Build has the same
+    # meaning as PREFIX in ExtUtils::MakeMaker).
+    configure-commands:
+      - perl Build.PL --prefix "$DESTDIR$PREFIX"
+    build-commands:
+      - ./Build
+    install-commands:
+      - ./Build install
+    strip-commands:
+      - *generic-strip-command
+
+  cmake:
+    # The CMake build system.
+    configure-commands:
+    - cmake -DCMAKE_INSTALL_PREFIX="$PREFIX"
+    build-commands:
+    - make
+    install-commands:
+    - make DESTDIR="$DESTDIR" install
+    strip-commands:
+      - *generic-strip-command
+
+  qmake:
+    # The Qt build system.
+    configure-commands:
+    - qmake -makefile
+    build-commands:
+    - make
+    install-commands:
+    - make INSTALL_ROOT="$DESTDIR" install
+    strip-commands:
+      - *generic-strip-command
+
+
+# Predefined artifact splitting rules
+# -----------------------------------
+#
+# Once a build has completed, you have some files that have been installed into
+# $DESTDIR. The splitting rules control how many 'artifact' tarballs are
+# generated as a result of the build, and which files from $DESTDIR end up in
+# which 'artifact'.
+#
+# The default split rules are defined here. These can be overriden in
+# individual chunk .morph files and stratum .morph files using the 'products'
+# field.
+#
+split-rules:
+  chunk:
+    - artifact: -bins
+      include:
+        - (usr/)?s?bin/.*
+    - artifact: -libs
+      include:
+        - (usr/)?lib(32|64)?/lib[^/]*\.so(\.\d+)*
+        - (usr/)libexec/.*
+    - artifact: -devel
+      include:
+        - (usr/)?include/.*
+        - (usr/)?lib(32|64)?/lib.*\.a
+        - (usr/)?lib(32|64)?/lib.*\.la
+        - (usr/)?(lib(32|64)?|share)/pkgconfig/.*\.pc
+    - artifact: -doc
+      include:
+        - (usr/)?share/doc/.*
+        - (usr/)?share/man/.*
+        - (usr/)?share/info/.*
+    - artifact: -locale
+      include:
+        - (usr/)?share/locale/.*
+        - (usr/)?share/i18n/.*
+        - (usr/)?share/zoneinfo/.*
+    - artifact: -misc
+      include:
+        - .*
+
+  stratum:
+    - artifact: -devel
+      include:
+        - .*-devel
+        - .*-debug
+        - .*-doc
+    - artifact: -runtime
+      include:
+        - .*-bins
+        - .*-libs
+        - .*-locale
+        - .*-misc
+        - .*
diff --git a/VERSION b/VERSION
index 0eaf7e67..e8b0c161 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-version: 6
+version: 7
diff --git a/clusters/ci.morph b/clusters/ci.morph
index 240e3d4f..95d6d0f7 100644
--- a/clusters/ci.morph
+++ b/clusters/ci.morph
@@ -36,7 +36,7 @@ systems:
     gnome-system-x86_64:
       type: extensions/rawdisk
       location: gnome-system-x86_64.img
-      DISK_SIZE: 6G
+      DISK_SIZE: 7G
       KERNEL_ARGS: vga=788
 - morph: systems/xfce-system-x86_64.morph
   deploy:
diff --git a/clusters/gnome-system-x86_64-deploy.morph b/clusters/gnome-system-x86_64-deploy.morph
index 0ae939f1..b3015ff2 100644
--- a/clusters/gnome-system-x86_64-deploy.morph
+++ b/clusters/gnome-system-x86_64-deploy.morph
@@ -12,7 +12,7 @@ systems:
     gnome-system-x86_64:
       type: extensions/rawdisk
       location: /gnome-system-x86_64.img
-      DISK_SIZE: 6G
+      DISK_SIZE: 7G
       INSTALL_FILES: install-files/gnome/manifest
       KERNEL_ARGS: vga=788
       INITRAMFS_PATH: boot/initramfs.gz
diff --git a/clusters/weston-qt5-system-x86_64-deploy.morph b/clusters/weston-qt5-system-x86_64-deploy.morph
new file mode 100644
index 00000000..64700314
--- /dev/null
+++ b/clusters/weston-qt5-system-x86_64-deploy.morph
@@ -0,0 +1,23 @@
+name: weston-qt5-system-x86_64
+kind: cluster
+description: |
+  Deploy a stock weston system.
+
+  The resulting image can be copied to a USB and booted from there,
+  as well as in a virtual machine.
+
+systems:
+- morph: systems/weston-qt5-system-x86_64.morph
+  deploy:
+    weston-qt5-system-x86_64:
+      type: extensions/rawdisk
+      location: /weston-qt5-system-x86_64.img
+      DISK_SIZE: 4G
+      KERNEL_ARGS: vga=788
+      INITRAMFS_PATH: boot/initramfs.gz
+  subsystems:
+  - morph: systems/initramfs-x86_64.morph
+    deploy:
+      initramfs:
+        type: initramfs
+        location: boot/initramfs.gz
diff --git a/extensions/mason/mason.sh b/extensions/mason/mason.sh
index dba99dfa..6f2a62b1 100755
--- a/extensions/mason/mason.sh
+++ b/extensions/mason/mason.sh
@@ -11,14 +11,9 @@ set -x
 # Load our deployment config
 . /etc/mason.conf
 
-if [ ! -e ws ]; then
-    morph init ws
-fi
-cd ws
-
-definitions_repo="$DEFINITIONS_REF"/"$UPSTREAM_TROVE_ADDRESS"/baserock/baserock/definitions
+definitions_repo=mason-definitions-"$DEFINITIONS_REF"
 if [ ! -e "$definitions_repo" ]; then
-    morph checkout git://"$UPSTREAM_TROVE_ADDRESS"/baserock/baserock/definitions "$DEFINITIONS_REF"
+    git clone -b "$DEFINITIONS_REF" git://"$UPSTREAM_TROVE_ADDRESS"/baserock/baserock/definitions "$definitions_repo"
     cd "$definitions_repo"
     git config user.name "$TROVE_ID"-mason
     git config user.email "$TROVE_ID"-mason@$(hostname)
@@ -52,7 +47,7 @@ if ! "scripts/release-build" --no-default-configs \
         "$BUILD_CLUSTER_MORPHOLOGY"; then
     echo ERROR: Failed to build release images
     echo Build logs for chunks:
-    find builds -type f -exec echo {} \; -exec cat {} \;
+    find build-* -type f -exec echo {} \; -exec cat {} \;
     exit 1
 fi
 
diff --git a/install-files/gnome/etc/pam.d/gdm b/install-files/gnome/etc/pam.d/gdm
new file mode 100644
index 00000000..42036102
--- /dev/null
+++ b/install-files/gnome/etc/pam.d/gdm
@@ -0,0 +1,15 @@
+# Baserock customized /etc/pam.d/gdm
+#
+
+auth     requisite      pam_nologin.so
+auth     required       pam_env.so
+
+auth     required       pam_succeed_if.so uid >= 1000 quiet
+auth     include        system-auth
+
+account  include        system-auth
+password include        system-auth
+
+session  optional       pam_keyinit.so force revoke
+session  include        system-auth
+session  required       pam_loginuid.so
diff --git a/install-files/gnome/etc/pam.d/gdm-autologin b/install-files/gnome/etc/pam.d/gdm-autologin
new file mode 100644
index 00000000..c99449ac
--- /dev/null
+++ b/install-files/gnome/etc/pam.d/gdm-autologin
@@ -0,0 +1,17 @@
+# Baserock customized /etc/pam.d/gdm-autologin
+#
+
+auth     requisite      pam_nologin.so
+auth     required       pam_env.so
+
+auth     required       pam_succeed_if.so uid >= 1000 quiet
+auth     required       pam_permit.so
+auth     optional       pam_gnome_keyring.so
+
+account  include        system-auth
+password include        system-auth
+
+session  required       pam_loginuid.so
+session  optional       pam_keyinit.so force revoke
+session  required       pam_namespace.so
+session  include        system-auth
diff --git a/install-files/gnome/etc/pam.d/gdm-launch-environment b/install-files/gnome/etc/pam.d/gdm-launch-environment
index 0e49df04..f63c80fa 100644
--- a/install-files/gnome/etc/pam.d/gdm-launch-environment
+++ b/install-files/gnome/etc/pam.d/gdm-launch-environment
@@ -1,13 +1,11 @@
-# Begin /etc/pam.d/gdm-launch-environment
+# Baserock customized /etc/pam.d/gdm-launch-environment
+#
 
 auth     required       pam_env.so
 auth     optional       pam_permit.so
 
 account  include        system-auth
-
-password required       pam_deny.so
+password include        system-auth
 
 session  optional       pam_keyinit.so force revoke
 session  include        system-auth
-
-# End /etc/pam.d/gdm-launch-environment
diff --git a/install-files/gnome/etc/pam.d/gdm-password b/install-files/gnome/etc/pam.d/gdm-password
new file mode 100644
index 00000000..798d40a6
--- /dev/null
+++ b/install-files/gnome/etc/pam.d/gdm-password
@@ -0,0 +1,24 @@
+# Baserock customized /etc/pam.d/gdm-password
+#
+# This configuration ensures that the default keyring
+# is unlocked at gdm login time, and also that the
+# authentication token is used to update the keyring
+# when the password is set.
+
+auth     requisite      pam_nologin.so
+auth     required       pam_env.so
+
+auth     required       pam_succeed_if.so uid >= 1000 quiet
+auth     substack       system-auth
+auth     optional       pam_gnome_keyring.so
+
+account  include        system-auth
+password substack       system-auth
+password optional       pam_gnome_keyring.so use_authtok
+
+session  required       pam_limits.so
+session  required       pam_loginuid.so
+session  optional       pam_keyinit.so force revoke
+session  required       pam_namespace.so
+session  substack       system-auth
+session  optional       pam_gnome_keyring.so auto_start
diff --git a/install-files/gnome/etc/pam.d/passwd b/install-files/gnome/etc/pam.d/passwd
new file mode 100644
index 00000000..e0c98057
--- /dev/null
+++ b/install-files/gnome/etc/pam.d/passwd
@@ -0,0 +1,10 @@
+# Baserock customized /etc/pam.d/passwd
+#
+# This configuration ensures authentication token
+# is used to update the keyring when the password is set
+# using the regular passwd mechanism
+
+auth            include         system-auth
+account         include         system-auth
+password        substack        system-auth
+password        optional        pam_gnome_keyring.so use_authtok
diff --git a/install-files/gnome/etc/pam.d/system-auth b/install-files/gnome/etc/pam.d/system-auth
new file mode 100644
index 00000000..73d3968c
--- /dev/null
+++ b/install-files/gnome/etc/pam.d/system-auth
@@ -0,0 +1,19 @@
+# Baserock customized /etc/pam.d/system-auth
+#
+# This configuration is modified from the upstream
+# systemd provided file mostly because the upstream file
+# tries to pass the invalid 'try_authtok' option to the
+# pam_unix.so module.
+
+auth     sufficient pam_unix.so nullok try_first_pass
+auth     requisite  pam_deny.so
+
+account  required   pam_nologin.so
+account  sufficient pam_unix.so
+
+password sufficient pam_unix.so nullok sha512 shadow try_first_pass
+password required   pam_deny.so
+
+-session optional   pam_loginuid.so
+-session optional   pam_systemd.so
+session  sufficient pam_unix.so
diff --git a/install-files/gnome/manifest b/install-files/gnome/manifest
index 79569060..d72a5e89 100644
--- a/install-files/gnome/manifest
+++ b/install-files/gnome/manifest
@@ -1,4 +1,9 @@
 0100644 0 0 /etc/securetty
 overwrite 0100644 0 0 /etc/ssh/sshd_config
+overwrite 0100644 0 0 /etc/pam.d/passwd
+overwrite 0100644 0 0 /etc/pam.d/system-auth
+overwrite 0100644 0 0 /etc/pam.d/gdm
+overwrite 0100644 0 0 /etc/pam.d/gdm-password
+overwrite 0100644 0 0 /etc/pam.d/gdm-autologin
 overwrite 0100644 0 0 /etc/pam.d/gdm-launch-environment
 0100644 0 0 /usr/share/polkit-1/rules.d/geoclue-2.0.rules
diff --git a/schemas/baserock.owl b/schemas/baserock.owl
index d699940c..33113d84 100644
--- a/schemas/baserock.owl
+++ b/schemas/baserock.owl
@@ -244,7 +244,7 @@
 :maxJobs a owl:FunctionalProperty ;
   rdfs:domain :Chunk ;
   rdfs:range xsd:integer ;
-  rdfs:comment "Number of parallel jobs that can be run for this chunk. Only useful if set to 1, to mark components which have Makefiles that do not work with `make -j N`."
+  rdfs:comment "Number of parallel jobs that can be run for this chunk. Only useful if set to 1, to mark components which have Makefiles that do not work with `make -j N`.".
 
 :CommandSequence a owl:Class ;
   rdfs:subClassOf rdf:Seq ;
diff --git a/strata/CPAN-Mini-Inject.morph b/strata/CPAN-Mini-Inject.morph
new file mode 100644
index 00000000..d4566bd3
--- /dev/null
+++ b/strata/CPAN-Mini-Inject.morph
@@ -0,0 +1,306 @@
+name: CPAN-Mini-Inject
+kind: stratum
+description: A collection of perl distributions used by CPAN::Mini::Inject
+build-depends:
+- morph: strata/core.morph
+- morph: strata/perl-common.morph
+chunks:
+- name: Archive-Zip
+  repo: upstream:cpan/Archive-Zip-tarball
+  ref: 42c8b23669eac442a303190dad44d78cea63cf59
+  unpetrify-ref: Archive-Zip-1.49
+  build-system: cpan
+- name: CPAN-DistnameInfo
+  repo: upstream:cpan/CPAN-DistnameInfo-tarball
+  ref: 56f58177bddb4002f0dc57811fe0f72a8fc9e479
+  unpetrify-ref: CPAN-DistnameInfo-0.12
+  build-system: cpan
+- name: Compress-Bzip2
+  repo: upstream:cpan/Compress-Bzip2-tarball
+  ref: efd32dfb6c52e28f3b158930b64f986ff8760409
+  unpetrify-ref: Compress-Bzip2-2.22
+  build-system: cpan
+- name: Encode-Locale
+  repo: upstream:cpan/Encode-Locale-tarball
+  ref: e4bf16d2fde5df6eadd91475e3dcca56b87b1eb0
+  unpetrify-ref: Encode-Locale-1.05
+  build-system: cpan
+- name: File-Slurp
+  repo: upstream:cpan/File-Slurp-tarball
+  ref: 9d4173f2716c2f9a2d26f8f9ab0f47b351b87de7
+  unpetrify-ref: File-Slurp-9999.19
+  build-system: cpan
+- name: File-Spec-Native
+  repo: upstream:cpan/File-Spec-Native-tarball
+  ref: 475e3c7cb559a68109d8c90ab8ff0b6a37c98793
+  unpetrify-ref: File-Spec-Native-1.004
+  build-system: cpan
+- name: File-Which
+  repo: upstream:cpan/File-Which-tarball
+  ref: a276db189a656a4cc5881a2ebc4cad3113685030
+  unpetrify-ref: File-Which-1.19
+  build-system: cpan
+- name: File-HomeDir
+  repo: upstream:cpan/File-HomeDir-tarball
+  ref: d08b8685307cd5e8980f3c9409d4b3c1d06b2c24
+  unpetrify-ref: File-HomeDir-1.00
+  build-system: cpan
+  build-depends:
+  - File-Which
+- name: HTML-Tagset
+  repo: upstream:cpan/HTML-Tagset-tarball
+  ref: 85713405a9d0b06f3abba0c2ddfaab2077344e8f
+  unpetrify-ref: HTML-Tagset-3.20
+  build-system: cpan
+- name: HTML-Parser
+  repo: upstream:cpan/HTML-Parser-tarball
+  ref: 2f253cfc85ffd55a8acb988e91f0bc5ab348124c
+  unpetrify-ref: HTML-Parser-3.71
+  build-system: cpan
+  build-depends:
+  - HTML-Tagset
+- name: CGI
+  repo: upstream:cpan/CGI-tarball
+  ref: f9f3ab3056d94292adb4ab2e1451645bee989769
+  unpetrify-ref: CGI-4.21
+  build-system: cpan
+  build-depends:
+  - HTML-Tagset
+  - HTML-Parser
+- name: HTTP-Date
+  repo: upstream:cpan/HTTP-Date-tarball
+  ref: f1f9b3164e11c877ed5d509738551a56ac9b37f0
+  unpetrify-ref: HTTP-Date-6.02
+  build-system: cpan
+- name: File-Listing
+  repo: upstream:cpan/File-Listing-tarball
+  ref: c1655656f083337cbfd901455db96695890f2d89
+  unpetrify-ref: File-Listing-6.04
+  build-system: cpan
+  build-depends:
+  - HTTP-Date
+- name: HTTP-Server-Simple
+  repo: upstream:cpan/HTTP-Server-Simple-tarball
+  ref: e2d680ac7c6f0bb36808aa45e1453c8b585d2717
+  unpetrify-ref: HTTP-Server-Simple-0.50
+  build-system: cpan
+  build-depends:
+  - CGI
+  - HTML-Tagset
+  - HTML-Parser
+- name: IO-HTML
+  repo: upstream:cpan/IO-HTML-tarball
+  ref: adc9c8b29ed1144626af564f936811a9d5e319a6
+  unpetrify-ref: IO-HTML-1.001
+  build-system: cpan
+- name: LWP-MediaTypes
+  repo: upstream:cpan/LWP-MediaTypes-tarball
+  ref: d550937a3b104e53897b8f51dd528724f721858a
+  unpetrify-ref: LWP-MediaTypes-6.02
+  build-system: cpan
+- name: Number-Compare
+  repo: upstream:cpan/Number-Compare-tarball
+  ref: af206af84f17997c2967416423e9cdf516e17203
+  unpetrify-ref: Number-Compare-0.03
+  build-system: cpan
+- name: Path-Class
+  repo: upstream:cpan/Path-Class-tarball
+  ref: 5f549fcb4056f8b314c7f7336a020ef9735fb384
+  unpetrify-ref: Path-Class-0.35
+  build-system: cpan
+- name: Text-Glob
+  repo: upstream:cpan/Text-Glob-tarball
+  ref: 7c186823d68db1d2bd078fb91a95d30cd12890da
+  unpetrify-ref: Text-Glob-0.09
+  build-system: cpan
+- name: File-Find-Rule
+  repo: upstream:cpan/File-Find-Rule-tarball
+  ref: 5e7c9d8e7b80b54baa3f8161222b5a8e9077c0aa
+  unpetrify-ref: File-Find-Rule-0.33
+  build-system: cpan
+  build-depends:
+  - Text-Glob
+  - Number-Compare
+- name: Data-Compare
+  repo: upstream:cpan/Data-Compare-tarball
+  ref: 8fddd4400d09891094843fe9e77fec74e4510c67
+  unpetrify-ref: Data-Compare-1.25
+  build-system: cpan
+  build-depends:
+  - File-Find-Rule
+  - Text-Glob
+  - Number-Compare
+- name: CPAN-Checksums
+  repo: upstream:cpan/CPAN-Checksums-tarball
+  ref: 26d8d4d1d2a7a8ebcffc6ff5c6b13495f74dd129
+  unpetrify-ref: CPAN-Checksums-2.10
+  build-system: cpan
+  build-depends:
+  - Text-Glob
+  - Data-Compare
+  - File-Find-Rule
+  - Number-Compare
+  - Compress-Bzip2
+- name: Dist-Metadata
+  repo: upstream:cpan/Dist-Metadata-tarball
+  ref: 2ca9db53e3e8164ecf0c95bf93fa289019e1b92c
+  unpetrify-ref: Dist-Metadata-0.926
+  build-system: cpan
+  build-depends:
+  - Path-Class
+  - File-Spec-Native
+  - Archive-Zip
+  - CPAN-DistnameInfo
+- name: URI
+  repo: upstream:cpan/URI-tarball
+  ref: 9165b237ad8fae18b36d4d40d6e2ccfde7b136c7
+  unpetrify-ref: URI-1.69
+  build-system: cpan
+- name: Net-HTTP
+  repo: upstream:cpan/Net-HTTP-tarball
+  ref: 8780c70ceb3019aa50e129cb62daa3bfaebd0e82
+  unpetrify-ref: Net-HTTP-6.09
+  build-system: cpan
+  build-depends:
+  - URI
+- name: HTTP-Message
+  repo: upstream:cpan/HTTP-Message-tarball
+  ref: d403562e3f7ac96df7cee2c1709ecd970b6c9761
+  unpetrify-ref: HTTP-Message-6.10
+  build-system: cpan
+  build-depends:
+  - Encode-Locale
+  - HTTP-Date
+  - IO-HTML
+  - URI
+  - LWP-MediaTypes
+- name: HTTP-Negotiate
+  repo: upstream:cpan/HTTP-Negotiate-tarball
+  ref: ab7c5218426d7424b8f7b5c333870958ad6609da
+  unpetrify-ref: HTTP-Negotiate-6.01
+  build-system: cpan
+  build-depends:
+  - Encode-Locale
+  - HTTP-Date
+  - IO-HTML
+  - LWP-MediaTypes
+  - URI
+  - HTTP-Message
+- name: HTTP-Cookies
+  repo: upstream:cpan/HTTP-Cookies-tarball
+  ref: 4861af5daed8f4ba6d0041aed25e98f403d96fc0
+  unpetrify-ref: HTTP-Cookies-6.01
+  build-system: cpan
+  build-depends:
+  - Encode-Locale
+  - HTTP-Date
+  - IO-HTML
+  - URI
+  - LWP-MediaTypes
+  - HTTP-Message
+- name: HTTP-Daemon
+  repo: upstream:cpan/HTTP-Daemon-tarball
+  ref: 64ffbaec18717f99cb80441d8b474868e39939fb
+  unpetrify-ref: HTTP-Daemon-6.01
+  build-system: cpan
+  build-depends:
+  - Encode-Locale
+  - HTTP-Date
+  - IO-HTML
+  - LWP-MediaTypes
+  - URI
+  - HTTP-Message
+- name: WWW-RobotRules
+  repo: upstream:cpan/WWW-RobotRules-tarball
+  ref: 80c86924c3437c0ad64852ea29c7eab1197dfe90
+  unpetrify-ref: WWW-RobotRules-6.02
+  build-system: cpan
+  build-depends:
+  - URI
+- name: YAML
+  repo: upstream:cpan/YAML-tarball
+  ref: 2fe5b8de1e9d06482aa76303e7342bc6605700ea
+  unpetrify-ref: YAML-1.15
+  build-system: cpan
+- name: libwww-perl
+  repo: upstream:cpan/libwww-perl-tarball
+  ref: 20f161ca116b8a4fc7ac986a317d7f6d43e5c173
+  unpetrify-ref: libwww-perl-6.13
+  build-system: cpan
+  build-depends:
+  - Encode-Locale
+  - Net-HTTP
+  - HTTP-Daemon
+  - HTTP-Date
+  - HTTP-Negotiate
+  - HTTP-Message
+  - IO-HTML
+  - LWP-MediaTypes
+  - HTML-Tagset
+  - WWW-RobotRules
+  - HTTP-Cookies
+  - File-Listing
+  - HTML-Parser
+  - URI
+- name: CPAN-Mini
+  repo: upstream:cpan/CPAN-Mini-tarball
+  ref: 2a051e40a3fc09bba24c335060e8df327d313e55
+  unpetrify-ref: CPAN-Mini-1.111016
+  build-system: cpan
+  build-depends:
+  - Encode-Locale
+  - File-Which
+  - HTTP-Date
+  - HTTP-Cookies
+  - HTTP-Daemon
+  - LWP-MediaTypes
+  - HTTP-Negotiate
+  - File-Listing
+  - URI
+  - File-HomeDir
+  - HTML-Tagset
+  - HTTP-Message
+  - Net-HTTP
+  - IO-HTML
+  - libwww-perl
+  - HTML-Parser
+  - WWW-RobotRules
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject/CPAN-Mini-Inject.morph
+  repo: upstream:cpan/CPAN-Mini-Inject-tarball
+  ref: 74e30d582ac01d80a7f1b28af247d0a5ee913d55
+  unpetrify-ref: master
+  build-depends:
+  - File-Spec-Native
+  - HTTP-Negotiate
+  - LWP-MediaTypes
+  - Dist-Metadata
+  - File-Which
+  - Compress-Bzip2
+  - libwww-perl
+  - CGI
+  - File-Slurp
+  - IO-HTML
+  - Number-Compare
+  - CPAN-Mini
+  - HTML-Tagset
+  - HTTP-Server-Simple
+  - HTTP-Message
+  - File-HomeDir
+  - Path-Class
+  - Archive-Zip
+  - Text-Glob
+  - Data-Compare
+  - HTTP-Date
+  - URI
+  - File-Listing
+  - HTTP-Cookies
+  - CPAN-DistnameInfo
+  - HTML-Parser
+  - Encode-Locale
+  - HTTP-Daemon
+  - File-Find-Rule
+  - YAML
+  - WWW-RobotRules
+  - Net-HTTP
+  - CPAN-Checksums
diff --git a/strata/CPAN-Mini-Inject/CPAN-Mini-Inject.morph b/strata/CPAN-Mini-Inject/CPAN-Mini-Inject.morph
new file mode 100644
index 00000000..e872843c
--- /dev/null
+++ b/strata/CPAN-Mini-Inject/CPAN-Mini-Inject.morph
@@ -0,0 +1,4 @@
+name: CPAN-Mini-Inject
+kind: chunk
+build-system: module-build
+test-commands: []   # disable test commands
diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph
index 661f210f..14994a80 100644
--- a/strata/NetworkManager-common.morph
+++ b/strata/NetworkManager-common.morph
@@ -2,8 +2,9 @@ name: NetworkManager-common
 kind: stratum
 build-depends:
 - morph: strata/audio-bluetooth.morph
-- morph: strata/network-security.morph
 - morph: strata/connectivity.morph
+- morph: strata/network-security.morph
+- morph: strata/privileges-management.morph
 chunks:
 - name: libndp
   repo: upstream:libndp
@@ -24,8 +25,28 @@ chunks:
   morph: strata/NetworkManager-common/NetworkManager.morph
   repo: upstream:NetworkManager
   ref: c41be469ab107ea2b4813bf28a1618572b78aa6a
-  unpetrify-ref: 1.1.0-dev-1952-gc41be46
+  unpetrify-ref: baserock/1.1.0-dev-1952-gc41be46
   build-depends:
   - libgudev
   - libndp
   - readline6
+- name: libmbim
+  repo: upstream:libmbim
+  ref: 6cf74ebfae1dccf807bb34d88f2cd024d4b14da7
+  unpetrify-ref: master
+  build-system: autotools
+  build-depends:
+  - libgudev
+- name: libqmi
+  repo: upstream:libqmi
+  ref: 97aaa6855d071f64ec2e28df1b9f816da02a3e07
+  unpetrify-ref: master
+  build-system: autotools
+- name: ModemManager
+  morph: strata/NetworkManager-common/ModemManager.morph
+  repo: upstream:ModemManager
+  ref: 0ca68657fbcd5bace3d303a0babe2da292784385
+  unpetrify-ref: master
+  build-depends:
+  - libmbim
+  - libqmi
diff --git a/strata/gnome/ModemManager.morph b/strata/NetworkManager-common/ModemManager.morph
index 909f6eca..909f6eca 100644
--- a/strata/gnome/ModemManager.morph
+++ b/strata/NetworkManager-common/ModemManager.morph
diff --git a/strata/WebKitGtk1-common.morph b/strata/WebKitGtk1-common.morph
new file mode 100644
index 00000000..bf92e354
--- /dev/null
+++ b/strata/WebKitGtk1-common.morph
@@ -0,0 +1,19 @@
+name: WebKitGtk1-common
+kind: stratum
+description: WebKitGtk1 stratum (deprecated WebKitGtk API)
+build-depends:
+- morph: strata/geolocation.morph
+- morph: strata/gtk2.morph
+- morph: strata/gtk3.morph
+- morph: strata/libsoup-common.morph
+- morph: strata/multimedia-gstreamer.morph
+- morph: strata/mesa-common.morph
+- morph: strata/ruby.morph
+- morph: strata/secret-service.morph
+- morph: strata/spell-checking.morph
+chunks:
+- name: WebKitGtk1
+  morph: strata/WebKitGtk1-common/WebKitGtk1.morph
+  repo: upstream:WebKitGtk-tarball
+  ref: 41386e9cb918eed93b3f13648cbef387e371e451
+  unpetrify-ref: webkitgtk-2.4.9
diff --git a/strata/WebKitGtk1-common/WebKitGtk1.morph b/strata/WebKitGtk1-common/WebKitGtk1.morph
new file mode 100644
index 00000000..b723248d
--- /dev/null
+++ b/strata/WebKitGtk1-common/WebKitGtk1.morph
@@ -0,0 +1,5 @@
+name: WebKitGtk1
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --sysconfdir=/etc --disable-webkit2 --enable-introspection
diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph
index 7112653a..924ef746 100644
--- a/strata/armv7lhf-cross-toolchain.morph
+++ b/strata/armv7lhf-cross-toolchain.morph
@@ -27,8 +27,8 @@ chunks:
 - name: armv7lhf-cross-glibc
   morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-glibc.morph
   repo: upstream:glibc
-  ref: 4e42b5b8f89f0e288e68be7ad70f9525aebc2cff
-  unpetrify-ref: baserock/glibc-2.21
+  ref: b995d95a5943785be3ab862b2d3276f3b4a22481
+  unpetrify-ref: release/2.22/master
   build-depends:
   - armv7lhf-cross-binutils
   - armv7lhf-cross-gcc-nolibc
diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph
index 0bf1c220..d60d1121 100644
--- a/strata/audio-bluetooth.morph
+++ b/strata/audio-bluetooth.morph
@@ -24,9 +24,9 @@ chunks:
   - alsa-lib
 - name: libical
   morph: strata/audio-bluetooth/libical.morph
-  repo: upstream:libical
-  ref: 52568782ae136e1ec4ddf3eb6da7b0f3fbd3f1b3
-  unpetrify-ref: baserock/morph
+  repo: upstream:libical-git
+  ref: da69aae790f680b633100475cac14c776fbda722
+  unpetrify-ref: v1.0.1
 - name: bluez
   morph: strata/audio-bluetooth/bluez.morph
   repo: upstream:bluez
@@ -68,19 +68,6 @@ chunks:
   build-depends:
   - bluez
   - speex
-- name: mobile-broadband-provider-info
-  repo: upstream:mobile-broadband-provider-info
-  ref: 4ed19e11c2975105b71b956440acdb25d46a347d
-  unpetrify-ref: baserock/morph
-  build-system: autotools
-- name: ofono
-  morph: strata/audio-bluetooth/ofono.morph
-  repo: upstream:ofono
-  ref: d05b718cc0b0d367227fbfbf52e60fc5462cc549
-  unpetrify-ref: '1.15'
-  build-depends:
-  - mobile-broadband-provider-info
-  - bluez
 - name: json-c
   morph: strata/audio-bluetooth/json-c.morph
   repo: upstream:json-c
@@ -91,15 +78,42 @@ chunks:
   repo: upstream:libsndfile
   ref: 6c05c615c95ffef7a8a5a707cde0bb52bdd74244
   unpetrify-ref: baserock/morph
+- name: libdaemon
+  repo: upstream:libdaemon
+  ref: 9fcc28e0e8f84968d1fb8b6d544a42efb13803ec
+  unpetrify-ref: v0.14
+  build-system: autotools
+- name: avahi
+  morph: strata/audio-bluetooth/avahi.morph
+  repo: upstream:avahi
+  ref: 031d6323b5abb785fbe3601b2f163316a1eb54bc
+  unpetrify-ref: v0.6.31
+  build-depends:
+  - libdaemon
+- name: sbc
+  repo: upstream:sbc
+  ref: f64b34a770bc7fbf180d2a733fe63d352f281ea2
+  unpetrify-ref: 1.3
+  build-system: autotools
+  build-depends:
+  - libsndfile
+- name: webrtc-audio-processing
+  repo: upstream:webrtc-audio-processing
+  ref: 9413986e79cf01958ee6dfb95a89de0d71a44221
+  unpetrify-ref: v0.1
+  build-system: autotools
 - name: pulseaudio
   morph: strata/audio-bluetooth/pulseaudio.morph
   repo: upstream:pulseaudio
-  ref: 53ad8aa7caa33caac52e35f71253e29d5a15f6e7
-  unpetrify-ref: v6.0
+  ref: a8f8accd5398868548a973b386ee3108f3441641
+  unpetrify-ref: v7.1
   build-depends:
+  - avahi
   - libsndfile
   - libatomic_ops
   - speex
   - json-c
   - alsa-lib
   - bluez
+  - sbc
+  - webrtc-audio-processing
diff --git a/strata/audio-bluetooth/avahi.morph b/strata/audio-bluetooth/avahi.morph
new file mode 100644
index 00000000..49d249d5
--- /dev/null
+++ b/strata/audio-bluetooth/avahi.morph
@@ -0,0 +1,18 @@
+name: avahi
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- sed -i 's/AM_CFLAGS=-I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DGTK_DISABLE_DEPRECATED=1/AM_CFLAGS=-I$(top_srcdir)/g' avahi-ui/Makefile.am
+configure-commands:
+- |
+  ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var --disable-werror \
+               --with-distro=none --disable-qt3 --disable-qt4 --disable-gtk --disable-gtk3 \
+               --disable-pygtk --disable-python-dbus --disable-mono --disable-manpages
+system-integration:
+  avahi-misc:
+    00-add-avahi-user:
+    - groupadd -fg 86 netdev
+    - groupadd -fg 84 avahi
+    - useradd -c "Avahi Daemon Owner" -d /var/run/avahi-daemon -u 84 -g avahi -s /bin/false avahi
+    00-enable-avahi-service:
+    - systemctl enable avahi-daemon
diff --git a/strata/audio-bluetooth/bluez.morph b/strata/audio-bluetooth/bluez.morph
index 1395b98d..f27fcf1c 100644
--- a/strata/audio-bluetooth/bluez.morph
+++ b/strata/audio-bluetooth/bluez.morph
@@ -7,6 +7,7 @@ configure-commands:
 - ./configure --prefix="$PREFIX" --enable-tools --enable-test --enable-alsa --enable-library
   --with-telephony=ofono --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib
 install-commands:
-- make install
+- make DESTDIR="$DESTDIR" install
 - mkdir -p "$DESTDIR/etc/systemd/system/bluetooth.target.wants"
 - ln -s /lib/systemd/system/bluetooth.service "$DESTDIR/etc/systemd/system/bluetooth.target.wants/bluetooth.service"
+- ln -s /lib/systemd/system/bluetooth.service "$DESTDIR/etc/systemd/system/dbus-org.bluez.service"
diff --git a/strata/audio-bluetooth/libical.morph b/strata/audio-bluetooth/libical.morph
index 1f772fd9..2ee7c96c 100644
--- a/strata/audio-bluetooth/libical.morph
+++ b/strata/audio-bluetooth/libical.morph
@@ -1,6 +1,5 @@
 name: libical
 kind: chunk
-build-system: autotools
+build-system: cmake
 configure-commands:
-- autoreconf -ivf
-- ./configure --prefix="$PREFIX"
+- cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_INSTALL_LIBDIR=lib
diff --git a/strata/audio-bluetooth/pulseaudio.morph b/strata/audio-bluetooth/pulseaudio.morph
index be4cb557..dfaa9b0d 100644
--- a/strata/audio-bluetooth/pulseaudio.morph
+++ b/strata/audio-bluetooth/pulseaudio.morph
@@ -6,8 +6,13 @@ pre-configure-commands:
 - NOCONFIGURE=1 ./bootstrap.sh
 configure-commands:
 - ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --with-database=simple
-  --with-systemduserunitdir=/lib/systemd/system
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- mkdir -p "$DESTDIR/etc/systemd/system/multi-user.target.wants"
-- ln -s /lib/systemd/system/pulseaudio.service "$DESTDIR/etc/systemd/system/multi-user.target.wants/pulseaudio.service"
+  --with-systemduserunitdir=/usr/lib/systemd/user
+  --with-system-user=pulse --with-system-group=pulse --with-access-group=pulse-access
+  --enable-webrtc-aec
+system-integration:
+  pulseaudio-misc:
+    00-add-pulse-users:
+    - groupadd -rf pulse-access
+    - groupadd -rf pulse-rt
+    - groupadd -f -g 171 -r pulse
+    - useradd -r -g pulse -d /var/run/pulse -s /bin/false -c "PulseAudio System Daemon" pulse || exit 0
diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph
index 74fc9363..bc01a9a6 100644
--- a/strata/baserock-import.morph
+++ b/strata/baserock-import.morph
@@ -17,7 +17,7 @@ chunks:
   build-system: python-distutils
 - name: baserock-import
   repo: baserock:baserock/import
-  ref: f74e7e428325be1cb018898a52d0aed4aec7a549
+  ref: 6406a6992b709b4ae65de5b2f7b27cb005a2ec8d
   unpetrify-ref: master
   build-system: python-distutils
   build-depends:
diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.morph
index 48d7218c..4cb5034f 100644
--- a/strata/bsp-jetson.morph
+++ b/strata/bsp-jetson.morph
@@ -12,32 +12,25 @@ description: |
 build-depends:
 - morph: strata/core.morph
 chunks:
-- name: device-tree-compiler
-  morph: strata/bsp-jetson/device-tree-compiler.morph
+- name: device-tree-compiler@jetson
+  morph: strata/bsp-jetson/device-tree-compiler@jetson.morph
   repo: upstream:device-tree-compiler
   ref: 302fca9f4c283e1994cf0a5a9ce1cf43ca15e6d2
   unpetrify-ref: v1.4.1
 - name: u-boot@jetson
   morph: strata/bsp-jetson/u-boot@jetson.morph
   repo: upstream:u-boot
-  ref: f33cdaa4c3da4a8fd35aa2f9a3172f31cc887b35
-  unpetrify-ref: v2015.04
+  ref: 5ec0003b19cbdf06ccd6941237cbc0d1c3468e2d
+  unpetrify-ref: v2015.10
   build-depends:
-  - device-tree-compiler
+  - device-tree-compiler@jetson
 - name: linux-jetson-tk1
   morph: strata/bsp-jetson/linux-jetson-tk1.morph
   repo: upstream:linux
-  ref: a6df05fd37874251833bd6f18404cd2efaa62603
-  unpetrify-ref: baserock/tegra/4.0-with-cpufreq-gpu
-- name: nouveau-drm
-  morph: strata/bsp-jetson/nouveau-drm.morph
-  repo: upstream:nouveau
-  ref: 73de0a7758eb447d6157d2ed79c84d1a4e6ca09b
-  unpetrify-ref: baserock/tegra/4.0
-  build-depends:
-  - linux-jetson-tk1
-- name: linux-firmware-jetson
-  morph: strata/bsp-jetson/linux-firmware-jetson.morph
+  ref: afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc
+  unpetrify-ref: v4.4
+- name: linux-firmware@jetson
+  morph: strata/bsp-jetson/linux-firmware@jetson.morph
   repo: upstream:linux-firmware
-  ref: ff2afc9d9649cab2a1f79b8d4eeb0cc0100a2f85
-  unpetrify-ref: baserock/tegra/4.0
+  ref: 6ebf5d57d9f6d0cf05558baef1af2b90a3fe98ed
+  unpetrify-ref: master
diff --git a/strata/bsp-jetson/device-tree-compiler.morph b/strata/bsp-jetson/device-tree-compiler@jetson.morph
index 8abfafc8..52c57739 100644
--- a/strata/bsp-jetson/device-tree-compiler.morph
+++ b/strata/bsp-jetson/device-tree-compiler@jetson.morph
@@ -1,4 +1,4 @@
-name: device-tree-compiler
+name: device-tree-compiler@jetson
 kind: chunk
 build-commands:
 - make all
diff --git a/strata/bsp-jetson/linux-firmware-jetson.morph b/strata/bsp-jetson/linux-firmware-jetson.morph
deleted file mode 100644
index e24e7ec7..00000000
--- a/strata/bsp-jetson/linux-firmware-jetson.morph
+++ /dev/null
@@ -1,15 +0,0 @@
-name: linux-firmware-jetson
-kind: chunk
-install-commands:
-- install -d "$DESTDIR/lib/firmware/nvidia/tegra124"
-- install -d "$DESTDIR/lib/firmware/nouveau"
-- install -m644 nouveau/nvea_fuc409c "$DESTDIR/lib/firmware/nouveau"
-- install -m644 nouveau/nvea_fuc409d "$DESTDIR/lib/firmware/nouveau"
-- install -m644 nouveau/nvea_fuc41ac "$DESTDIR/lib/firmware/nouveau"
-- install -m644 nouveau/nvea_fuc41ad "$DESTDIR/lib/firmware/nouveau"
-- install -m644 nouveau/nvea_bundle "$DESTDIR/lib/firmware/nouveau"
-- install -m644 nouveau/nvea_method "$DESTDIR/lib/firmware/nouveau"
-- install -m644 nouveau/nvea_sw_ctx "$DESTDIR/lib/firmware/nouveau"
-- install -m644 nouveau/nvea_sw_nonctx "$DESTDIR/lib/firmware/nouveau"
-- install -m644 nvidia/tegra124/xusb.bin "$DESTDIR/lib/firmware/nvidia/tegra124"
-- install -m644 LICENCE.nvidia "$DESTDIR/lib/firmware"
diff --git a/strata/bsp-jetson/linux-firmware@jetson.morph b/strata/bsp-jetson/linux-firmware@jetson.morph
new file mode 100644
index 00000000..e8415e09
--- /dev/null
+++ b/strata/bsp-jetson/linux-firmware@jetson.morph
@@ -0,0 +1,15 @@
+name: linux-firmware@jetson
+kind: chunk
+install-commands:
+- install -d "$DESTDIR/lib/firmware/nvidia/gk20a"
+- install -d "$DESTDIR/lib/firmware/nvidia/tegra124"
+- install -m644 nvidia/gk20a/fecs_data.bin "$DESTDIR/lib/firmware/nvidia/gk20a"
+- install -m644 nvidia/gk20a/fecs_inst.bin "$DESTDIR/lib/firmware/nvidia/gk20a"
+- install -m644 nvidia/gk20a/gpccs_data.bin "$DESTDIR/lib/firmware/nvidia/gk20a"
+- install -m644 nvidia/gk20a/gpccs_inst.bin "$DESTDIR/lib/firmware/nvidia/gk20a"
+- install -m644 nvidia/gk20a/sw_bundle_init.bin "$DESTDIR/lib/firmware/nvidia/gk20a"
+- install -m644 nvidia/gk20a/sw_ctx.bin "$DESTDIR/lib/firmware/nvidia/gk20a"
+- install -m644 nvidia/gk20a/sw_method_init.bin "$DESTDIR/lib/firmware/nvidia/gk20a"
+- install -m644 nvidia/gk20a/sw_nonctx.bin "$DESTDIR/lib/firmware/nvidia/gk20a"
+- install -m644 nvidia/tegra124/xusb.bin "$DESTDIR/lib/firmware/nvidia/tegra124"
+- install -m644 LICENCE.nvidia "$DESTDIR/lib/firmware"
diff --git a/strata/bsp-jetson/linux-jetson-tk1.morph b/strata/bsp-jetson/linux-jetson-tk1.morph
index 784a39c4..395ac136 100644
--- a/strata/bsp-jetson/linux-jetson-tk1.morph
+++ b/strata/bsp-jetson/linux-jetson-tk1.morph
@@ -34,7 +34,6 @@ configure-commands:
 - scripts/config -e EXT4_FS_POSIX_ACL
 - scripts/config -e EXT4_FS_SECURITY
 - scripts/config -d EXT4_DEBUG
-- scripts/config -e FUSE_FS
 - scripts/config -e OVERLAY_FS
 - scripts/config -e XFS_FS
 - scripts/config -e LIBCRC32C
@@ -51,7 +50,6 @@ configure-commands:
 - scripts/config -e NFSD
 - scripts/config -e NFSD_V3
 - scripts/config -e DRM_TEGRA_STAGING
-- scripts/config -m DRM_NOUVEAU
 - scripts/config -e VLAN_8021Q
 - scripts/config -e BRIDGE_VLAN_FILTERING
 - scripts/config -e BLK_DEV_NBD
@@ -218,11 +216,8 @@ configure-commands:
 - scripts/config -e SCSI_ISCSI_ATTRS
 - scripts/config -e ISCSI_TCP
 - scripts/config -e SCSI_LOWLEVEL
-- scripts/config -m DRM_NOUVEAU
 - scripts/config -e NOUVEAU_PLATFORM_DRIVER
 - scripts/config -e DRM_TEGRA_STAGING
-- scripts/config --set-val NOUVEAU_DEBUG 5
-- scripts/config --set-val NOUVEAU_DEBUG_DEFAULT 3
 - yes '' | make ARCH=arm oldconfig
 build-commands:
 - make $MAKEFLAGS ARCH=arm LOADADDR=0x80200000 zImage dtbs
@@ -246,3 +241,11 @@ install-commands:
       find include/uapi -print0
       find scripts -print0
   ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux"
+system-integration:
+  linux-jetson-tk1-misc:
+    # This is required for any modules to work correctly. However, it depends
+    # `depmod` from the 'kmod' chunk in the 'foundation' stratum, so it runs
+    # conditionally on `depmod` existing to avoid breaking in
+    # minimal-system-x86_64.
+    00-depmod:
+    - if which depmod; then (cd /lib/modules && for version in *; do depmod -a "$version"; done) fi
diff --git a/strata/bsp-jetson/nouveau-drm.morph b/strata/bsp-jetson/nouveau-drm.morph
deleted file mode 100644
index 218091f4..00000000
--- a/strata/bsp-jetson/nouveau-drm.morph
+++ /dev/null
@@ -1,14 +0,0 @@
-name: nouveau-drm
-kind: chunk
-build-commands:
-- sed -e 's/.*android\/sync.*/#ifdef CONFIG_SYNC\n&\n#endif/' -i drm/nouveau/nouveau_fence.c
-- cd drm/nouveau && make ARCH=arm M=$(pwd) -C /usr/src/linux/ modules
-install-commands:
-- cd drm/nouveau && make ARCH=arm M="$(pwd)" -C /usr/src/linux/ INSTALL_MOD_PATH="$DESTDIR"
-  modules_install
-system-integration:
-  nouveau-drm-misc:
-    00-earlyconf:
-    - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau.ko";
-      done)
-    - (cd /lib/modules && for version in *; do depmod -a "$version"; done)
diff --git a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph
index 208eb506..529b74bd 100644
--- a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph
+++ b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph
@@ -264,6 +264,9 @@ configure-commands:
 - scripts/config -e SCSI_VIRTIO
 - scripts/config -e HYPERVISOR_GUEST
 - scripts/config -e PARAVIRT
+- scripts/config -e CONFIG_SND_INTEL8X0
+- scripts/config -m CONFIG_DRM_CIRRUS_QEMU
+- scripts/config -m CONFIG_DRM_BOCHS
 - yes '' | make oldconfig
 build-commands:
 - make $MAKEFLAGS
@@ -285,3 +288,11 @@ install-commands:
       find include/uapi -print0
       find scripts -print0
   ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux"
+system-integration:
+  linux-x86-32-generic-misc:
+    # This is required for any modules to work correctly. However, it depends
+    # `depmod` from the 'kmod' chunk in the 'foundation' stratum, so it runs
+    # conditionally on `depmod` existing to avoid breaking in
+    # minimal-system-x86_32.
+    00-depmod:
+    - if which depmod; then (cd /lib/modules && for version in *; do depmod -a "$version"; done) fi
diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph
index db08f54b..c8d1c37f 100644
--- a/strata/bsp-x86_64-generic.morph
+++ b/strata/bsp-x86_64-generic.morph
@@ -10,8 +10,8 @@ chunks:
 - name: linux-x86-64-generic
   morph: strata/bsp-x86_64-generic/linux-x86-64-generic.morph
   repo: upstream:linux-stable
-  ref: 64291f7db5bd8150a74ad2036f1037e6a0428df2
-  unpetrify-ref: v4.2
+  ref: afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc
+  unpetrify-ref: v4.4
 - name: nasm
   morph: strata/bsp-x86_64-generic/nasm.morph
   repo: upstream:nasm
diff --git a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
index bc8ac7d1..4393f89d 100644
--- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
+++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
@@ -264,6 +264,10 @@ configure-commands:
 - scripts/config -e SCSI_VIRTIO
 - scripts/config -e HYPERVISOR_GUEST
 - scripts/config -e PARAVIRT
+- scripts/config -e CONFIG_SND_INTEL8X0
+- scripts/config -m CONFIG_DRM_CIRRUS_QEMU
+- scripts/config -m CONFIG_DRM_BOCHS
+- scripts/config -m CONFIG_DRM_VIRTIO_GPU
 - yes '' | make oldconfig
 build-commands:
 - make $MAKEFLAGS
@@ -285,3 +289,11 @@ install-commands:
       find include/uapi -print0
       find scripts -print0
   ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux"
+system-integration:
+  linux-x86-64-generic-misc:
+    # This is required for any modules to work correctly. However, it depends
+    # `depmod` from the 'kmod' chunk in the 'foundation' stratum, so it runs
+    # conditionally on `depmod` existing to avoid breaking in
+    # minimal-system-x86_64.
+    00-depmod:
+    - if which depmod; then (cd /lib/modules && for version in *; do depmod -a "$version"; done) fi
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 11cdf59b..81e66ecd 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -80,8 +80,8 @@ chunks:
 - name: stage2-glibc
   morph: strata/build-essential/stage2-glibc.morph
   repo: upstream:glibc
-  ref: 4e42b5b8f89f0e288e68be7ad70f9525aebc2cff
-  unpetrify-ref: glibc-2.21
+  ref: b995d95a5943785be3ab862b2d3276f3b4a22481
+  unpetrify-ref: release/2.22/master
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -246,8 +246,8 @@ chunks:
 - name: glibc
   morph: strata/build-essential/glibc.morph
   repo: upstream:glibc
-  ref: 4e42b5b8f89f0e288e68be7ad70f9525aebc2cff
-  unpetrify-ref: glibc-2.21
+  ref: b995d95a5943785be3ab862b2d3276f3b4a22481
+  unpetrify-ref: release/2.22/master
   build-depends:
   - stage2-binutils
   - stage2-busybox
@@ -266,13 +266,10 @@ chunks:
     glibc-nss: build-essential-runtime
 
 - name: zlib
+  morph: strata/build-essential/zlib.morph
   repo: upstream:zlib
   ref: 50893291621658f355bc5b4d450a8d06a563053d
   unpetrify-ref: v1.2.8
-  build-system: autotools
-  artifacts:
-    zlib-libs: build-essential-minimal
-
   build-depends:
   - stage2-binutils
   - stage2-busybox
@@ -284,6 +281,9 @@ chunks:
   - stage2-make
   - stage2-reset-specs
   - glibc
+  artifacts:
+    zlib-libs: build-essential-minimal
+
 - name: binutils
   morph: strata/build-essential/binutils.morph
   repo: upstream:binutils-tarball
diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.morph
index f44d0ebb..45f22db5 100644
--- a/strata/build-essential/stage2-glibc.morph
+++ b/strata/build-essential/stage2-glibc.morph
@@ -85,8 +85,7 @@ install-commands:
 # sysdeps/unix/sysv/linux/configure.
 - install -d $DESTDIR/lib
 - |
-  cpu=$(echo $TARGET | cut -d '-' -f 1)
-  case "$cpu" in
+  case "$MORPH_ARCH" in
   x86_64)
     install -d "$DESTDIR/lib64"
     ln -s "$PREFIX/lib/ld-linux-x86-64.so.2" \
diff --git a/strata/build-essential/zlib.morph b/strata/build-essential/zlib.morph
new file mode 100644
index 00000000..900648b6
--- /dev/null
+++ b/strata/build-essential/zlib.morph
@@ -0,0 +1,9 @@
+name: zlib
+kind: chunk
+build-system: manual
+configure-commands:
+- ./configure --prefix="$PREFIX"
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/chef.morph b/strata/chef.morph
index b28298e0..9a7f6e73 100644
--- a/strata/chef.morph
+++ b/strata/chef.morph
@@ -66,7 +66,7 @@ chunks:
   unpetrify-ref: master
 - name: diff-lcs-1.2.5
   morph: strata/chef/diff-lcs-1.2.5.morph
-  repo: upstream:diff-lcs
+  repo: upstream:ruby-gems/diff-lcs
   ref: d53e92242b9dd6745e56a0ff4ba15d2f62052b91
   unpetrify-ref: v1.2.5
   build-depends:
diff --git a/strata/compilers-extra.morph b/strata/compilers-extra.morph
deleted file mode 100644
index 361d9387..00000000
--- a/strata/compilers-extra.morph
+++ /dev/null
@@ -1,18 +0,0 @@
-name: compilers-extra
-kind: stratum
-description: |
-  Extra compilers in addition to the ones in build-essential
-build-depends:
-- morph: strata/llvm-common.morph
-- morph: strata/python2-core.morph
-chunks:
-- name: clang
-  morph: strata/compilers-extra/clang.morph
-  repo: upstream:clang
-  ref: 40b68b4c02b9d9e1e4138815747adf5589496240
-  unpetrify-ref: release_37
-- name: compiler-rt
-  morph: strata/compilers-extra/compiler-rt.morph
-  repo: upstream:compiler-rt
-  ref: b5214093d4c91ed5352d35ee9126665fabfa97fe
-  unpetrify-ref: release_37
diff --git a/strata/compilers-extra/clang.morph b/strata/compilers-extra/clang.morph
deleted file mode 100644
index fb7c1ff6..00000000
--- a/strata/compilers-extra/clang.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: clang
-kind: chunk
-build-system: cmake
-configure-commands:
-- mkdir o
-- cd o && cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_BUILD_TYPE=Release ..
-build-commands:
-- cd o && make
-install-commands:
-- cd o && make DESTDIR="$DESTDIR" install
diff --git a/strata/compilers-extra/compiler-rt.morph b/strata/compilers-extra/compiler-rt.morph
deleted file mode 100644
index a1c9085b..00000000
--- a/strata/compilers-extra/compiler-rt.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: compiler-rt
-kind: chunk
-build-system: cmake
-configure-commands:
-- mkdir o
-- cd o && cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_BUILD_TYPE=Release ..
-build-commands:
-- cd o && make
-install-commands:
-- cd o && make DESTDIR="$DESTDIR" install
diff --git a/strata/connectivity.morph b/strata/connectivity.morph
index 124b4cac..b1658446 100644
--- a/strata/connectivity.morph
+++ b/strata/connectivity.morph
@@ -3,6 +3,11 @@ kind: stratum
 build-depends:
 - morph: strata/foundation.morph
 chunks:
+- name: mobile-broadband-provider-info
+  repo: upstream:mobile-broadband-provider-info
+  ref: 4ed19e11c2975105b71b956440acdb25d46a347d
+  unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: libnl
   repo: upstream:libnl
   ref: a2c4bd8f094a7247903578860a9c42049991860b
diff --git a/strata/connman-common.morph b/strata/connman-common.morph
index fde00436..415b2fa4 100644
--- a/strata/connman-common.morph
+++ b/strata/connman-common.morph
@@ -9,3 +9,8 @@ chunks:
   repo: upstream:connman
   ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44
   unpetrify-ref: baserock/1.24
+- name: ofono
+  morph: strata/connman-common/ofono.morph
+  repo: upstream:ofono
+  ref: d05b718cc0b0d367227fbfbf52e60fc5462cc549
+  unpetrify-ref: '1.15'
diff --git a/strata/audio-bluetooth/ofono.morph b/strata/connman-common/ofono.morph
index a775b0c1..a775b0c1 100644
--- a/strata/audio-bluetooth/ofono.morph
+++ b/strata/connman-common/ofono.morph
diff --git a/strata/core.morph b/strata/core.morph
index 66880527..33010335 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -246,7 +246,7 @@ chunks:
   morph: strata/core/attr.morph
   repo: upstream:attr
   ref: 4b005410f865895d4dcd56e2c135278a7a315877
-  unpetrify-ref: baserock/morph
+  unpetrify-ref: v2.4.47
   build-depends:
   - file
   - autoconf
diff --git a/strata/core/python3.morph b/strata/core/python3.morph
index 0d730bc9..68184f31 100644
--- a/strata/core/python3.morph
+++ b/strata/core/python3.morph
@@ -11,3 +11,5 @@ configure-commands:
 post-install-commands:
 - test -x "$DESTDIR"/"$PREFIX"/bin/python || ln -s python3.4 "$DESTDIR"/"$PREFIX"/bin/python
 - test -x "$DESTDIR"/"$PREFIX"/bin/python3 || ln -s python3.4 "$DESTDIR"/"$PREFIX"/bin/python3
+- test -x "$DESTDIR"/"$PREFIX"/bin/python-config || ln -s python3.4-config "$DESTDIR"/"$PREFIX"/bin/python-config
+- test -x "$DESTDIR"/"$PREFIX"/bin/python3-config || ln -s python3.4-config "$DESTDIR"/"$PREFIX"/bin/python3-config
diff --git a/strata/data-indexing-management.morph b/strata/data-indexing-management.morph
new file mode 100644
index 00000000..097f2d72
--- /dev/null
+++ b/strata/data-indexing-management.morph
@@ -0,0 +1,40 @@
+name: data-indexing-management
+kind: stratum
+description: Components to index data
+build-depends:
+- morph: strata/graphics-common.morph
+- morph: strata/icu-common.morph
+- morph: strata/multimedia-gstreamer.morph
+- morph: strata/vala-common.morph
+chunks:
+- name: libexif
+  repo: upstream:libexif-tarball
+  ref: 0c6a5fa0d9719a40748d8726b4543f02f70518c1
+  unpetrify-ref: libexif-0.6.21
+  build-system: autotools
+- name: libmediaart
+  morph: strata/data-indexing-management/libmediaart.morph
+  repo: upstream:gnome/libmediaart
+  ref: 52eb6498c97ce0005186946bc9162d87597abc2c
+  unpetrify-ref: baserock/1.9.0-8-g52eb649
+- name: gmime
+  morph: strata/data-indexing-management/gmime.morph
+  repo: upstream:gnome/gmime
+  ref: 496313fbe956b350c22fa705edbcfdde3d7c9e50
+  unpetrify-ref: baserock/GMIME_2_6_20-24-g496313f
+- name: totem-pl-parser
+  repo: upstream:gnome/totem-pl-parser
+  ref: 1be3144e9a6bf183a61c9596165d52bbe405b5cc
+  unpetrify-ref: baserock/V_3_10_5-16-g1be3144
+  build-system: autotools
+  build-depends:
+  - gmime
+- name: tracker
+  repo: upstream:gnome/tracker
+  ref: ad31f26e3c45dbe3365ff4aaae39269d9210f4a9
+  unpetrify-ref: 1.6.0
+  build-system: autotools
+  build-depends:
+  - libexif
+  - libmediaart
+  - totem-pl-parser
diff --git a/strata/gnome/gmime.morph b/strata/data-indexing-management/gmime.morph
index f71efac4..f71efac4 100644
--- a/strata/gnome/gmime.morph
+++ b/strata/data-indexing-management/gmime.morph
diff --git a/strata/gnome/libmediaart.morph b/strata/data-indexing-management/libmediaart.morph
index 43e0812f..43e0812f 100644
--- a/strata/gnome/libmediaart.morph
+++ b/strata/data-indexing-management/libmediaart.morph
diff --git a/strata/dlna-services.morph b/strata/dlna-services.morph
new file mode 100644
index 00000000..d37f953a
--- /dev/null
+++ b/strata/dlna-services.morph
@@ -0,0 +1,51 @@
+name: dlna-services
+kind: stratum
+description: provides DLNA services
+build-depends:
+- morph: strata/data-indexing-management.morph
+- morph: strata/docutils.morph
+- morph: strata/vala-common.morph
+chunks:
+- name: gssdp
+  morph: strata/gnome/gssdp.morph
+  repo: upstream:gnome/gssdp
+  ref: a53a6ac85f1b70192bc75fbbd4601582d6095cfd
+  unpetrify-ref: gssdp-0.14.12
+- name: gupnp
+  repo: upstream:gnome/gupnp
+  ref: c42b9cdda466ae9fef91f6beb370f8dfdebc295c
+  unpetrify-ref: gupnp-0.20.14
+  build-system: autotools
+  build-depends:
+  - gssdp
+- name: gupnp-av
+  repo: upstream:gnome/gupnp-av
+  ref: d277511ae1f456ba804f4c9beb5d36043f5a1659
+  unpetrify-ref: gupnp-av-0.12.7
+  build-system: autotools
+  build-depends:
+  - gupnp
+- name: gupnp-igd
+  repo: upstream:gnome/gupnp-igd
+  ref: f679a8ad782eee72e2ff7a0a7598b4523ef03bb3
+  unpetrify-ref: 0.2.4
+  build-system: autotools
+  build-depends:
+  - gupnp
+- name: gupnp-dlna
+  repo: upstream:gnome/gupnp-dlna
+  ref: 1aad765f223e3338d86bc975a2b4925fca43bf58
+  unpetrify-ref: gupnp-dlna-0.10.3
+  build-system: autotools
+  build-depends:
+  - gupnp
+- name: rygel
+  repo: upstream:rygel
+  ref: 4a42aee4afda9509db1e3d259c5a2907407a7261
+  unpetrify-ref: RYGEL_0_28_2
+  build-system: autotools
+  build-depends:
+  - gssdp
+  - gupnp
+  - gupnp-av
+  - gupnp-dlna
diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph
index cf3d0e8b..61942884 100644
--- a/strata/enlightenment.morph
+++ b/strata/enlightenment.morph
@@ -4,7 +4,7 @@ description: Enlightenment Desktop and Window Manager
 build-depends:
 - morph: strata/tools.morph
 - morph: strata/x-generic.morph
-- morph: strata/lua.morph
+- morph: strata/lua51.morph
 - morph: strata/audio-bluetooth.morph
 - morph: strata/multimedia-gstreamer.morph
 - morph: strata/connman-common.morph
diff --git a/strata/erlang.morph b/strata/erlang.morph
index e9e61bea..5eae200b 100644
--- a/strata/erlang.morph
+++ b/strata/erlang.morph
@@ -13,6 +13,6 @@ chunks:
   morph: strata/erlang/rebar.morph
   repo: upstream:erlang-modules/rebar
   ref: d42ed4683576d995f60e3222f076e99f0b081f79
-  unpretrify-ref: master
+  unpetrify-ref: master
   build-depends:
   - erlang
diff --git a/strata/geolocation.morph b/strata/geolocation.morph
new file mode 100644
index 00000000..f6d654fc
--- /dev/null
+++ b/strata/geolocation.morph
@@ -0,0 +1,18 @@
+name: geolocation
+kind: stratum
+description: libraries/services that provides location information
+build-depends:
+- morph: strata/glib-common.morph
+- morph: strata/libsoup-common.morph
+- morph: strata/NetworkManager-common.morph
+chunks:
+- name: geocode-glib
+  repo: upstream:gnome/geocode-glib
+  ref: a3e183e40053b4bd0fd0b25a070f60597270397a
+  unpetrify-ref: master
+  build-system: autotools
+- name: geoclue
+  morph: strata/geolocation/geoclue.morph
+  repo: upstream:geoclue
+  ref: ae8f7ab2f1e90f61931c652f2f65996c30c79e87
+  unpetrify-ref: 2.4.0
diff --git a/strata/gnome/geoclue.morph b/strata/geolocation/geoclue.morph
index 3be946bb..3be946bb 100644
--- a/strata/gnome/geoclue.morph
+++ b/strata/geolocation/geoclue.morph
diff --git a/strata/glib-common.morph b/strata/glib-common.morph
index ffdc5b14..1d089fbb 100644
--- a/strata/glib-common.morph
+++ b/strata/glib-common.morph
@@ -26,3 +26,12 @@ chunks:
   build-system: autotools
   build-depends:
   - glib
+- name: json-glib
+  repo: upstream:json-glib
+  ref: bfbc0b48e9256473491755766c079f73bee80724
+  unpetrify-ref: master
+  build-system: autotools
+  build-depends:
+  - glib
+  - gobject-introspection
+  - gtk-doc-stub
diff --git a/strata/gnome.morph b/strata/gnome.morph
index 3ae06ef4..f6d38cf1 100644
--- a/strata/gnome.morph
+++ b/strata/gnome.morph
@@ -4,7 +4,9 @@ description: GNOME stratum
 build-depends:
 - morph: strata/icu-common.morph
 - morph: strata/input-common.morph
-- morph: strata/tools.morph
+- morph: strata/data-indexing-management.morph
+- morph: strata/vala-common.morph
+- morph: strata/geolocation.morph
 - morph: strata/gtk2.morph
 - morph: strata/gtk3.morph
 - morph: strata/audio-bluetooth.morph
@@ -12,13 +14,16 @@ build-depends:
 - morph: strata/NetworkManager-common.morph
 - morph: strata/multimedia-gstreamer.morph
 - morph: strata/network-security.morph
+- morph: strata/privileges-management.morph
 - morph: strata/python3-gobject.morph
 - morph: strata/python2-core.morph
 - morph: strata/wayland-generic.morph
-- morph: strata/x-generic.morph
 - morph: strata/ruby.morph
 - morph: strata/samba.morph
+- morph: strata/secret-service.morph
+- morph: strata/spell-checking.morph
 - morph: strata/cups.morph
+- morph: strata/WebKitGtk1-common.morph
 chunks:
 - name: dconf
   morph: strata/gnome/dconf.morph
@@ -30,11 +35,6 @@ chunks:
   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
@@ -42,7 +42,6 @@ chunks:
   unpetrify-ref: master
   build-depends:
   - cogl
-  - json-glib
 - name: clutter-gtk
   repo: upstream:gnome/clutter-gtk
   ref: 56b09d02f71aa38f9496226641850e6ecf14ef70
@@ -50,6 +49,14 @@ chunks:
   build-system: autotools
   build-depends:
   - clutter
+- name: libchamplain
+  morph: strata/gnome/libchamplain.morph
+  repo: upstream:gnome/libchamplain
+  ref: c873d9d8116b8e14c1bfa939439d763926a77446
+  unpetrify-ref: LIBCHAMPLAIN_0_12_12
+  build-depends:
+  - clutter
+  - clutter-gtk
 - name: gsettings-desktop-schemas
   repo: upstream:gnome/gsettings-desktop-schemas
   ref: db40812cd79f64c98432efd1b632c5633a27f77e
@@ -82,13 +89,13 @@ chunks:
   build-system: autotools
 - name: gnome-desktop
   repo: upstream:gnome/gnome-desktop
-  ref: 1dbe40fac0e9924552ce2692ec141e86ce3d5633
-  unpetrify-ref: master
-  build-system: autotools
+  ref: 09d331adeb23aea7ec058dfb39c5224ebe8ae8f6
+  unpetrify-ref: 3.18.2
   build-depends:
   - gsettings-desktop-schemas
   - iso-codes
   - yelp-tools
+  build-system: autotools
 - name: libnotify
   repo: upstream:gnome/libnotify
   ref: 2f2c5649ef210b1dffeb46cddf062d20e1518ccf
@@ -118,12 +125,12 @@ chunks:
   morph: strata/gnome/libhangul.morph
   repo: upstream:libhangul
   ref: 78e9d8926262db423b4cf9181e1c2cb06a120a9b
-  unpetrify-ref: libhangul-0.1.0-19-g78e9d89
+  unpetrify-ref: baserock/libhangul-0.1.0-19-g78e9d89
 - name: ibus-hangul
   morph: strata/gnome/ibus-hangul.morph
   repo: upstream:ibus-hangul
   ref: 44f41ae5178372a7ff0540a4ce7a4944335525df
-  unpetrify-ref: 1.5.0-13-g44f41ae
+  unpetrify-ref: baserock/1.5.0-13-g44f41ae
   build-depends:
   - ibus
   - libhangul
@@ -143,7 +150,7 @@ chunks:
   morph: strata/gnome/ibus-libpinyin.morph
   repo: upstream:ibus-libpinyin
   ref: 4bb5fc19c0829053acd29619de59a85a73e03676
-  unpetrify-ref: 1.7.2-7-g4bb5fc1
+  unpetrify-ref: baserock/1.7.2-7-g4bb5fc1
   build-depends:
   - ibus
   - libpinyin
@@ -156,7 +163,7 @@ chunks:
   morph: strata/gnome/ibus-anthy.morph
   repo: upstream:ibus-anthy
   ref: 9ba0a2a1e595fbf6e39c50a15814bb6f9e337769
-  unpetrify-ref: 1.5.7-6-g9ba0a2a
+  unpetrify-ref: baserock/1.5.7-6-g9ba0a2a
   build-depends:
   - ibus
   - anthy
@@ -175,31 +182,6 @@ chunks:
   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: libatasmart
-  morph: strata/gnome/libatasmart.morph
-  repo: upstream:libatasmart
-  ref: de6258940960443038b4c1651dfda3620075e870
-  unpetrify-ref: master
-- name: udisks
-  morph: strata/gnome/udisks.morph
-  repo: upstream:udisks
-  ref: 410cab8f3d749ad2660cda3ba38b6aece42bf10f
-  unpetrify-ref: master
-  build-depends:
-  - polkit
-  - libatasmart
 - name: colord
   morph: strata/gnome/colord.morph
   repo: upstream:colord
@@ -208,7 +190,6 @@ chunks:
   build-depends:
   - gusb
   - lcms2
-  - polkit
 - name: colord-gtk
   repo: upstream:colord-gtk
   ref: eadca143872288e1300303a771efdaab196900e1
@@ -216,47 +197,11 @@ chunks:
   build-system: autotools
   build-depends:
   - colord
-- name: geocode-glib
-  repo: upstream:gnome/geocode-glib
-  ref: a3e183e40053b4bd0fd0b25a070f60597270397a
-  unpetrify-ref: master
-  build-system: autotools
-  build-depends:
-  - json-glib
-- 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
-  morph: strata/gnome/ModemManager.morph
-  repo: upstream:ModemManager
-  ref: 0ca68657fbcd5bace3d303a0babe2da292784385
-  unpetrify-ref: master
-  build-depends:
-  - libmbim
-  - libqmi
-  - polkit
-- name: geoclue
-  morph: strata/gnome/geoclue.morph
-  repo: upstream:geoclue
-  ref: ae8f7ab2f1e90f61931c652f2f65996c30c79e87
-  unpetrify-ref: 2.4.0
-  build-depends:
-  - json-glib
-  - ModemManager
 - name: libgweather
   repo: upstream:gnome/libgweather
   ref: 5b8aed611f24d03434eed35e438cea213b894b7c
   unpetrify-ref: master
   build-system: autotools
-  build-depends:
-  - geocode-glib
 - name: gnome-settings-daemon
   morph: strata/gnome/gnome-settings-daemon.morph
   repo: upstream:gnome-settings-daemon
@@ -264,8 +209,6 @@ chunks:
   unpetrify-ref: baserock/3.18.0/disable_wacom
   build-depends:
   - colord
-  - geoclue
-  - geocode-glib
   - gnome-desktop
   - gsettings-desktop-schemas
   - ibus
@@ -317,6 +260,7 @@ chunks:
   ref: 07237ff25d6171e1b548118442ddba4259a53ba5
   unpetrify-ref: master
   build-system: autotools
+<<<<<<< HEAD
 - name: libtasn1
   repo: upstream:libtasn1
   ref: 7f3a9c2294cdebd9e63fe007150c181b980865ef
@@ -336,6 +280,8 @@ chunks:
   build-system: autotools
   build-depends:
   - p11-kit
+=======
+>>>>>>> ee7c42ae4eca2995a58b3c9d0a298dae6f9684b6
 - name: libxkbcommon-x11
   repo: upstream:xorg-lib-libxkbcommon
   ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28
@@ -345,7 +291,7 @@ chunks:
   morph: strata/gnome/mutter.morph
   repo: upstream:mutter
   ref: b975676c5ddd9401d4acfc4d0b9317dd8956656b
-  unpetrify-ref: 3.18.0-25-gb975676
+  unpetrify-ref: baserock/3.18.0-25-gb975676
   build-depends:
   - clutter
   - cogl
@@ -363,6 +309,7 @@ chunks:
   build-system: autotools
   build-depends:
   - iso-codes
+<<<<<<< HEAD
 - name: m4-common
   repo: upstream:m4-common
   ref: 4b704704f5e826b73b79ccfddaf215a510c104c4
@@ -375,6 +322,9 @@ chunks:
   build-system: autotools
   build-depends:
   - m4-common
+=======
+  build-system: autotools
+>>>>>>> ee7c42ae4eca2995a58b3c9d0a298dae6f9684b6
 - name: caribou
   morph: strata/gnome/caribou.morph
   repo: upstream:caribou
@@ -382,39 +332,19 @@ chunks:
   unpetrify-ref: baserock/CARIBOU_0_4_19-1-ge1a7a24+python3
   build-depends:
   - clutter
-  - libgee
   - libxklavier
-- name: libsecret
-  morph: strata/gnome/libsecret.morph
-  repo: upstream:gnome/libsecret
-  ref: 4d76cf7dd8e55d93bb58164a1fff38113ba97af5
-  unpetrify-ref: master
 - name: librest
   morph: strata/gnome/librest.morph
   repo: upstream:gnome/librest
   ref: 08f1fc35e3c77aecedacf08aa510e82c91ac7f2a
   unpetrify-ref: 0.7.93
-- name: enchant
-  repo: upstream:enchant
-  ref: 6d8b6bb15f09a14c90fb900eb2ecf1172d7cf6cf
-  unpetrify-ref: master
-  build-system: autotools
-- name: hyphen
-  repo: upstream:hyphen
-  ref: 7f28cf7edb54cc1bc4eaa09672e0bc043b1da70b
-  unpetrify-ref: master
-  build-system: autotools
 - name: WebKitGtk
   morph: strata/gnome/WebKitGtk.morph
   repo: upstream:WebKitGtk-tarball
   ref: e15dd966d523731101f70ccf768bba12435a0208
   unpetrify-ref: webkitgtk-2.10.2
   build-depends:
-  - enchant
-  - geoclue
-  - hyphen
   - libnotify
-  - libsecret
 - name: gnome-online-accounts
   morph: strata/gnome/gnome-online-accounts.morph
   repo: upstream:gnome/gnome-online-accounts
@@ -433,12 +363,10 @@ chunks:
   morph: strata/gnome/libgdata.morph
   repo: upstream:libgdata
   ref: ed52192fcd3cde2c0d7f0ab0d9e300fcdbc373a8
-  unpetrify-ref: LIBGDATA_0_17_3-16-ged52192
+  unpetrify-ref: baserock/LIBGDATA_0_17_3-16-ged52192
   build-depends:
-  - gcr
   - gnome-online-accounts
   - liboauth
-  - m4-common
 - name: krb5
   morph: strata/gnome/krb5.morph
   repo: upstream:krb5
@@ -447,23 +375,63 @@ chunks:
 - name: evolution-data-server
   morph: strata/gnome/evolution-data-server.morph
   repo: upstream:evolution-data-server
-  ref: 8d094ef96a89957d353beaa66f0cbaa04cfbfedd
-  unpetrify-ref: EVOLUTION_DATA_SERVER_3_18_1-11-g8d094ef
+  ref: 658d6e37796984bf05e275413726ad3b71083ccf
+  unpetrify-ref: EVOLUTION_DATA_SERVER_3_18_3
   build-depends:
-  - gcr
   - gnome-online-accounts
   - krb5
   - libgdata
   - libgweather
-  - libsecret
+- name: raptor
+  morph: strata/gnome/raptor.morph
+  repo: upstream:raptor
+  ref: 286452cd786098ce31a002f16e5ec2e0fbdc9041
+  unpetrify-ref: raptor2_2_0_15
+- name: isodate
+  repo: upstream:python-packages/isodate
+  ref: b99c0bd318991a8a8a9dc0c5273800b9801428f6
+  unpetrify-ref: 0.5.4
+  build-system: python-distutils
+- name: rdflib
+  repo: upstream:python-packages/rdflib
+  ref: c2f9725f385a85fd280b4cf30239748b24f5cc06
+  unpetrify-ref: 4.2.1
+  build-system: python-distutils
+  build-depends:
+  - isodate
+- name: zeitgeist
+  morph: strata/gnome/zeitgeist.morph
+  repo: upstream:zeitgeist
+  ref: abc7939806346a563ded2b16456dc7e2fff54fcc
+  unpetrify-ref: v0.9.16
+  build-depends:
+  - raptor
+  - rdflib
+  - telepathy-glib
+- name: folks
+  morph: strata/gnome/folks.morph
+  repo: upstream:gnome/folks
+  ref: 27367f26cd66bb86b745c892db214aa9a136c818
+  unpetrify-ref: 0.11.2
+  build-depends:
+  - evolution-data-server
+  - telepathy-logger
+  - zeitgeist
+- name: libgfbgraph
+  repo: upstream:gnome/libgfbgraph
+  ref: 50eabf601310052216e25fa112e688204738f222
+  unpetrify-ref: v_0_2_3
+  build-system: autotools
+  build-depends:
+  - gnome-online-accounts
+  - librest
 - name: network-manager-applet
   repo: upstream:gnome/network-manager-applet
   ref: bbcc673af29066cfc6f0e12f04c0dd3f9937fb3a
-  unpetrify-ref: 0.9.10-beta1-344-gbbcc673
+  unpetrify-ref: baserock/0.9.10-beta1-344-gbbcc673
   build-system: autotools
   build-depends:
   - iso-codes
-  - libsecret
   - libnotify
 - name: gnome-shell
   morph: strata/gnome/gnome-shell.morph
@@ -474,22 +442,19 @@ chunks:
   - caribou
   - clutter
   - evolution-data-server
-  - gcr
   - gjs
   - libcanberra
   - mutter
-  - polkit
   - startup-notification
   - telepathy-glib
   - network-manager-applet
 - name: gnome-session
   morph: strata/gnome/gnome-session.morph
   repo: upstream:gnome/gnome-session
-  ref: 9af8474a027edecf7c73827964fd88bc960266d6
-  unpetrify-ref: 3.18.0-3-g9af8474
+  ref: 4ab09c39738adaaf16116b3bd82e47188b5483cd
+  unpetrify-ref: 3.18.1.2
   build-depends:
   - gnome-desktop
-  - json-glib
 - name: d-feet
   morph: strata/gnome/d-feet.morph
   repo: upstream:gnome/d-feet
@@ -497,35 +462,17 @@ chunks:
   unpetrify-ref: master
   build-depends:
   - yelp-tools
-- name: gnome-keyring
-  morph: strata/gnome/gnome-keyring.morph
-  repo: upstream:gnome-keyring
-  ref: b1aee9c01f647f084e6c0ae2b4810c9ec7d0fd0d
-  unpetrify-ref: 3.18.0
-  build-depends:
-  - gcr
-- name: gvfs
-  morph: strata/gnome/gvfs.morph
-  repo: upstream:gvfs
-  ref: d037b5fd56cae878ed7bb5269a40e4bd046551d7
-  unpetrify-ref: master
-  build-depends:
-  - gcr
-  - udisks
 - name: accountsservice
   morph: strata/gnome/accountsservice.morph
   repo: upstream:accountsservice
   ref: 36b424b4aad91aaf91eeb6b6285cf550b15fcfeb
   unpetrify-ref: master
-  build-depends:
-  - polkit
 - name: gdm
   morph: strata/gnome/gdm.morph
   repo: upstream:gdm
   ref: 494ec8cee5727c37118994d3864c44f36aa454fc
   unpetrify-ref: 3.18.0
   build-depends:
-  - polkit
   - accountsservice
   - libcanberra
   - dconf
@@ -545,33 +492,17 @@ chunks:
   morph: strata/gnome/adwaita-icon-theme.morph
   repo: upstream:gnome/adwaita-icon-theme
   ref: 5e469ae6e664cb0808b6ce9fcfd7bd2ac6fc4216
-  unpetrify-ref: gnome-3.18
+  unpetrify-ref: gnome-3-18
 - name: gnome-backgrounds
   repo: upstream:gnome/gnome-backgrounds
   ref: e68462edd35ae3edb4311df90dc4d1a3cdcb175f
-  unpetrify-ref: 3.18.0-2-ge68462e
-  build-system: autotools
-- name: nettle
-  morph: strata/gnome/nettle.morph
-  repo: upstream:nettle
-  ref: 549e2853d6f3fa9cefb099970209c7f5bf5673b7
-  unpetrify-ref: nettle_3.1.1_release_20150424
-- name: gnutls
-  morph: strata/gnome/gnutls.morph
-  repo: upstream:gnutls
-  ref: 21fecbde80ae824f85a10a0c23a327c49e4e5fb6
-  unpetrify-ref: baserock/gnutls_3_4_6
-  build-depends:
-  - nettle
-  - libtasn1
-  - p11-kit
+  unpetrify-ref: baserock/3.18.0-2-ge68462e
+  build-system: autotools
 - name: glib-networking
   morph: strata/gnome/glib-networking.morph
   repo: upstream:gnome/glib-networking
   ref: 32ee55186d7df497e3d402a1940cddfabd9dbc21
   unpetrify-ref: 2.46.0
-  build-depends:
-  - gnutls
 - name: cracklib
   morph: strata/gnome/cracklib.morph
   repo: upstream:cracklib
@@ -584,40 +515,20 @@ chunks:
   unpetrify-ref: libpwquality-1.3.0
   build-depends:
   - cracklib
-- name: gnome-initial-setup
-  morph: strata/gnome/gnome-initial-setup.morph
-  repo: upstream:gnome/gnome-initial-setup
-  ref: e0b7f968213d26807d00ca5841c03f4a5a4605b2
-  unpetrify-ref: 3.19.1-1-ge0b7f96
+- name: glade
+  morph: strata/gnome/glade.morph
+  repo: upstream:gnome/glade
+  ref: 4f81f15467ad45c3dddc7ee50ffaca9596d628ee
+  unpetrify-ref: master
   build-depends:
-  - accountsservice
-  - gdm
-  - gnome-desktop
-  - gnome-keyring
-  - gnome-online-accounts
-  - ibus
-  - iso-codes
-  - krb5
-  - libgweather
-  - libpwquality
-  - network-manager-applet
+  - yelp-tools
 - name: vte
   morph: strata/gnome/vte.morph
   repo: upstream:gnome/vte
   ref: aa7120c2e359bb5d6d0b0ec6c1e0eecf0583be03
   unpetrify-ref: 0.43.0
   build-depends:
-  - gnutls
-- name: tracker
-  repo: upstream:gnome/tracker
-  ref: ad31f26e3c45dbe3365ff4aaae39269d9210f4a9
-  unpetrify-ref: 1.6.0
-  build-system: autotools
-- name: libexif
-  repo: upstream:libexif-tarball
-  ref: 0c6a5fa0d9719a40748d8726b4543f02f70518c1
-  unpetrify-ref: libexif-0.6.21
-  build-system: autotools
+  - glade
 - name: nautilus
   morph: strata/gnome/nautilus.morph
   repo: upstream:nautilus
@@ -627,13 +538,11 @@ chunks:
   - vte
   - gnome-desktop
   - gsettings-desktop-schemas
-  - libexif
-  - tracker
 - name: desktop-file-utils
+  morph: strata/gnome/desktop-file-utils.morph
   repo: upstream:desktop-file-utils
   ref: 4944725bddcf5821d53d7d648fc53347ce12cc03
   unpetrify-ref: 0.22
-  build-system: autotools
 - name: gnome-terminal
   morph: strata/gnome/gnome-terminal.morph
   repo: upstream:gnome/gnome-terminal
@@ -646,45 +555,80 @@ chunks:
   - gsettings-desktop-schemas
   - nautilus
   - yelp-tools
-- name: gmime
-  morph: strata/gnome/gmime.morph
-  repo: upstream:gnome/gmime
-  ref: 496313fbe956b350c22fa705edbcfdde3d7c9e50
-  unpetrify-ref: GMIME_2_6_20-24-g496313f
-- name: totem-pl-parser
-  repo: upstream:gnome/totem-pl-parser
-  ref: 1be3144e9a6bf183a61c9596165d52bbe405b5cc
-  unpetrify-ref: V_3_10_5-16-g1be3144
-  build-system: autotools
-  build-depends:
-  - gmime
-- name: libmediaart
-  morph: strata/gnome/libmediaart.morph
-  repo: upstream:gnome/libmediaart
-  ref: 52eb6498c97ce0005186946bc9162d87597abc2c
-  unpetrify-ref: 1.9.0-8-g52eb649
+- name: libnice
+  repo: upstream:libnice
+  ref: 533ff6c5a03680f300709be4dc999f45659f3a1b
+  unpetrify-ref: 0.1.13
+  build-system: autotools
+- name: farstream
+  repo: upstream:farstream
+  ref: 9247c10816835dc76269baa7c4c8996ae1a2fac3
+  unpetrify-ref: baserock/0.2.7
+  build-system: autotools
+  build-depends:
+  - libnice
+- name: telepathy-farstream
+  repo: upstream:telepathy-farstream
+  ref: 0b1bba79cfe94e7676fe69e9e0d2e3983a3c14c5
+  unpetrify-ref: telepathy-farstream-0.6.2
+  build-system: autotools
+  build-depends:
+  - farstream
+  - telepathy-glib
+- name: telepathy-gabble
+  morph: strata/gnome/telepathy-gabble.morph
+  repo: upstream:telepathy-gabble
+  ref: 91d890ef3f269e92ea3a2a265597293e056e842c
+  unpetrify-ref: baserock/telepathy-gabble-0.18.3
+  build-depends:
+  - libnice
+  - telepathy-glib
+- name: telepathy-salut
+  morph: strata/gnome/telepathy-salut.morph
+  repo: upstream:telepathy-salut
+  ref: e554f3c595307f665e5c2dd464f1baf0120ab43d
+  unpetrify-ref: baserock/telepathy-salut-0.8.1
+  build-depends:
+  - telepathy-glib
+- name: telepathy-idle
+  repo: upstream:telepathy-idle
+  ref: 55e9841a4af51d7f014395475526b700abec4d0b
+  unpetrify-ref: telepathy-idle-0.2.0
+  build-system: autotools
+  build-depends:
+  - telepathy-glib
+- name: libpurple
+  morph: strata/gnome/libpurple.morph
+  repo: upstream:pidgin
+  ref: 9273b95bd66893a362cbf6f69bb8bc749db41f04
+  unpetrify-ref: baserock/v2.10.11
+  build-depends:
+  - evolution-data-server
+  - farstream
+- name: telepathy-haze
+  repo: upstream:telepathy-haze
+  ref: d3d7b7f9342511c0c961e3f2d9fc1f5fb0804142
+  unpetrify-ref: telepathy-haze-0.8.0
+  build-system: autotools
+  build-depends:
+  - libpurple
+  - telepathy-glib
 - name: grilo
   repo: upstream:gnome/grilo
   ref: e470c0cd72231d2a86f419a584df3d635bc6b62f
-  unpetrify-ref: grilo-0.2.14-17-ge470c0c
+  unpetrify-ref: baserock/grilo-0.2.14-17-ge470c0c
   build-system: autotools
-  build-depends:
-  - totem-pl-parser
 - name: grilo-plugins
   repo: upstream:gnome/grilo-plugins
   ref: e23b0fa5f6656d53b977693bf55174bd2ccd172d
-  unpetrify-ref: grilo-plugins-0.2.16-17-ge23b0fa
+  unpetrify-ref: baserock/grilo-plugins-0.2.16-17-ge23b0fa
   build-system: autotools
   build-depends:
   - gnome-online-accounts
   - grilo
   - libgdata
-  - libmediaart
   - liboauth
   - librest
-  - m4-common
-  - totem-pl-parser
-  - tracker
   - yelp-tools
 - name: libgtop
   repo: upstream:gnome/libgtop
@@ -712,7 +656,7 @@ chunks:
 - name: gcab
   repo: upstream:gnome/gcab
   ref: e57dd3d1ddb0da91df9188c2a98d59d1050ac6cb
-  unpetrify-ref: v0.6-22-ge57dd3d
+  unpetrify-ref: baserock/v0.6-22-ge57dd3d
   build-system: autotools
 - name: appstream-glib
   repo: upstream:appstream-glib
@@ -736,7 +680,6 @@ chunks:
   - gnome-desktop
   - lcms2
   - libcanberra
-  - libexif
   - vte
   - yelp-tools
 - name: clutter-gst
@@ -746,6 +689,13 @@ chunks:
   build-system: autotools
   build-depends:
   - clutter
+- name: clutter-gst2
+  repo: upstream:gnome/clutter-gst
+  ref: e9372b1c7d858ae0268d92d0c5e02532a8352b68
+  unpetrify-ref: 2.0.16
+  build-system: autotools
+  build-depends:
+  - clutter
 - name: cheese
   morph: strata/gnome/cheese.morph
   repo: upstream:gnome/cheese
@@ -785,6 +735,23 @@ chunks:
   - libpwquality
   - libwacom
   - network-manager-applet
+- name: gnome-initial-setup
+  morph: strata/gnome/gnome-initial-setup.morph
+  repo: upstream:gnome/gnome-initial-setup
+  ref: a6ae059a7fab60cae534f78eb485960a7b406be5
+  unpetrify-ref: new-user-mode-fixes
+  build-depends:
+  - accountsservice
+  - cheese
+  - gdm
+  - gnome-desktop
+  - gnome-online-accounts
+  - ibus
+  - iso-codes
+  - krb5
+  - libgweather
+  - libpwquality
+  - network-manager-applet
 - name: libgnomekbd
   repo: upstream:gnome/libgnomekbd
   ref: d8ff867e95e548476c68db12ade3a0a4697a24a1
@@ -792,3 +759,215 @@ chunks:
   build-system: autotools
   build-depends:
   - libxklavier
+- name: sound-theme-freedesktop
+  build-system: autotools
+  repo: upstream:sound-theme-freedesktop
+  ref: 9d2ac65a2f88263f0eec8b777ef3bdc023b93c25
+  unpetrify-ref: 0.8
+- name: libwnck
+  morph: strata/gnome/libwnck.morph
+  repo: upstream:libwnck
+  ref: 46bade6f53351f2a63d030e27cbba2e0048d1cde
+  unpetrify-ref: 3.14.0
+- name: libpeas
+  morph: strata/gnome/libpeas.morph
+  repo: upstream:gnome/libpeas
+  ref: ede1902bee26dbe36c2c1559b1166035580cdf30
+  unpetrify-ref: libpeas-1.16.0
+- name: gtksourceview
+  morph: strata/gnome/gtksourceview.morph
+  repo: upstream:gnome/gtksourceview
+  ref: eeb6fd40fbbc74515828070fef554ed98ad481e9
+  unpetrify-ref: 3.18.1
+  build-depends:
+  - glade
+###############################################
+#         Applications Start Here             #
+###############################################
+- name: epiphany
+  morph: strata/gnome/epiphany.morph
+  repo: upstream:gnome/epiphany
+  ref: 5483823ae71fc5280e2fda9e85557362debb0c2e
+  unpetrify-ref: 3.18.1
+  build-depends:
+  - appstream-glib
+  - gnome-desktop
+  - iso-codes
+  - libcanberra
+  - libnotify
+  - libwnck
+  - startup-notification
+  - WebKitGtk
+- name: totem
+  repo: upstream:gnome/totem
+  ref: 77cf0b9d3de4fd3a48492c77e25308d6c411b651
+  unpetrify-ref: baserock/V_3_18_1
+  build-system: autotools
+  build-depends:
+  - appstream-glib
+  - clutter
+  - clutter-gst
+  - clutter-gtk
+  - gnome-desktop
+  - grilo
+  - grilo-plugins
+  - gsettings-desktop-schemas
+  - iso-codes
+  - libpeas
+  - yelp-tools
+- name: yelp
+  repo: upstream:gnome/yelp
+  morph: strata/gnome/yelp.morph 
+  ref: 9932283ce9610f969e023a0dc326c81159c06a15
+  unpetrify-ref: 3.18.1
+  build-depends:
+  - WebKitGtk
+  - yelp-xsl
+- name: gnome-user-docs
+  repo: upstream:gnome/gnome-user-docs
+  ref: 618fc9644317c55d674ca2e1b00b41d364427fb1
+  unpetrify-ref: master
+  build-system: autotools
+  build-depends:
+  - yelp-tools
+- name: gnome-getting-started-docs
+  repo: upstream:gnome/gnome-getting-started-docs
+  ref: e50ec428ee080513f059a5cab0a41174f99f0413
+  unpetrify-ref: 3.18.2
+  build-system: autotools
+  build-depends:
+  - yelp-tools
+- name: gedit
+  repo: upstream:gnome/gedit
+  ref: 4b318c265d71eca3572920bb159dcda9aa9f9184
+  unpetrify-ref: baserock/3.18.2
+  build-system: autotools
+  build-depends:
+  - gsettings-desktop-schemas
+  - gtksourceview
+  - iso-codes
+  - libpeas
+  - yelp-tools
+- name: gnome-calendar
+  repo: upstream:gnome/gnome-calendar
+  ref: 5292e9d57442067701ce94eea54b4b12d13b7aa3
+  unpetrify-ref: 3.18.1
+  build-system: autotools
+  build-depends:
+  - appstream-glib
+  - gnome-online-accounts
+  - evolution-data-server
+- name: gnome-todo
+  repo: upstream:gnome/gnome-todo
+  ref: a39ccadf8a659fca8b4503bf4844383f5346f6cb
+  unpetrify-ref: GNOME_TODO_3_18_1
+  build-system: autotools
+  build-depends:
+  - appstream-glib
+  - evolution-data-server
+  - gnome-online-accounts
+- name: empathy
+  morph: strata/gnome/empathy.morph
+  repo: upstream:gnome/empathy
+  ref: facd02a2cf3c0d2778b10626362b29e2a6df546a
+  unpetrify-ref: baserock/EMPATHY_3_12_11
+  build-depends:
+  - cheese
+  - clutter
+  - clutter-gst2
+  - clutter-gtk
+  - farstream
+  - folks
+  - gnome-online-accounts
+  - gsettings-desktop-schemas
+  - iso-codes
+  - libcanberra
+  - libchamplain
+  - libnotify
+  - telepathy-farstream
+  - telepathy-glib
+  - telepathy-logger
+  - telepathy-mission-control
+  - yelp-tools
+- name: gnome-contacts
+  repo: upstream:gnome/gnome-contacts
+  ref: 3715ec79662989038d5055bb74aa0b728b40edb5
+  unpetrify-ref: baserock/3.18.0
+  build-system: autotools
+  build-depends:
+  - cheese
+  - folks
+  - gnome-desktop
+  - gnome-online-accounts
+  - libchamplain
+  - libnotify
+  - telepathy-glib
+- name: gnome-maps
+  repo: upstream:gnome/gnome-maps
+  ref: 6d6e8afd54735e565a0c81cb761f22bb82d142db
+  unpetrify-ref: v3.18.1
+  build-system: autotools
+  build-depends:
+  - folks
+  - clutter-gtk
+  - gjs
+  - gnome-desktop
+  - gnome-online-accounts
+  - libchamplain
+  - libgfbgraph
+- name: gnome-dictionary
+  repo: upstream:gnome/gnome-dictionary
+  ref: e36fac6ee47a71c46afdd55f2110c36a22521bb6
+  unpetrify-ref: 3.18.0
+  build-system: autotools
+  build-depends:
+  - yelp-tools
+- name: eog
+  repo: upstream:gnome/eog
+  ref: d05bdd7dfbe13910f903c8678e923ff6d92cbc86
+  unpetrify-ref: 3.18.1
+  build-system: autotools
+  build-depends:
+  - gnome-desktop
+  - gsettings-desktop-schemas
+  - lcms2
+  - libpeas
+  - yelp-tools
+- name: baobab
+  repo: upstream:gnome/baobab
+  ref: 59fa8171d2dfa02be56930f451ae186680074bb6
+  unpetrify-ref: 3.18.1
+  build-system: autotools
+  build-depends:
+  - yelp-tools
+- name: gnome-font-viewer
+  repo: upstream:gnome/gnome-font-viewer
+  ref: 9af2f35a63f34f87407e784b514cafe1cc772384
+  unpetrify-ref: master
+  build-system: autotools
+  build-depends:
+  - gnome-desktop
+- name: gnome-screenshot
+  repo: upstream:gnome/gnome-screenshot
+  ref: 3a97ad23ff14a0400f12dd3fdf501d1d9dad04d4
+  unpetrify-ref: 3.18.0
+  build-system: autotools
+  build-depends:
+  - libcanberra
+- name: evolution
+  morph: strata/gnome/evolution.morph
+  repo: upstream:gnome/evolution
+  ref: 579583275620be75afdedcde909a82fd96136188
+  unpetrify-ref: EVOLUTION_3_18_3
+  build-depends:
+  - evolution-data-server
+  - clutter-gtk
+  - gnome-desktop
+  - gnome-online-accounts
+  - gsettings-desktop-schemas
+  - libcanberra
+  - libchamplain
+  - libgdata
+  - libgweather
+  - libnotify
+  - yelp-tools
diff --git a/strata/gnome/colord.morph b/strata/gnome/colord.morph
index 9a504404..d1e14454 100644
--- a/strata/gnome/colord.morph
+++ b/strata/gnome/colord.morph
@@ -3,3 +3,7 @@ kind: chunk
 build-system: autotools
 configure-commands:
 - ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc
+system-integration:
+  colord-misc:
+    00-enable-colord-unit:
+    - systemctl enable colord
diff --git a/strata/gnome/desktop-file-utils.morph b/strata/gnome/desktop-file-utils.morph
new file mode 100644
index 00000000..df34dad6
--- /dev/null
+++ b/strata/gnome/desktop-file-utils.morph
@@ -0,0 +1,7 @@
+name: desktop-file-utils
+kind: chunk
+build-system: autotools
+system-integration:
+  desktop-file-utils-misc:
+    01-update-desktop-database:
+    - update-desktop-database
diff --git a/strata/gnome/empathy.morph b/strata/gnome/empathy.morph
new file mode 100644
index 00000000..a2a0cbc0
--- /dev/null
+++ b/strata/gnome/empathy.morph
@@ -0,0 +1,5 @@
+name: empathy
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-Werror
diff --git a/strata/gnome/epiphany.morph b/strata/gnome/epiphany.morph
new file mode 100644
index 00000000..736d89e0
--- /dev/null
+++ b/strata/gnome/epiphany.morph
@@ -0,0 +1,5 @@
+name: epiphany
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var --disable-Werror
diff --git a/strata/gnome/evolution.morph b/strata/gnome/evolution.morph
new file mode 100644
index 00000000..e0d0b1f6
--- /dev/null
+++ b/strata/gnome/evolution.morph
@@ -0,0 +1,11 @@
+name: evolution
+kind: chunk
+build-system: autotools
+configure-commands:
+- |
+  ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc \
+               --disable-autoar --disable-libcryptui  --disable-pst-import --disable-gtkspell \
+               --disable-text-highlight --enable-contact-maps \
+               --enable-nss --enable-smime \
+               --with-nspr-includes=/usr/include/nspr --with-nspr-libs=/usr/lib \
+               --with-nss-includes=/usr/include/nss --with-nss-libs=/usr/lib/nss
diff --git a/strata/gnome/folks.morph b/strata/gnome/folks.morph
new file mode 100644
index 00000000..132c8f3f
--- /dev/null
+++ b/strata/gnome/folks.morph
@@ -0,0 +1,5 @@
+name: folks
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-fatal-warnings --enable-tracker-backend
diff --git a/strata/gnome/gdm.morph b/strata/gnome/gdm.morph
index 0ac70db2..73081766 100644
--- a/strata/gnome/gdm.morph
+++ b/strata/gnome/gdm.morph
@@ -19,6 +19,6 @@ system-integration:
   gdm-misc:
     00-add-gdm-user:
     - groupadd -g 21 gdm
-    - useradd -c "GDM Daemon Owner" -d /var/lib/gdm -u 21  -g gdm -s /bin/false gdm
+    - useradd -rM -c "GDM Daemon Owner" -d /var/lib/gdm -u 21  -g gdm -s /bin/false gdm
     00-enable-gdm-unit:
     - systemctl enable gdm
diff --git a/strata/gnome/glade.morph b/strata/gnome/glade.morph
new file mode 100644
index 00000000..9cc3675d
--- /dev/null
+++ b/strata/gnome/glade.morph
@@ -0,0 +1,5 @@
+name: glade
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-man-pages
diff --git a/strata/gnome/gnome-initial-setup.morph b/strata/gnome/gnome-initial-setup.morph
index 314cc409..47324950 100644
--- a/strata/gnome/gnome-initial-setup.morph
+++ b/strata/gnome/gnome-initial-setup.morph
@@ -4,6 +4,6 @@ build-system: autotools
 configure-commands:
 - ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc
 system-integration:
-  gnome-initial-set-misc:
+  gnome-initial-setup-misc:
     01-add-gnome-initial-setup-user:
-    - useradd -c "GNOME Initial Setup Owner" -g gdm -s /bin/false gnome-initial-setup
+    - useradd -rM -d /run/gnome-initial-setup/ -c "GNOME Initial Setup Owner" -s /bin/false gnome-initial-setup
diff --git a/strata/gnome/gnome-session.morph b/strata/gnome/gnome-session.morph
index 57f1a85b..e7a4a927 100644
--- a/strata/gnome/gnome-session.morph
+++ b/strata/gnome/gnome-session.morph
@@ -2,4 +2,4 @@ name: gnome-session
 kind: chunk
 build-system: autotools
 configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-man --enable-systemd
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-docbook-docs --disable-man --enable-systemd
diff --git a/strata/gnome/gnulib.morph b/strata/gnome/gnulib.morph
deleted file mode 100644
index f1837c94..00000000
--- a/strata/gnome/gnulib.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-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/gssdp.morph b/strata/gnome/gssdp.morph
new file mode 100644
index 00000000..14b810b0
--- /dev/null
+++ b/strata/gnome/gssdp.morph
@@ -0,0 +1,5 @@
+name: gssdp
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-Werror
diff --git a/strata/gnome/gtksourceview.morph b/strata/gnome/gtksourceview.morph
new file mode 100644
index 00000000..a41c5e9c
--- /dev/null
+++ b/strata/gnome/gtksourceview.morph
@@ -0,0 +1,5 @@
+name: gtksourceview
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --enable-glade-catalog --disable-Werror
diff --git a/strata/gnome/libchamplain.morph b/strata/gnome/libchamplain.morph
new file mode 100644
index 00000000..e1c902b8
--- /dev/null
+++ b/strata/gnome/libchamplain.morph
@@ -0,0 +1,5 @@
+name: libchamplain
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --enable-vala=yes
diff --git a/strata/gnome/libpeas.morph b/strata/gnome/libpeas.morph
new file mode 100644
index 00000000..d5193600
--- /dev/null
+++ b/strata/gnome/libpeas.morph
@@ -0,0 +1,5 @@
+name: libpeas
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --enable-python3
diff --git a/strata/gnome/libpurple.morph b/strata/gnome/libpurple.morph
new file mode 100644
index 00000000..9bbe089b
--- /dev/null
+++ b/strata/gnome/libpurple.morph
@@ -0,0 +1,9 @@
+name: libpurple
+kind: chunk
+build-system: autotools
+configure-commands:
+- |
+  ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc \
+               --with-gstreamer=1.0 --disable-gtkui \
+               --disable-idn --disable-meanwhile \
+               --disable-tcl
diff --git a/strata/gnome/libwnck.morph b/strata/gnome/libwnck.morph
new file mode 100644
index 00000000..bb8d7afa
--- /dev/null
+++ b/strata/gnome/libwnck.morph
@@ -0,0 +1,11 @@
+name: libwnck
+kind: chunk
+build-system: autotools
+configure-commands:
+- gdk-pixbuf-query-loaders > loader.cache
+- NOCONFIGURE=1 ./autogen.sh
+- ./configure --prefix="$PREFIX"
+build-commands:
+- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make
+install-commands:
+- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make install DESTDIR="$DESTDIR"
diff --git a/strata/gnome/raptor.morph b/strata/gnome/raptor.morph
new file mode 100644
index 00000000..fe2d1321
--- /dev/null
+++ b/strata/gnome/raptor.morph
@@ -0,0 +1,5 @@
+name: raptor
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-gtk-doc
diff --git a/strata/gnome/telepathy-gabble.morph b/strata/gnome/telepathy-gabble.morph
new file mode 100644
index 00000000..fef9b8d6
--- /dev/null
+++ b/strata/gnome/telepathy-gabble.morph
@@ -0,0 +1,8 @@
+name: telepathy-gabble
+kind: chunk
+build-system: autotools
+configure-commands:
+#
+# Tell telepathy-gabble where to load the certificate bundle from.
+#
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
diff --git a/strata/gnome/telepathy-glib.morph b/strata/gnome/telepathy-glib.morph
index 88a82c89..abb1a2a7 100644
--- a/strata/gnome/telepathy-glib.morph
+++ b/strata/gnome/telepathy-glib.morph
@@ -2,4 +2,4 @@ name: telepathy-glib
 kind: chunk
 build-system: autotools
 configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-Werror
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-Werror --enable-vala-bindings
diff --git a/strata/gnome/telepathy-salut.morph b/strata/gnome/telepathy-salut.morph
new file mode 100644
index 00000000..bdb50cbd
--- /dev/null
+++ b/strata/gnome/telepathy-salut.morph
@@ -0,0 +1,5 @@
+name: telepathy-salut
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --with-backend=avahi --disable-avahi-tests
diff --git a/strata/gnome/vte.morph b/strata/gnome/vte.morph
index d4501912..34552c20 100644
--- a/strata/gnome/vte.morph
+++ b/strata/gnome/vte.morph
@@ -2,4 +2,4 @@ name: vte
 kind: chunk
 build-system: autotools
 configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --enable-introspection=yes --without-pcre2
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --enable-introspection=yes --without-pcre2 --enable-glade-catalogue
diff --git a/strata/gnome/yelp.morph b/strata/gnome/yelp.morph
new file mode 100644
index 00000000..86434a4a
--- /dev/null
+++ b/strata/gnome/yelp.morph
@@ -0,0 +1,5 @@
+name: yelp
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-Werror
diff --git a/strata/gnome/zeitgeist.morph b/strata/gnome/zeitgeist.morph
new file mode 100644
index 00000000..ec8dc87c
--- /dev/null
+++ b/strata/gnome/zeitgeist.morph
@@ -0,0 +1,5 @@
+name: zeitgeist
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --with-session-bus-services-dir="$PREFIX"/share/dbus-1/services
diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph
index 63907275..c3848719 100644
--- a/strata/graphics-common.morph
+++ b/strata/graphics-common.morph
@@ -13,8 +13,33 @@ chunks:
   unpetrify-ref: pixman-0.32.6
 - name: freetype2
   repo: upstream:freetype2
-  ref: ec8853cd18e1a0c275372769bdad37a79550ed66
-  unpetrify-ref: VER-2-5-3
+  ref: 66cf29b1bc869b44863b0de2115bd017dfcce849
+  unpetrify-ref: VER-2-6-2
+  build-system: autotools
+- name: colm-tarball
+  repo: upstream:colm-tarball
+  ref: 404ae0f284a3b2d41fcdb53826550e4dfec5c65c
+  unpetrify-ref: colm-0.12.0
+  build-system: autotools
+- name: ragel-tarball
+  repo: upstream:ragel-tarball
+  ref: eafd7a3974e8605fd02794269db6114a3446e016
+  unpetrify-ref: ragel-6.9
+  build-system: autotools
+  build-depends:
+  - colm-tarball
+- name: harfbuzz
+  repo: upstream:harfbuzz
+  ref: 432ffc47a46d41bea17d839d0d3980e654c6e638
+  unpetrify-ref: 1.0.4
+  build-system: autotools
+  build-depends:
+  - freetype2
+  - ragel-tarball
+- name: freetype2-harfbuzz
+  repo: upstream:freetype2
+  ref: 66cf29b1bc869b44863b0de2115bd017dfcce849
+  unpetrify-ref: VER-2-6-2
   build-system: autotools
 - name: fontconfig
   morph: strata/graphics-common/fontconfig.morph
@@ -22,7 +47,7 @@ chunks:
   ref: 9260b7ec39c34ce68d74e16d47917290a8c3f35a
   unpetrify-ref: 2.11.1
   build-depends:
-  - freetype2
+  - freetype2-harfbuzz
 - name: freefont-otf
   morph: strata/graphics-common/freefont-otf.morph
   repo: upstream:freefont-otf
@@ -33,6 +58,26 @@ chunks:
   repo: upstream:ttf-alee
   ref: 97ededc81c03d0a7333a15a9a1e6acc4d0e5ac50
   unpetrify-ref: fonts-alee_13.1
+- name: chinese-fonts-truetype-bkai00mp
+  morph: strata/graphics-common/chinese-fonts-truetype-bkai00mp.morph
+  repo: upstream:chinese-fonts-truetype/bkai00mp
+  ref: aa20d88b0ae7945f0956d7d662e8e5cf1e50b53a
+  unpetrify-ref: bkai00mp.ttf
+- name: chinese-fonts-truetype-gkai00mp
+  morph: strata/graphics-common/chinese-fonts-truetype-gkai00mp.morph
+  repo: upstream:chinese-fonts-truetype/gkai00mp
+  ref: 7569dd2d8f31617a87229a4446b294a0d48055dd
+  unpetrify-ref: gkai00mp.ttf
+- name: chinese-fonts-truetype-bsmi00lp
+  morph: strata/graphics-common/chinese-fonts-truetype-bsmi00lp.morph
+  repo: upstream:chinese-fonts-truetype/bsmi00lp
+  ref: 8f1febdd4f74d56670777c8a5fc25dc6d8cf972c
+  unpetrify-ref: bsmi00lp.ttf
+- name: chinese-fonts-truetype-gbsn00lp
+  morph: strata/graphics-common/chinese-fonts-truetype-gbsn00lp.morph
+  repo: upstream:chinese-fonts-truetype/gbsn00lp
+  ref: be390396044728b4b535a067e3a0dca7daa0b8b6
+  unpetrify-ref: gbsn00lp.ttf
 - name: libpng
   repo: upstream:libpng
   ref: 88dd30b232362b65cca374dda39096888163dd6b
@@ -55,29 +100,9 @@ chunks:
   unpetrify-ref: 1.14.0
   build-depends:
   - fontconfig
-  - freetype2
+  - freetype2-harfbuzz
   - pixman
   - libpng
-- name: colm-tarball
-  repo: upstream:colm-tarball
-  ref: 404ae0f284a3b2d41fcdb53826550e4dfec5c65c
-  unpetrify-ref: colm-0.12.0
-  build-system: autotools
-- name: ragel-tarball
-  repo: upstream:ragel-tarball
-  ref: eafd7a3974e8605fd02794269db6114a3446e016
-  unpetrify-ref: ragel-6.9
-  build-system: autotools
-  build-depends:
-  - colm-tarball
-- name: harfbuzz
-  repo: upstream:harfbuzz
-  ref: 432ffc47a46d41bea17d839d0d3980e654c6e638
-  unpetrify-ref: 1.0.4
-  build-system: autotools
-  build-depends:
-  - freetype2
-  - ragel-tarball
 - name: libwebp
   repo: upstream:libwebp
   ref: fcd94e925a9377cccfcf9de6db278126a52b97a4
diff --git a/strata/graphics-common/chinese-fonts-truetype-bkai00mp.morph b/strata/graphics-common/chinese-fonts-truetype-bkai00mp.morph
new file mode 100644
index 00000000..8dcde50f
--- /dev/null
+++ b/strata/graphics-common/chinese-fonts-truetype-bkai00mp.morph
@@ -0,0 +1,5 @@
+name: chinese-fonts-truetype-bkai00mp
+kind: chunk
+install-commands:
+- mkdir -p "$DESTDIR"/usr/share/fonts/truetype/chinese
+- install -p *.ttf "$DESTDIR"/usr/share/fonts/truetype/chinese
diff --git a/strata/graphics-common/chinese-fonts-truetype-bsmi00lp.morph b/strata/graphics-common/chinese-fonts-truetype-bsmi00lp.morph
new file mode 100644
index 00000000..8e0c060d
--- /dev/null
+++ b/strata/graphics-common/chinese-fonts-truetype-bsmi00lp.morph
@@ -0,0 +1,5 @@
+name: chinese-fonts-truetype-bsmi00lp
+kind: chunk
+install-commands:
+- mkdir -p "$DESTDIR"/usr/share/fonts/truetype/chinese
+- install -p *.ttf "$DESTDIR"/usr/share/fonts/truetype/chinese
diff --git a/strata/graphics-common/chinese-fonts-truetype-gbsn00lp.morph b/strata/graphics-common/chinese-fonts-truetype-gbsn00lp.morph
new file mode 100644
index 00000000..f1a0d15f
--- /dev/null
+++ b/strata/graphics-common/chinese-fonts-truetype-gbsn00lp.morph
@@ -0,0 +1,5 @@
+name: chinese-fonts-truetype-gbsn00lp
+kind: chunk
+install-commands:
+- mkdir -p "$DESTDIR"/usr/share/fonts/truetype/chinese
+- install -p *.ttf "$DESTDIR"/usr/share/fonts/truetype/chinese
diff --git a/strata/graphics-common/chinese-fonts-truetype-gkai00mp.morph b/strata/graphics-common/chinese-fonts-truetype-gkai00mp.morph
new file mode 100644
index 00000000..c08e0736
--- /dev/null
+++ b/strata/graphics-common/chinese-fonts-truetype-gkai00mp.morph
@@ -0,0 +1,5 @@
+name: chinese-fonts-truetype-gkai00mp
+kind: chunk
+install-commands:
+- mkdir -p "$DESTDIR"/usr/share/fonts/truetype/chinese
+- install -p *.ttf "$DESTDIR"/usr/share/fonts/truetype/chinese
diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph
index 0ebd5d02..e77d2a7b 100644
--- a/strata/gtk-deps.morph
+++ b/strata/gtk-deps.morph
@@ -42,7 +42,7 @@ chunks:
 - name: libcroco
   repo: upstream:libcroco
   ref: 9207f349d1c97618ab38e6b095207bbd8184d844
-  unpetrify-ref: 0.6.8-30-g9207f34
+  unpetrify-ref: baserock/0.6.8-30-g9207f34
   build-system: autotools
 - name: librsvg
   repo: upstream:librsvg
diff --git a/strata/gtk-deps/shared-mime-info.morph b/strata/gtk-deps/shared-mime-info.morph
index e155fde0..02ae5555 100644
--- a/strata/gtk-deps/shared-mime-info.morph
+++ b/strata/gtk-deps/shared-mime-info.morph
@@ -2,3 +2,7 @@ name: shared-mime-info
 kind: chunk
 max-jobs: 1
 build-system: autotools
+system-integration:
+  shared-mime-info-misc:
+    00-update-mime-database:
+    - update-mime-database /usr/share/mime
diff --git a/strata/icu-common/icu.morph b/strata/icu-common/icu.morph
index 42a7bc58..5c269ee0 100644
--- a/strata/icu-common/icu.morph
+++ b/strata/icu-common/icu.morph
@@ -4,8 +4,7 @@ configure-commands:
 - |
   # As per commit 8874a7c7, We issue this sed command when
   # building ICU libraries on arm architectures.
-  cpu=$(echo $TARGET | cut -d '-' -f 1)
-  case "$cpu" in
+  case "$MORPH_ARCH" in
   *arm*)
     sed -e 's/LDFLAGSICUDT/#LDFLAGSICUDT/' -i source/config/mh-linux
     ;;
diff --git a/strata/input-common.morph b/strata/input-common.morph
index 9e484c63..b8f49eea 100644
--- a/strata/input-common.morph
+++ b/strata/input-common.morph
@@ -22,8 +22,8 @@ chunks:
   build-system: autotools
 - name: libinput
   repo: upstream:libinput
-  ref: a52cc616b4c00d0975a3311a2a06057bdb419ba2
-  unpetrify-ref: 1.0.1
+  ref: a340736e9b9399f630ff4b436930c1dee26cb803
+  unpetrify-ref: 1.1.4
   build-system: autotools
   build-depends:
   - mtdev
diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph
index d4da4408..e565617f 100644
--- a/strata/libdrm-common.morph
+++ b/strata/libdrm-common.morph
@@ -11,7 +11,7 @@ chunks:
 - name: drm
   repo: upstream:drm
   morph: strata/libdrm-common/drm.morph
-  ref: ab2fadabde3829b1ec56bd4756165dd9bd281488
-  unpetrify-ref: libdrm-2.4.64
+  ref: b38a4b2326c1be5702f5cb73a53c0ed74c12d510
+  unpetrify-ref: libdrm-2.4.66
   build-depends:
   - xorg-lib-libpciaccess
diff --git a/strata/libdrm-common/drm.morph b/strata/libdrm-common/drm.morph
index fd995148..e6b8ed28 100644
--- a/strata/libdrm-common/drm.morph
+++ b/strata/libdrm-common/drm.morph
@@ -4,4 +4,4 @@ build-system: autotools
 configure-commands:
 - |
   ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc \
-               --enable-tegra-experimental-api
+               --enable-tegra-experimental-api --enable-udev
diff --git a/strata/llvm-common.morph b/strata/llvm-common.morph
index b12f4307..794a7fc5 100644
--- a/strata/llvm-common.morph
+++ b/strata/llvm-common.morph
@@ -6,5 +6,5 @@ chunks:
 - name: llvm
   morph: strata/llvm-common/llvm.morph
   repo: upstream:llvm
-  ref: 0776facd2ee120ca6286cb2109356e05e4085bfc
-  unpetrify-ref: release_37
+  ref: 19ade095e8c3ea61f84b71074433309f0c7c7b3b
+  unpetrify-ref: release_36
diff --git a/strata/llvm-common/llvm.morph b/strata/llvm-common/llvm.morph
index 0d4f07c4..de274476 100644
--- a/strata/llvm-common/llvm.morph
+++ b/strata/llvm-common/llvm.morph
@@ -1,11 +1,7 @@
 name: llvm
-description: Low Level Virtual Machine
 kind: chunk
-build-system: cmake
+description: Low Level Virtual Machine
+build-system: autotools
 configure-commands:
-- mkdir o
-- cd o && cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_BUILD_TYPE=Release  ..
-build-commands:
-- cd o && make
-install-commands:
-- cd o && make DESTDIR="$DESTDIR" install
+- ./configure --prefix="$PREFIX" --sysconfdir=/etc --enable-shared --enable-targets=host
+  --enable-optimized --disable-assertions
diff --git a/strata/lorry.morph b/strata/lorry.morph
index c40ce664..44005c48 100644
--- a/strata/lorry.morph
+++ b/strata/lorry.morph
@@ -110,7 +110,7 @@ chunks:
 - name: lorry
   morph: strata/lorry/lorry.morph
   repo: baserock:baserock/lorry
-  ref: 37ebbacd09145fa6bbaf54dac2a211a5d83f01a5
+  ref: d64da0cb16679f0791077ff5e1f9d03fa16a745f
   unpetrify-ref: master
   build-depends:
   - bzr-tarball
diff --git a/strata/lua.morph b/strata/lua51.morph
index dcdd8801..b386fba8 100644
--- a/strata/lua.morph
+++ b/strata/lua51.morph
@@ -1,16 +1,16 @@
-name: lua
+name: lua51
 kind: stratum
 description: Interpreter for the lua scripting language.
 build-depends:
 - morph: strata/tools.morph
 chunks:
-- name: lua
-  morph: strata/lua/lua.morph
+- name: lua51
+  morph: strata/lua51/lua51.morph
   repo: upstream:lua
   ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642
   unpetrify-ref: baserock/5.1-morph
 - name: luajit2
-  morph: strata/lua/luajit2.morph
+  morph: strata/lua51/luajit2.morph
   repo: upstream:luajit2
   ref: 880ca300e8fb7b432b9d25ed377db2102e4cb63d
   unpetrify-ref: v2.0.3
diff --git a/strata/lua/lua.morph b/strata/lua51/lua51.morph
index 32aeb5c1..32aeb5c1 100644
--- a/strata/lua/lua.morph
+++ b/strata/lua51/lua51.morph
diff --git a/strata/lua/luajit2.morph b/strata/lua51/luajit2.morph
index 72f34f02..72f34f02 100644
--- a/strata/lua/luajit2.morph
+++ b/strata/lua51/luajit2.morph
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
index 3e701157..e15d4d23 100644
--- a/strata/mesa-common.morph
+++ b/strata/mesa-common.morph
@@ -11,8 +11,8 @@ chunks:
 - name: mesa
   morph: strata/mesa-common/mesa.morph
   repo: upstream:mesa
-  ref: 4f1e500150be2e82a2d7eb954f7198cc0c5cbec1
-  unpetrify-ref: mesa-11.0.0
+  ref: 5a616125acf0ac043d2d44b7a8e804739d55014e
+  unpetrify-ref: mesa-11.1.0
 - name: libepoxy
   repo: upstream:libepoxy
   ref: e2c33af5bfcfc9d168f9e776156dd47c33f428b3
diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph
index b9268a64..ebcf0a78 100644
--- a/strata/mesa-common/mesa.morph
+++ b/strata/mesa-common/mesa.morph
@@ -11,12 +11,11 @@ configure-commands:
     ;;
   *)
     DRIDRIVERS=yes
-    GALLIUMDRIVERS=yes
+    GALLIUMDRIVERS=r300,r600,svga,swrast,virgl
     ;;
   esac
   ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc \
       --enable-gles2 \
       --with-egl-platforms=drm,wayland,x11 \
       --with-gallium-drivers="$GALLIUMDRIVERS" \
-      --with-dri-drivers="$DRIDRIVERS" \
-      --disable-llvm-shared-libs
+      --with-dri-drivers="$DRIDRIVERS"
diff --git a/strata/mesa-demos-common.morph b/strata/mesa-demos-common.morph
new file mode 100644
index 00000000..eb20c822
--- /dev/null
+++ b/strata/mesa-demos-common.morph
@@ -0,0 +1,37 @@
+name: mesa-demos-common
+kind: stratum
+build-depends:
+- morph: strata/mesa-common.morph
+chunks:
+- name: xorg-util-makedepend
+  repo: upstream:xorg-util-makedepend
+  ref: 30859adfd6a6523a92a637ca26bd61ce59680a1b
+  unpetrify-ref: makedepend-1.0.5
+  build-system: autotools
+- name: glu
+  repo: upstream:glu
+  ref: 069211570c32a8d5848e127975a2943e9d8fc6b9
+  unpetrify-ref: glu-9.0.0-2-g0692115
+  build-system: autotools
+- name: glut
+  repo: upstream:glut
+  ref: ee89e9aeb49604b036e06f1df6478d32006b30cd
+  unpetrify-ref: master
+  build-system: autotools
+  build-depends:
+  - glu
+  - xorg-util-makedepend
+- name: glew
+  morph: strata/mesa-demos-common/glew.morph
+  repo: upstream:glew-tarball
+  ref: 706e5d657396530bbd3d91a4e03b5f6b4cb6fa6f
+  unpetrify-ref: glew-1.13.0
+- name: mesa-demos
+  build-system: autotools
+  repo: upstream:mesa-demos
+  ref: 887e30bd1cc727150dc29556f228a94ef42dc33c
+  unpetrify-ref: mesa-demos-8.3.0
+  build-depends:
+  - glu
+  - glew
+  - glut
diff --git a/strata/mesa-demos-common/glew.morph b/strata/mesa-demos-common/glew.morph
new file mode 100644
index 00000000..202e00a2
--- /dev/null
+++ b/strata/mesa-demos-common/glew.morph
@@ -0,0 +1,6 @@
+name: glew
+kind: chunk
+build-system: manual
+install-commands:
+- make LIBDIR="/usr/lib"
+- make LIBDIR="/usr/lib" DESTDIR="$DESTDIR" install
diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph
index 7acc186a..25983404 100644
--- a/strata/morph-utils.morph
+++ b/strata/morph-utils.morph
@@ -37,7 +37,7 @@ chunks:
   build-system: python-distutils
 - name: morph
   repo: baserock:baserock/morph
-  ref: fad8048de66fe6aeaa0478864914bb773f51ed3e
+  ref: 535443bcfa78568ecdd091a57e4aff64bfbf9638
   unpetrify-ref: master
   build-system: python-distutils
   build-depends:
diff --git a/strata/multimedia-common.morph b/strata/multimedia-common.morph
index 94278bc8..8ec5817e 100644
--- a/strata/multimedia-common.morph
+++ b/strata/multimedia-common.morph
@@ -4,6 +4,11 @@ description: Mutimedia Libraries
 build-depends:
 - morph: strata/core.morph
 chunks:
+- name: opus
+  repo: upstream:opus
+  ref: 655cc54c564b84ef2827f0b2152ce3811046201e
+  unpetrify-ref: v1.1.2
+  build-system: autotools
 - name: ogg
   repo: upstream:ogg-git
   ref: 9b2ba419aecb4a1c97114545d57174593dc13111
@@ -35,3 +40,20 @@ chunks:
   repo: upstream:libmad-tarball
   ref: f2b21c41aef22e81b605afe96e1e6ef1bea0cfdc
   unpetrify-ref: baserock/0.15.1b-gstreamer-sdk-fork
+- name: yasm
+  morph: strata/multimedia-common/yasm.morph
+  repo: upstream:yasm
+  ref: fefefe262eb29081f0bcb4d48f2d476ce5730562
+  unpetrify-ref: baserock/morph
+- name: libvpx
+  morph: strata/multimedia-common/libvpx.morph
+  repo: upstream:libvpx
+  ref: cbecf57f3e0d85a7b7f97f3ab7c507f6fe640a93
+  unpetrify-ref: v1.5.0
+  build-depends:
+  - yasm
+- name: libmpeg2
+  morph: strata/multimedia-common/libmpeg2.morph
+  repo: upstream:libmpeg2-tarball
+  ref: d1e80dc431815df3ac6eeed654eeccaf8d6beea7
+  unpetrify-ref: libmpeg2-0.5.1
diff --git a/strata/multimedia-common/libmpeg2.morph b/strata/multimedia-common/libmpeg2.morph
new file mode 100644
index 00000000..6e55e59f
--- /dev/null
+++ b/strata/multimedia-common/libmpeg2.morph
@@ -0,0 +1,6 @@
+name: libmpeg2
+kind: chunk
+build-system: autotools
+configure-commands:
+# Explicitly just configure, avoid running the boostrap.sh script
+- ./configure --prefix="$PREFIX"
diff --git a/strata/multimedia-common/libvpx.morph b/strata/multimedia-common/libvpx.morph
new file mode 100644
index 00000000..011642f4
--- /dev/null
+++ b/strata/multimedia-common/libvpx.morph
@@ -0,0 +1,14 @@
+name: libvpx
+kind: chunk
+build-system: autotools
+configure-commands:
+# Workarond upstream bug: https://bugs.chromium.org/p/webm/issues/detail?id=1121
+- |
+  case "$MORPH_ARCH" in
+  armv7lhf)
+    CROSS=" " ./configure --prefix="$PREFIX" --target=armv7-linux-gcc
+    ;;
+  *)
+    ./configure --prefix="$PREFIX"
+    ;;
+  esac
diff --git a/strata/multimedia-common/yasm.morph b/strata/multimedia-common/yasm.morph
new file mode 100644
index 00000000..437ae97d
--- /dev/null
+++ b/strata/multimedia-common/yasm.morph
@@ -0,0 +1,4 @@
+name: yasm
+kind: chunk
+max-jobs: 1
+build-system: autotools
diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph
index 497b293b..0cef379e 100644
--- a/strata/multimedia-gstreamer.morph
+++ b/strata/multimedia-gstreamer.morph
@@ -6,30 +6,32 @@ build-depends:
 - morph: strata/libsoup-common.morph
 - morph: strata/multimedia-common.morph
 - morph: strata/mesa-common.morph
+- morph: strata/graphics-common.morph
 chunks:
 - name: orc
+  morph: strata/multimedia-gstreamer/orc.morph
   repo: upstream:orc
-  ref: 16e053b8f2359196fd50b111f1c10b93590f5cb9
-  unpetrify-ref: orc-0.4.22
-  build-system: autotools
+  ref: 1a3af3cb4daeb6802197a7854507d6ee8bc9a06b
+  unpetrify-ref: orc-0.4.24
 - name: gstreamer
   repo: upstream:gstreamer
-  ref: c61dea148ca3f14586d8eddf0b7e6ca47c164c86
-  unpetrify-ref: baserock/1.4.4+bison_fix
+  ref: 3119e6bb4b574a01921da2e652d2910d98a6eb27
+  unpetrify-ref: baserock/1.6.3
   build-system: autotools
   build-depends:
   - orc
 - name: gstreamer-plugins-base
   repo: upstream:gstreamer-plugins-base
-  ref: 3b38ad94a2d58c07c24e4647e08afa1fe4dd7d46
-  unpetrify-ref: baserock/1.4
+  ref: 644cd58c5a1142580ad133a5122986581cf4d8ef
+  unpetrify-ref: baserock/1.6.3
   build-system: autotools
   build-depends:
   - gstreamer
+  - orc
 - name: gstreamer-plugins-good
   repo: upstream:gstreamer-plugins-good
-  ref: 9d48c2f7a7b63fd967de7eec72434bc876c02667
-  unpetrify-ref: baserock/1.4
+  ref: e6fb1b485dd2726e6c65d938c5ea4d002cf1036e
+  unpetrify-ref: baserock/1.6.3
   build-system: autotools
   build-depends:
   - gstreamer
@@ -37,10 +39,19 @@ chunks:
   - orc
 - name: gstreamer-plugins-bad
   repo: upstream:gstreamer-plugins-bad
-  ref: bb2a4669ff57af90c8101c54744d3228aa060475
-  unpetrify-ref: baserock/1.4
+  ref: 9a2e845040c3aafff00159a6b0031e123cad4b2f
+  unpetrify-ref: baserock/1.6.3
   build-system: autotools
   build-depends:
   - gstreamer
   - gstreamer-plugins-base
   - orc
+- name: gst-libav
+  morph: strata/multimedia-gstreamer/gst-libav.morph
+  repo: upstream:gst-libav
+  ref: ac8afa33d47e10246d9b7329f39dc53b4bd4711e
+  unpetrify-ref: baserock/1.6.3
+  build-depends:
+  - gstreamer
+  - gstreamer-plugins-base
+  - orc
diff --git a/strata/multimedia-gstreamer/gst-libav.morph b/strata/multimedia-gstreamer/gst-libav.morph
new file mode 100644
index 00000000..2d9c49ad
--- /dev/null
+++ b/strata/multimedia-gstreamer/gst-libav.morph
@@ -0,0 +1,5 @@
+name: gst-libav
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-gtk-doc
diff --git a/strata/multimedia-gstreamer/orc.morph b/strata/multimedia-gstreamer/orc.morph
new file mode 100644
index 00000000..97a5da9d
--- /dev/null
+++ b/strata/multimedia-gstreamer/orc.morph
@@ -0,0 +1,5 @@
+name: orc
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-gtk-doc
diff --git a/strata/multimedia-hardware-codecs-x86.morph b/strata/multimedia-hardware-codecs-x86.morph
new file mode 100644
index 00000000..421d55e5
--- /dev/null
+++ b/strata/multimedia-hardware-codecs-x86.morph
@@ -0,0 +1,28 @@
+name: multimedia-hardware-codecs-x86
+kind: stratum
+description: Hardware accelerated codecs for x86
+build-depends:
+- morph: strata/multimedia-gstreamer.morph
+- morph: strata/libdrm-common.morph
+- morph: strata/wayland-generic.morph
+- morph: strata/x-common.morph
+chunks:
+- name: libva
+  repo: upstream:libva
+  ref: 304bc13e244f9d5e185a0d8a87fcf3a3eb5a8bd8
+  unpetrify-ref: libva-1.6.2
+  build-system: autotools
+- name: libva-intel-driver
+  repo: upstream:libva-intel-driver
+  ref: 683edeedfdfd769807c18ed3797223f82b7aa0cc
+  unpetrify-ref: 1.6.2
+  build-system: autotools
+  build-depends:
+  - libva
+- name: gstreamer-vaapi
+  repo: upstream:gstreamer-vaapi
+  ref: a5842bbcfae873306f52c60386ea06357a4cb9d0
+  unpetrify-ref: baserock/1.6.0
+  build-system: autotools
+  build-depends:
+  - libva
diff --git a/strata/network-security.morph b/strata/network-security.morph
index d88d2f43..caf4a08b 100644
--- a/strata/network-security.morph
+++ b/strata/network-security.morph
@@ -1,18 +1,44 @@
 name: network-security
 kind: stratum
+description: This stratum provides SSL/TLS libraries
 build-depends:
 - morph: strata/core.morph
 chunks:
 - name: nspr
   morph: strata/network-security/nspr.morph
   repo: upstream:nspr-hg
-  ref: a6ee84946475c1fb7624973af28163f6da247c0d
-  unpetrify-ref: baserock/morph
+  ref: d5e4e1031a39521a4db108e6c823dc295c40aeed
+  unpetrify-ref: NSPR_4_11_RTM
 - name: nss
   morph: strata/network-security/nss.morph
   repo: upstream:nss
-  ref: ee1c99a3c8c29f50a91ab28f2f7b7773f6355487
-  unpetrify-ref: baserock/morph
+  ref: 8810dc4b4b559efec957bdab67decbc701cba7a1
+  unpetrify-ref: baserock/nss-3.21
   build-depends:
   - nspr
-
+- name: libtasn1
+  repo: upstream:libtasn1
+  ref: 7f3a9c2294cdebd9e63fe007150c181b980865ef
+  unpetrify-ref: baserock/gnome
+  build-system: autotools
+- name: p11-kit
+  morph: strata/network-security/p11-kit.morph
+  repo: upstream:p11-kit
+  ref: ec9e2450bafa1cda47525b38a28c8f981f43c1e1
+  unpetrify-ref: 0.23.1
+  build-depends:
+  - libtasn1
+- name: nettle
+  morph: strata/network-security/nettle.morph
+  repo: upstream:nettle
+  ref: 549e2853d6f3fa9cefb099970209c7f5bf5673b7
+  unpetrify-ref: nettle_3.1.1_release_20150424
+- name: gnutls
+  morph: strata/network-security/gnutls.morph
+  repo: upstream:gnutls
+  ref: 21fecbde80ae824f85a10a0c23a327c49e4e5fb6
+  unpetrify-ref: baserock/gnutls_3_4_6
+  build-depends:
+  - nettle
+  - libtasn1
+  - p11-kit
diff --git a/strata/gnome/gnutls.morph b/strata/network-security/gnutls.morph
index f31cbf12..f31cbf12 100644
--- a/strata/gnome/gnutls.morph
+++ b/strata/network-security/gnutls.morph
diff --git a/strata/gnome/nettle.morph b/strata/network-security/nettle.morph
index 80bdbf51..80bdbf51 100644
--- a/strata/gnome/nettle.morph
+++ b/strata/network-security/nettle.morph
diff --git a/strata/network-security/nss.morph b/strata/network-security/nss.morph
index bc50df8c..2103622c 100644
--- a/strata/network-security/nss.morph
+++ b/strata/network-security/nss.morph
@@ -1,7 +1,32 @@
 name: nss
 kind: chunk
 max-jobs: 1
-build-system: autotools
-configure-commands:
-- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --sysconfdir=/etc --libdir="$PREFIX/lib"
+build-system: manual
+build-commands:
+- |
+  case "$MORPH_ARCH" in
+      x86_64|ppc64)
+          export USE_64=1;;
+      *)
+          ;;
+  esac
+  cd nss
+  make BUILD_OPT=1                    \
+  NSPR_INCLUDE_DIR=/usr/include/nspr  \
+  USE_SYSTEM_ZLIB=1                   \
+  ZLIB_LIBS=-lz                       \
+  NSS_USE_SYSTEM_SQLITE=1
+install-commands:
+- install -d                                         "$DESTDIR"/usr/lib/pkgconfig
+- install -v -m755 dist/Linux*/lib/*.so              "$DESTDIR"/usr/lib
+- install -v -m644 dist/Linux*/lib/*.chk             "$DESTDIR"/usr/lib
+- install -v -m644 dist/Linux*/lib/libcrmf.a         "$DESTDIR"/usr/lib
+- install -v -m755 -d                                "$DESTDIR"/usr/include/nss
+- cp -v -RL dist/public/nss/*                        "$DESTDIR"/usr/include/nss
+- cp -v -RL dist/private/nss/*                       "$DESTDIR"/usr/include/nss
+- chmod -v 644                                       "$DESTDIR"/usr/include/nss/*
+- install -d                                         "$DESTDIR"/usr/bin
+- install -v -m755 dist/Linux*/bin/certutil          "$DESTDIR"/usr/bin
+- install -v -m755 dist/Linux*/bin/nss-config        "$DESTDIR"/usr/bin
+- install -v -m755 dist/Linux*/bin/pk12util          "$DESTDIR"/usr/bin
+- install -v -m644 dist/Linux*/lib/pkgconfig/nss.pc  "$DESTDIR"/usr/lib/pkgconfig
diff --git a/strata/gnome/p11-kit.morph b/strata/network-security/p11-kit.morph
index 8f88969a..8f88969a 100644
--- a/strata/gnome/p11-kit.morph
+++ b/strata/network-security/p11-kit.morph
diff --git a/strata/nodejs.morph b/strata/nodejs.morph
index 6d94abe2..d7aa4ef1 100644
--- a/strata/nodejs.morph
+++ b/strata/nodejs.morph
@@ -6,7 +6,7 @@ build-depends:
 - morph: strata/python2-core.morph
 chunks:
 - name: node
+  morph: strata/nodejs/node.morph
   repo: upstream:node
   ref: cc56c62ed879ad4f93b1fdab3235c43e60f48b7e
   unpetrify-ref: v0.10.26
-  build-system: autotools
diff --git a/strata/nodejs/node.morph b/strata/nodejs/node.morph
new file mode 100644
index 00000000..be86ed86
--- /dev/null
+++ b/strata/nodejs/node.morph
@@ -0,0 +1,9 @@
+name: node
+kind: chunk
+build-system: manual
+configure-commands:
+- ./configure --prefix="$PREFIX"
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index 518e8d60..0b8e7aca 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -13,7 +13,7 @@ chunks:
   morph: strata/openstack-services/erlang-sd_notify.morph
   repo: upstream:erlang-modules/erlang-sd_notify
   ref: 99f4689c2c18570680329f822591f95f9341ca10
-  unpretrify-ref: 0.1
+  unpetrify-ref: 0.1
 - name: rabbitmq-codegen
   morph: strata/openstack-services/rabbitmq-codegen.morph
   ref: 4dc5ccde2a0b3d638e5754b00abf94196fe9ca32
diff --git a/strata/perl-common.morph b/strata/perl-common.morph
new file mode 100644
index 00000000..2947f053
--- /dev/null
+++ b/strata/perl-common.morph
@@ -0,0 +1,388 @@
+name: perl-common
+kind: stratum
+description: Common perl dependencies
+build-depends:
+- morph: strata/core.morph
+chunks:
+- name: Try-Tiny
+  repo: upstream:cpan/Try-Tiny-tarball
+  ref: b0ac2743153dd707789f7541af790f5a53843a36
+  unpetrify-ref: Try-Tiny-0.22
+  build-system: cpan
+- name: Log-Log4perl
+  repo: upstream:cpan/Log-Log4perl-tarball
+  ref: 94566f012421026c8311552f99175a5989eba063
+  unpetrify-ref: master
+  build-system: cpan
+- name: Module-Build
+  repo: upstream:cpan/Module-Build-tarball
+  ref: 467298a34215401cdcbb1dded51bc2aba5f1f41c
+  unpetrify-ref: Module-Build-0.4214
+  build-system: cpan
+- name: Devel-StackTrace
+  repo: upstream:cpan/Devel-StackTrace-tarball
+  ref: 22d921a6e9c4fc98cda05e898a8137c7e8dae970
+  unpetrify-ref: Devel-StackTrace-2.00
+  build-system: cpan
+- name: Exporter-Tiny
+  repo: upstream:cpan/Exporter-Tiny-tarball
+  ref: a3341f774a4aa00765970301e259be818929a7cf
+  unpetrify-ref: Exporter-Tiny-0.042
+  build-system: cpan
+- name: ExtUtils-Config
+  repo: upstream:cpan/ExtUtils-Config-tarball
+  ref: c8d851569c1b88d5431700809fe520cbca5023a8
+  unpetrify-ref: ExtUtils-Config-0.008
+  build-system: cpan
+- name: ExtUtils-Helpers
+  repo: upstream:cpan/ExtUtils-Helpers-tarball
+  ref: 13016fa7011fc3084536c7b3181d75acb43d3aae
+  unpetrify-ref: ExtUtils-Helpers-0.022
+  build-system: cpan
+- name: ExtUtils-InstallPaths
+  repo: upstream:cpan/ExtUtils-InstallPaths-tarball
+  ref: 2f62d65d28afdbbd6a417f8e3da3ac6143863ef8
+  unpetrify-ref: ExtUtils-InstallPaths-0.011
+  build-system: cpan
+  build-depends:
+  - ExtUtils-Config
+- name: List-MoreUtils
+  morph: strata/perl-common/List-MoreUtils.morph
+  repo: upstream:cpan/List-MoreUtils-tarball
+  ref: 7f3c4eb624730bcc71e75500f295d193b9375fbc
+  unpetrify-ref: List-MoreUtils-0.413
+  build-depends:
+  - Exporter-Tiny
+- name: MRO-Compat
+  repo: upstream:cpan/MRO-Compat-tarball
+  ref: 47420dfff2810300d68ea846502dbc4f85d34186
+  unpetrify-ref: MRO-Compat-0.12
+  build-system: cpan
+- name: Module-Build-Tiny
+  repo: upstream:cpan/Module-Build-Tiny-tarball
+  ref: 289b859a41b598e5ae4261b978402f3019fd9042
+  unpetrify-ref: Module-Build-Tiny-0.039
+  build-system: module-build
+  build-depends:
+  - ExtUtils-Helpers
+  - ExtUtils-Config
+  - ExtUtils-InstallPaths
+- name: Module-Runtime
+  repo: upstream:cpan/Module-Runtime-tarball
+  ref: 3621e4956cb037811317b0195d3248108c6658c3
+  unpetrify-ref: Module-Runtime-0.014
+  build-system: cpan
+  build-depends:
+  - Module-Build
+- name: Dist-CheckConflicts
+  repo: upstream:cpan/Dist-CheckConflicts-tarball
+  ref: dfaae12e4d85f7c6821ae4a9fbf7e463d570e7ba
+  unpetrify-ref: Dist-CheckConflicts-0.11
+  build-system: cpan
+  build-depends:
+  - Module-Build
+  - Module-Runtime
+- name: Module-Runtime-Conflicts
+  repo: upstream:cpan/Module-Runtime-Conflicts-tarball
+  ref: ab45179756d9ce7e63c894d52b2e34cafc10bf6a
+  unpetrify-ref: Module-Runtime-Conflicts-0.002
+  build-system: cpan
+  build-depends:
+  - Module-Build-Tiny
+  - ExtUtils-Config
+  - Module-Runtime
+  - ExtUtils-InstallPaths
+  - Module-Build
+  - ExtUtils-Helpers
+  - Dist-CheckConflicts
+- name: Package-Stash-XS
+  repo: upstream:cpan/Package-Stash-XS-tarball
+  ref: fff2e7a8ec398e4c5229fb61b1107cffda28aabd
+  unpetrify-ref: Package-Stash-XS-0.28
+  build-system: cpan
+- name: Params-Util
+  repo: upstream:cpan/Params-Util-tarball
+  ref: d8180ea7d4a24afe7b38df93513d224b90d4945f
+  unpetrify-ref: Params-Util-1.07
+  build-system: cpan
+- name: Sub-Exporter-Progressive
+  repo: upstream:cpan/Sub-Exporter-Progressive-tarball
+  ref: 1f3ec55911f841590a62ed06becc2bd9131a5fc4
+  unpetrify-ref: Sub-Exporter-Progressive-0.001011
+  build-system: cpan
+- name: Devel-GlobalDestruction
+  repo: upstream:cpan/Devel-GlobalDestruction-tarball
+  ref: 325e62ad0c0a3e34804212983fe22999b7d1f3bb
+  unpetrify-ref: Devel-GlobalDestruction-0.13
+  build-system: cpan
+  build-depends:
+  - Sub-Exporter-Progressive
+- name: Sub-Identify
+  repo: upstream:cpan/Sub-Identify-tarball
+  ref: bfaf3f426163c10c631d03bf2ce03fb34e74fdd9
+  unpetrify-ref: Sub-Identify-0.10
+  build-system: cpan
+- name: Sub-Install
+  repo: upstream:cpan/Sub-Install-tarball
+  ref: cf0894e4fcf980767c57734e9a3ddad3c35da7d2
+  unpetrify-ref: Sub-Install-0.928
+  build-system: cpan
+- name: Data-OptList
+  repo: upstream:cpan/Data-OptList-tarball
+  ref: aa2ab3d34edbee7e4fc832394136391fd5f87702
+  unpetrify-ref: Data-OptList-0.109
+  build-system: cpan
+  build-depends:
+  - Sub-Install
+  - Params-Util
+- name: Sub-Exporter
+  repo: upstream:cpan/Sub-Exporter-tarball
+  ref: 641cf398662e09a9660e5b4187f8691a3205a3db
+  unpetrify-ref: Sub-Exporter-0.987
+  build-system: cpan
+  build-depends:
+  - Data-OptList
+  - Sub-Install
+  - Params-Util
+- name: Package-DeprecationManager
+  repo: upstream:cpan/Package-DeprecationManager-tarball
+  ref: b05516a95f58a288b856d79e7d5be86c46a98110
+  unpetrify-ref: Package-DeprecationManager-0.14
+  build-system: cpan
+  build-depends:
+  - Sub-Install
+  - Params-Util
+- name: Sub-Name
+  repo: upstream:cpan/Sub-Name-tarball
+  ref: 5b19971882c74b097f4a052852a67ee81cb2bb5a
+  unpetrify-ref: Sub-Name-0.14
+  build-system: cpan
+- name: Task-Weaken
+  repo: upstream:cpan/Task-Weaken-tarball
+  ref: 75c7d27b13860660f80913cc8cd46c6c8edf5071
+  unpetrify-ref: Task-Weaken-1.04
+  build-system: cpan
+- name: Eval-Closure
+  repo: upstream:cpan/Eval-Closure-tarball
+  ref: cf3c05406f7cde406764915682e4bf5db73b1bdd
+  unpetrify-ref: Eval-Closure-0.13
+  build-system: cpan
+  build-depends:
+  - Try-Tiny
+- name: Module-Implementation
+  repo: upstream:cpan/Module-Implementation-tarball
+  ref: b808141b894ad538db75a7067e0199cbfe6337a9
+  unpetrify-ref: Module-Implementation-0.09
+  build-system: cpan
+  build-depends:
+  - Module-Build
+  - Module-Runtime
+  - Try-Tiny
+- name: Package-Stash
+  repo: upstream:cpan/Package-Stash-tarball
+  ref: 37bd679ad9ac185930fa8fea7cd11b27587ae478
+  unpetrify-ref: Package-Stash-0.37
+  build-system: cpan
+  build-depends:
+  - Module-Runtime
+  - Try-Tiny
+  - Module-Implementation
+  - Module-Build
+  - Dist-CheckConflicts
+  - Package-Stash-XS
+- name: Class-Load
+  repo: upstream:cpan/Class-Load-tarball
+  ref: 7e7ddbe33ca34359d711aee1e0ddebaeb40c2a18
+  unpetrify-ref: Class-Load-0.23
+  build-system: cpan
+  build-depends:
+  - Data-OptList
+  - Params-Util
+  - Module-Runtime
+  - Try-Tiny
+  - Module-Implementation
+  - Module-Build
+  - Package-Stash
+  - Sub-Install
+  - Dist-CheckConflicts
+  - Package-Stash-XS
+- name: Devel-OverloadInfo
+  repo: upstream:cpan/Devel-OverloadInfo-tarball
+  ref: 918097f3d406ac643ab6caf4387e4c0ab3d80718
+  unpetrify-ref: Devel-OverloadInfo-0.002
+  build-system: cpan
+  build-depends:
+  - Sub-Identify
+  - Module-Runtime
+  - Try-Tiny
+  - Module-Implementation
+  - Module-Build
+  - Package-Stash
+  - MRO-Compat
+  - Dist-CheckConflicts
+  - Package-Stash-XS
+- name: Class-Load-XS
+  repo: upstream:cpan/Class-Load-XS-tarball
+  ref: 60626c51d97a7ef06b364481ae4afd9706ef6ece
+  unpetrify-ref: Class-Load-XS-0.09
+  build-system: cpan
+  build-depends:
+  - Data-OptList
+  - Params-Util
+  - Module-Runtime
+  - Try-Tiny
+  - Module-Implementation
+  - Module-Build
+  - Package-Stash
+  - Sub-Install
+  - Dist-CheckConflicts
+  - Class-Load
+  - Package-Stash-XS
+- name: Moose
+  repo: upstream:cpan/Moose-tarball
+  ref: 5ac2026f7eed78958d69d051e7a8e993dcf51205
+  unpetrify-ref: master
+  build-system: cpan
+  build-depends:
+  - Data-OptList
+  - Module-Build-Tiny
+  - Sub-Exporter
+  - Devel-GlobalDestruction
+  - Module-Implementation
+  - Module-Build
+  - List-MoreUtils
+  - Class-Load
+  - ExtUtils-Helpers
+  - Exporter-Tiny
+  - Module-Runtime
+  - Try-Tiny
+  - Class-Load-XS
+  - Package-Stash-XS
+  - Sub-Exporter-Progressive
+  - Package-DeprecationManager
+  - Params-Util
+  - Task-Weaken
+  - Dist-CheckConflicts
+  - Sub-Name
+  - ExtUtils-Config
+  - Module-Runtime-Conflicts
+  - ExtUtils-InstallPaths
+  - Devel-StackTrace
+  - Sub-Identify
+  - Package-Stash
+  - MRO-Compat
+  - Sub-Install
+  - Devel-OverloadInfo
+  - Eval-Closure
+- name: Test-Fatal
+  repo: upstream:cpan/Test-Fatal-tarball
+  ref: 40b50d9c7952dab50b39612311048d6a02a9eb53
+  unpetrify-ref: Test-Fatal-0.014
+  build-system: cpan
+  build-depends:
+  - Try-Tiny
+- name: Test-Requires
+  repo: upstream:cpan/Test-Requires-tarball
+  ref: a3ff0e26c1de52421abeff3a5d068bebc1dc8621
+  unpetrify-ref: master
+  build-system: cpan
+- name: Params-Validate
+  repo: upstream:cpan/Params-Validate-tarball
+  ref: 11197f6fc2fdd0d2a139a74ff1302244c4911e4e
+  unpetrify-ref: Params-Validate-1.20
+  build-system: module-build
+  build-depends:
+  - Module-Implementation
+  - Module-Build
+  - Module-Runtime
+  - Try-Tiny
+  - Test-Fatal
+  - Test-Requires
+- name: Log-Dispatch
+  repo: upstream:cpan/Log-Dispatch-tarball
+  ref: 2e0d2bec52bd345ef05ea12ea9052643ef135029
+  unpetrify-ref: master
+  build-system: cpan
+  build-depends:
+  - Devel-GlobalDestruction
+  - Try-Tiny
+  - Module-Implementation
+  - Module-Build
+  - Params-Validate
+  - Dist-CheckConflicts
+  - Sub-Exporter-Progressive
+  - Module-Runtime
+- name: App-cpanminus
+  repo: upstream:cpan/App-cpanminus-tarball
+  ref: 67241d22c0a425ba7301017796d8a39f7e731999
+  unpetrify-ref: App-cpanminus-1.7039
+  build-system: cpan
+- name: Class-Tiny
+  repo: upstream:cpan/Class-Tiny-tarball
+  ref: 7446bb2b9d24fa6b702fbb62d73084a32ade6f75
+  unpetrify-ref: Class-Tiny-1.001
+  build-system: cpan
+- name: JSON
+  repo: upstream:cpan/JSON-tarball
+  ref: e84b6340760ed17a22ced0ca110a94fa8322b35e
+  unpetrify-ref: JSON-2.90
+  build-system: cpan
+- name: Module-CPANfile
+  repo: upstream:cpan/Module-CPANfile-tarball
+  ref: 6b1d736955543538c54f1d8033ce3bdcb175da91
+  unpetrify-ref: Module-CPANfile-1.1000
+  build-system: cpan
+- name: Module-Reader
+  repo: upstream:cpan/Module-Reader-tarball
+  ref: 7dd93df1d843cbb36356dbea8071fab21cf04c30
+  unpetrify-ref: Module-Reader-0.002003
+  build-system: cpan
+- name: Path-Tiny
+  repo: upstream:cpan/Path-Tiny-tarball
+  ref: b7fb38421c30b0419a30311c1bde34706aa60fb8
+  unpetrify-ref: Path-Tiny-0.070
+  build-system: cpan
+- name: Carton
+  repo: upstream:carton
+  ref: 64faf28ed61a6d0278c87831c83258cf8ecc40a9
+  unpetrify-ref: baserock/v1.0.21
+  build-system: cpan
+  build-depends:
+  - Class-Tiny
+  - Path-Tiny
+  - Module-CPANfile
+  - JSON
+  - App-cpanminus
+  - Module-Reader
+- name: Future
+  repo: upstream:cpan/Future-tarball
+  ref: 8cc5160aefb2ba3611d1d5d6b12b996227f9da72
+  unpetrify-ref: Future-0.32
+  build-system: cpan
+  build-depends:
+  - Module-Build
+- name: Struct-Dumb
+  repo: upstream:cpan/Struct-Dumb-tarball
+  ref: e0788c9e0be87d9d401f38e7f67f28738d613713
+  unpetrify-ref: Struct-Dumb-0.03
+  build-system: cpan
+  build-depends:
+  - Module-Build
+  - Try-Tiny
+  - Test-Fatal
+- name: IO-Async
+  repo: upstream:cpan/IO-Async-tarball
+  ref: 1425eea04dd872dc6313f5315f317b2de288037c
+  unpetrify-ref: master
+  build-system: cpan
+  build-depends:
+  - Struct-Dumb
+  - Try-Tiny
+  - Module-Build
+  - Future
+  - Test-Fatal
+- name: Archive-Extract
+  repo: upstream:cpan/Archive-Extract-tarball
+  ref: 8538680d8b9b92f693f7e03b48332627d4b129a0
+  unpetrify-ref: master
+  build-system: cpan
diff --git a/strata/perl-common/List-MoreUtils.morph b/strata/perl-common/List-MoreUtils.morph
new file mode 100644
index 00000000..1fd38042
--- /dev/null
+++ b/strata/perl-common/List-MoreUtils.morph
@@ -0,0 +1,9 @@
+name: List-MoreUtils
+kind: chunk
+build-system: cpan
+pre-configure-commands:
+# List::MoreUtils will assume that it needs to try and build a release
+# if there's a .git present, we don't want that so we remove the .git here.
+# an issue has been filed at
+# https://github.com/perl5-utils/List-MoreUtils/issues/14
+- rm -rf .git
diff --git a/strata/privileges-management.morph b/strata/privileges-management.morph
new file mode 100644
index 00000000..f00fdde8
--- /dev/null
+++ b/strata/privileges-management.morph
@@ -0,0 +1,21 @@
+name: privileges-management
+kind: stratum
+description: Toolkit for controlling system-wide privileges
+build-depends:
+- morph: strata/foundation.morph
+- morph: strata/glib-common.morph
+- morph: strata/network-security.morph
+- morph: strata/python2-core.morph
+chunks:
+- name: mozjs17
+  morph: strata/privileges-management/mozjs17.morph
+  repo: upstream:mozilla/mozjs17
+  ref: c8e33aaaba2787d3c94eba00257051400d106e76
+  unpetrify-ref: baserock/gnome
+- name: polkit
+  morph: strata/privileges-management/polkit.morph
+  repo: upstream:polkit
+  ref: 5a7e3b76aa45eea43e4bdc403ddd4c6e1a4c6542
+  unpetrify-ref: master
+  build-depends:
+  - mozjs17
diff --git a/strata/gnome/mozjs17.morph b/strata/privileges-management/mozjs17.morph
index 9ef98854..968bfcc8 100644
--- a/strata/gnome/mozjs17.morph
+++ b/strata/privileges-management/mozjs17.morph
@@ -5,7 +5,7 @@ configure-commands:
 - |
   cd js/src;
   ./configure --prefix="$PREFIX" \
-  	      --sysconfdir=/etc \
+              --sysconfdir=/etc \
               --with-system-nspr \
               --with-system-ffi \
               --enable-threadsafe
diff --git a/strata/gnome/polkit.morph b/strata/privileges-management/polkit.morph
index d903ae0f..d903ae0f 100644
--- a/strata/gnome/polkit.morph
+++ b/strata/privileges-management/polkit.morph
diff --git a/strata/python-common.morph b/strata/python-common.morph
index 9d844a49..ac05a58e 100644
--- a/strata/python-common.morph
+++ b/strata/python-common.morph
@@ -64,7 +64,7 @@ chunks:
 - name: kazoo
   repo: upstream:python-packages/kazoo.git
   ref: 93a718ea4c20df797766742c3d74de281613c651
-  unpretrify-ref: 2.0
+  unpetrify-ref: 2.0
   build-system: python-distutils
 - name: webob
   repo: upstream:python-packages/webob
diff --git a/strata/python2-core.morph b/strata/python2-core.morph
index a39063ac..23c4e3c8 100644
--- a/strata/python2-core.morph
+++ b/strata/python2-core.morph
@@ -1,59 +1,69 @@
 name: python2-core
 kind: stratum
-description: Core python 2 packages
+description: |
+  Some "core" Python 2 packages, including the CPython interpreter itself.
+
 build-depends:
 - morph: strata/core.morph
+
 chunks:
 - name: python2
   morph: strata/python2-core/python2.morph
   repo: upstream:cpython
   ref: 57af3f22d11600ca98c0c9073d0b3b57d43f7c4b
   unpetrify-ref: v2.7.10
-- name: python-setuptools
+
+- name: python2-setuptools
   repo: upstream:python-setuptools-bitbucket
   ref: 0aa6a4de5931d02876428388678802db2371fd37
   unpetrify-ref: baserock/master
   build-system: python-distutils
   build-depends:
   - python2
-- name: mako
+
+- name: mako-python2
   repo: upstream:python-packages/mako.git
   ref: 285bc818a50ccc0f9549630f7c4f4c250585c3e7
   unpetrify-ref: rel_1_0_0
   build-system: python-distutils
   build-depends:
   - python2
-  - python-setuptools
-- name: pbr
+  - python2-setuptools
+
+- name: pbr-python2
   repo: upstream:pbr
   ref: aef4f7ef4faec987d553d1ca40b55951235af0b1
   unpetrify-ref: 0.10.7
   build-system: python-distutils
   build-depends:
   - python2
-  - python-setuptools
-- name: python-requests
+  - python2-setuptools
+
+- name: python2-requests
   repo: upstream:python-requests
   ref: b83131779c701720a9ae9efae78996277d416269
   unpetrify-ref: v2.5.1
   build-system: python-distutils
   build-depends:
   - python2
-- name: six
+
+- name: six-python2
   repo: upstream:six
   ref: 8cfbff6b764af86d825086fa1637aa009e90d75a
   unpetrify-ref: 1.9.0
   build-system: python-distutils
   build-depends:
   - python2
-- name: pyyaml
-  morph: strata/python2-core/pyyaml.morph
+
+- name: pyyaml-python2
+  morph: strata/python2-core/pyyaml-python2.morph
   repo: upstream:pyyaml
   ref: d9fbcceaed39d955f6871b07c61dc42f824285c1
   unpetrify-ref: baserock/morph
   build-depends:
   - python2
-  - python-setuptools
+  - python2-setuptools
+
 - name: cython2
   repo: upstream:cython
   ref: 4dd8e762fa51d01775506fbbc102c45dbcea065d
@@ -61,7 +71,8 @@ chunks:
   build-system: python-distutils
   build-depends:
   - python2
-- name: python-lxml
+
+- name: python2-lxml
   repo: upstream:python-lxml
   ref: 14505bc62f5f1fc9fb0ff007955f3e67ab4562bb
   unpetrify-ref: lxml-3.4.0
@@ -69,13 +80,15 @@ chunks:
   build-depends:
   - python2
   - cython2
-- name: python-markdown
+
+- name: python2-markdown
   repo: upstream:python-markdown
   ref: f0c5b71acbc02af60a33d67c59558bb513b25e74
   unpetrify-ref: 2.5.1-final
   build-system: python-distutils
   build-depends:
   - python2
+
 - name: libxml2-python2
   repo: upstream:libxml2
   ref: f4e5a6994ed230dfa3fb5b5c3fd94c4993ef1ba7
@@ -83,11 +96,12 @@ chunks:
   build-system: autotools
   build-depends:
   - python2
-- name: jsonschema
+
+- name: jsonschema-python2
   repo: upstream:jsonschema
   ref: 35b60f390098d3306c03eee27ceec8cf8a493579
   unpetrify-ref: v2.3.0
   build-system: python-distutils
   build-depends:
   - python2
-  - python-setuptools
+  - python2-setuptools
diff --git a/strata/python2-core/pyyaml-python2.morph b/strata/python2-core/pyyaml-python2.morph
new file mode 100644
index 00000000..54d2b035
--- /dev/null
+++ b/strata/python2-core/pyyaml-python2.morph
@@ -0,0 +1,6 @@
+name: pyyaml-python2
+kind: chunk
+build-commands:
+- python2 setup.py --without-libyaml build
+install-commands:
+- python2 setup.py --without-libyaml install --prefix="$PREFIX" --root "$DESTDIR"
diff --git a/strata/python2-core/pyyaml.morph b/strata/python2-core/pyyaml.morph~
index 8ebd7b57..8ebd7b57 100644
--- a/strata/python2-core/pyyaml.morph
+++ b/strata/python2-core/pyyaml.morph~
diff --git a/strata/python3-core.morph b/strata/python3-core.morph
new file mode 100644
index 00000000..5bc491dd
--- /dev/null
+++ b/strata/python3-core.morph
@@ -0,0 +1,58 @@
+name: python3-core
+kind: stratum
+description: |
+  Some "core" Python packages, for Python 3.
+
+  The CPython interpreter for Python 3 is in core.morph.
+
+build-depends:
+- morph: strata/core.morph
+
+chunks:
+- name: mako
+  repo: upstream:python-packages/mako.git
+  ref: 285bc818a50ccc0f9549630f7c4f4c250585c3e7
+  unpetrify-ref: rel_1_0_0
+  build-system: python3-distutils
+
+- name: pbr
+  repo: upstream:pbr
+  ref: aef4f7ef4faec987d553d1ca40b55951235af0b1
+  unpetrify-ref: 0.10.7
+  build-system: python3-distutils
+
+- name: python-requests
+  repo: upstream:python-requests
+  ref: b83131779c701720a9ae9efae78996277d416269
+  unpetrify-ref: v2.5.1
+  build-system: python3-distutils
+
+- name: six
+  repo: upstream:six
+  ref: 8cfbff6b764af86d825086fa1637aa009e90d75a
+  unpetrify-ref: 1.9.0
+  build-system: python3-distutils
+
+- name: pyyaml
+  morph: strata/python3-core/pyyaml.morph
+  repo: upstream:pyyaml
+  ref: d9fbcceaed39d955f6871b07c61dc42f824285c1
+  unpetrify-ref: baserock/morph
+
+- name: python-lxml
+  repo: upstream:python-lxml
+  ref: 14505bc62f5f1fc9fb0ff007955f3e67ab4562bb
+  unpetrify-ref: lxml-3.4.0
+  build-system: python3-distutils
+
+- name: python-markdown
+  repo: upstream:python-markdown
+  ref: f0c5b71acbc02af60a33d67c59558bb513b25e74
+  unpetrify-ref: 2.5.1-final
+  build-system: python3-distutils
+
+- name: jsonschema
+  repo: upstream:jsonschema
+  ref: 35b60f390098d3306c03eee27ceec8cf8a493579
+  unpetrify-ref: v2.3.0
+  build-system: python3-distutils
diff --git a/strata/python3-core/pyyaml.morph b/strata/python3-core/pyyaml.morph
new file mode 100644
index 00000000..001f392c
--- /dev/null
+++ b/strata/python3-core/pyyaml.morph
@@ -0,0 +1,6 @@
+name: pyyaml
+kind: chunk
+build-commands:
+- python3 setup.py --without-libyaml build
+install-commands:
+- python3 setup.py --without-libyaml install --prefix="$PREFIX" --root "$DESTDIR"
diff --git a/strata/qt5-tools-qtwayland.morph b/strata/qt5-tools-qtwayland.morph
new file mode 100644
index 00000000..d22b3268
--- /dev/null
+++ b/strata/qt5-tools-qtwayland.morph
@@ -0,0 +1,11 @@
+name: qt5-tools-qtwayland
+kind: stratum
+description: Qt5 Wayland module
+build-depends:
+- morph: strata/qt5-tools.morph
+chunks:
+- name: qtwayland
+  repo: upstream:qt5/qtwayland
+  ref: d5e7965a87d81e2d7157c785403b0aba681de62a
+  unpetrify-ref: 5.4.2
+  build-system: qmake
diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph
index 2a5a61ac..085643f9 100644
--- a/strata/qt5-tools.morph
+++ b/strata/qt5-tools.morph
@@ -45,7 +45,7 @@ chunks:
   morph: strata/qt5-tools/qt3d.morph
   repo: upstream:qt5/qt3d
   ref: bdb98baf8253c69949a8c259369203da9ffb269c
-  unpetrify-ref: baserock/morph
+  unpetrify-ref: baserock/v5.0.0-beta1-81-gbdb98ba
   build-depends:
   - qtbase
   - qtscript
diff --git a/strata/secret-service.morph b/strata/secret-service.morph
new file mode 100644
index 00000000..b6f9e896
--- /dev/null
+++ b/strata/secret-service.morph
@@ -0,0 +1,27 @@
+name: secret-service
+kind: stratum
+description: Service implementing the DBus Secret Service API
+build-depends:
+- morph: strata/foundation.morph
+- morph: strata/glib-common.morph
+- morph: strata/gtk3.morph
+- morph: strata/network-security.morph
+- morph: strata/vala-common.morph
+chunks:
+- name: gcr
+  repo: upstream:gnome/gcr
+  ref: 289ba4859fd170285f51e6bbfe91f2aac3b9170d
+  unpetrify-ref: 3.18.0
+  build-system: autotools
+- name: gnome-keyring
+  morph: strata/secret-service/gnome-keyring.morph
+  repo: upstream:gnome-keyring
+  ref: eb16c037431da14d4f1c396357f82f2b35e76e23
+  unpetrify-ref: baserock/3.18.3-5-geb16c03
+  build-depends:
+  - gcr
+- name: libsecret
+  morph: strata/secret-service/libsecret.morph
+  repo: upstream:gnome/libsecret
+  ref: 4d76cf7dd8e55d93bb58164a1fff38113ba97af5
+  unpetrify-ref: master
diff --git a/strata/gnome/gnome-keyring.morph b/strata/secret-service/gnome-keyring.morph
index 73fe5298..73fe5298 100644
--- a/strata/gnome/gnome-keyring.morph
+++ b/strata/secret-service/gnome-keyring.morph
diff --git a/strata/gnome/libsecret.morph b/strata/secret-service/libsecret.morph
index b8af29b1..b8af29b1 100644
--- a/strata/gnome/libsecret.morph
+++ b/strata/secret-service/libsecret.morph
diff --git a/strata/spell-checking.morph b/strata/spell-checking.morph
new file mode 100644
index 00000000..dfe8b997
--- /dev/null
+++ b/strata/spell-checking.morph
@@ -0,0 +1,16 @@
+name: spell-checking
+kind: stratum
+description: Spell checking libraries
+build-depends:
+- morph: strata/glib-common.morph
+chunks:
+- name: enchant
+  repo: upstream:enchant
+  ref: 6d8b6bb15f09a14c90fb900eb2ecf1172d7cf6cf
+  unpetrify-ref: master
+  build-system: autotools
+- name: hyphen
+  repo: upstream:hyphen
+  ref: 7f28cf7edb54cc1bc4eaa09672e0bc043b1da70b
+  unpetrify-ref: master
+  build-system: autotools
diff --git a/strata/storage-management.morph b/strata/storage-management.morph
new file mode 100644
index 00000000..0b26d2f9
--- /dev/null
+++ b/strata/storage-management.morph
@@ -0,0 +1,26 @@
+name: storage-management
+kind: stratum
+description: libraries/services that provides access to storage
+build-depends:
+- morph: strata/glib-common.morph
+- morph: strata/privileges-management.morph
+chunks:
+- name: libatasmart
+  morph: strata/storage-management/libatasmart.morph
+  repo: upstream:libatasmart
+  ref: de6258940960443038b4c1651dfda3620075e870
+  unpetrify-ref: master
+- name: udisks
+  morph: strata/storage-management/udisks.morph
+  repo: upstream:udisks
+  ref: 410cab8f3d749ad2660cda3ba38b6aece42bf10f
+  unpetrify-ref: master
+  build-depends:
+  - libatasmart
+- name: gvfs
+  morph: strata/storage-management/gvfs.morph
+  repo: upstream:gvfs
+  ref: d037b5fd56cae878ed7bb5269a40e4bd046551d7
+  unpetrify-ref: master
+  build-depends:
+  - udisks
diff --git a/strata/gnome/gvfs.morph b/strata/storage-management/gvfs.morph
index 1fde8c82..1fde8c82 100644
--- a/strata/gnome/gvfs.morph
+++ b/strata/storage-management/gvfs.morph
diff --git a/strata/gnome/libatasmart.morph b/strata/storage-management/libatasmart.morph
index e8df654e..e8df654e 100644
--- a/strata/gnome/libatasmart.morph
+++ b/strata/storage-management/libatasmart.morph
diff --git a/strata/gnome/udisks.morph b/strata/storage-management/udisks.morph
index 785fab39..785fab39 100644
--- a/strata/gnome/udisks.morph
+++ b/strata/storage-management/udisks.morph
diff --git a/strata/swift/gf-complete.morph b/strata/swift/gf-complete.morph
index e8965c76..adbe5a48 100644
--- a/strata/swift/gf-complete.morph
+++ b/strata/swift/gf-complete.morph
@@ -5,8 +5,7 @@ pre-configure-commands:
 - ./autogen.sh
 configure-commands:
 - |
-  cpu="$(echo $TARGET | cut -d '-' -f 1)"
-  case "$cpu" in
+  case "$MORPH_ARCH" in
   x86_64)
     SSE=
     ;;
diff --git a/strata/tools.morph b/strata/tools.morph
index 9fc1f8c7..0a71acee 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -3,7 +3,6 @@ kind: stratum
 description: Various tools
 build-depends:
 - morph: strata/core.morph
-- morph: strata/glib-common.morph
 chunks:
 - name: distcc
   morph: strata/tools/distcc.morph
@@ -30,18 +29,6 @@ chunks:
   ref: 6d8c0637e8dd0f65c667af33c612230552419db1
   unpetrify-ref: v4.8
   build-system: autotools
-- name: vala-bootstrap
-  morph: strata/tools/vala-bootstrap.morph
-  repo: upstream:vala
-  ref: 4e4a02c03445336237b36723b23a91670ef7621b
-  unpetrify-ref: baserock/bootstrap
-- name: vala
-  repo: upstream:vala
-  ref: 5f6ebe007050be12bdc4aa7c902ae4059f28874a
-  unpetrify-ref: 0.28.0
-  build-system: autotools
-  build-depends:
-  - vala-bootstrap
 - name: u-boot
   morph: strata/tools/u-boot.morph
   repo: upstream:u-boot
diff --git a/strata/trove.morph b/strata/trove.morph
index 5175376e..073ecd98 100644
--- a/strata/trove.morph
+++ b/strata/trove.morph
@@ -66,12 +66,12 @@ chunks:
 - name: cgit
   morph: strata/trove/cgit.morph
   repo: upstream:cgit
-  ref: acbf4a15e260c711094455dbef7c024f2553fd32
-  unpetrify-ref: baserock/morph
+  ref: dc881acb0c857c783b611c03294d79a7553a4ec7
+  unpetrify-ref: baserock/v0.12
 - name: trove-setup
   morph: strata/trove/trove-setup.morph
   repo: baserock:baserock/trove-setup
-  ref: 1ca53f11d302a7db3ef53e09ba7c259689a9cb83
+  ref: ae208aa0b8a8fa1c73edfc6467c64772eee90907
   unpetrify-ref: master
 - name: lua-scrypt
   morph: strata/trove/lua-scrypt.morph
diff --git a/strata/vala-common.morph b/strata/vala-common.morph
new file mode 100644
index 00000000..7827703c
--- /dev/null
+++ b/strata/vala-common.morph
@@ -0,0 +1,32 @@
+name: vala-common
+kind: stratum
+description: Vala compiler
+build-depends:
+- morph: strata/core.morph
+- morph: strata/glib-common.morph
+chunks:
+- name: vala-bootstrap
+  morph: strata/vala-common/vala-bootstrap.morph
+  repo: upstream:vala
+  ref: 4e4a02c03445336237b36723b23a91670ef7621b
+  unpetrify-ref: baserock/bootstrap
+- name: vala
+  repo: upstream:vala
+  ref: 5f6ebe007050be12bdc4aa7c902ae4059f28874a
+  unpetrify-ref: 0.28.0
+  build-system: autotools
+  build-depends:
+  - vala-bootstrap
+- name: m4-common
+  repo: upstream:m4-common
+  ref: 6e9a4d3b35c5ce8af050e66d8caff96070c57d34
+  unpetrify-ref: baserock/2015-12-15
+  build-system: autotools
+- name: libgee
+  repo: upstream:gnome/libgee
+  ref: 4301ab58efc217409c588a5527f68990b4e3d220
+  unpetrify-ref: master
+  build-system: autotools
+  build-depends:
+  - m4-common
+  - vala
diff --git a/strata/tools/vala-bootstrap.morph b/strata/vala-common/vala-bootstrap.morph
index e55b1887..e55b1887 100644
--- a/strata/tools/vala-bootstrap.morph
+++ b/strata/vala-common/vala-bootstrap.morph
diff --git a/strata/virtualization.morph b/strata/virtualization.morph
index f58018b6..2a91fa17 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.morph
@@ -88,4 +88,4 @@ chunks:
   morph: strata/virtualization/openvswitch.morph
   repo: upstream:openvswitch
   ref: a52b0492a4d0398a24ed2a3566ff55ac53fea31f
-  unpretrify-ref: master
+  unpetrify-ref: master
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index cf89a1b5..f2de396d 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -6,5 +6,5 @@ chunks:
 - name: wayland
   morph: strata/wayland-generic/wayland.morph
   repo: upstream:wayland
-  ref: 60024af597b68974c451c89f960a7c11de11c33a
-  unpetrify-ref: 1.8.0
+  ref: b05668f0ad64ad9ba82e124965163daed4172ead
+  unpetrify-ref: 1.9.0
diff --git a/strata/weston-common.morph b/strata/weston-common.morph
index fbc5d5f1..a7ef2401 100644
--- a/strata/weston-common.morph
+++ b/strata/weston-common.morph
@@ -10,5 +10,5 @@ chunks:
 - name: weston
   morph: strata/weston-common/weston.morph
   repo: upstream:weston
-  ref: 97a6d48e725956a58afad4450c5981c42ba4aa9c
-  unpetrify-ref: baserock/weston-1.8.0/tegra
+  ref: c7dbc0a8c18e03719b3618b2dff7102f47a1331b
+  unpetrify-ref: baserock/weston-1.9.0/tegra
diff --git a/strata/x-common.morph b/strata/x-common.morph
index fe7b9a0d..33254949 100644
--- a/strata/x-common.morph
+++ b/strata/x-common.morph
@@ -55,8 +55,8 @@ chunks:
   build-system: autotools
 - name: xorg-proto-randrproto
   repo: upstream:xorg-proto-randrproto
-  ref: ca7cc541c2e43e6c784df19b4583ac35829d2f72
-  unpetrify-ref: baserock/morph
+  ref: 79b63f0e57cd5baf06ff24252d3f1675dcb64467
+  unpetrify-ref: randrproto-1.5.0
   build-system: autotools
 - name: xorg-proto-recordproto
   repo: upstream:xorg-proto-recordproto
@@ -110,8 +110,8 @@ chunks:
   build-system: autotools
 - name: xorg-proto-x11proto
   repo: upstream:xorg-proto-x11proto
-  ref: 03cbbf6c3e811c026c86e3a60d2f9af56606e155
-  unpetrify-ref: xproto-7.0.26
+  ref: d5524e2b8d811aa03ed19c6e8fb2ee4162ca2b23
+  unpetrify-ref: xproto-7.0.28
   build-system: autotools
 - name: xorg-proto-dri2proto
   repo: upstream:xorg-proto-dri2proto
@@ -324,3 +324,31 @@ chunks:
   - xorg-proto-kbproto
   - xorg-lib-libX11
   - xorg-lib-libSM
+- name: xorg-lib-libXmu
+  repo: upstream:xorg-lib-libXmu
+  ref: 2539e539eafdac88177c8ee30b043c5d52f017e4
+  unpetrify-ref: libXmu-1.1.2
+  build-system: autotools
+  build-depends:
+  - xorg-lib-libX11
+  - xorg-lib-libXext
+  - xorg-lib-libXt
+  - xorg-proto-xextproto
+- name: xorg-lib-libXv
+  repo: upstream:xorg-lib-libXv
+  ref: 736d7ac5a94c7aa6761d50ab58339a3d9a116c51
+  unpetrify-ref: libXv-1.0.10
+  build-system: autotools
+  build-depends:
+  - xorg-lib-libX11
+  - xorg-lib-libXext
+  - xorg-proto-xextproto
+  - xorg-proto-videoproto
+- name: xorg-lib-libxkbfile
+  repo: upstream:xorg-lib-libxkbfile
+  ref: 7381c2f9013ef7784c78091fa671e652a62ca706
+  unpetrify-ref: baserock/morph
+  build-system: autotools
+  build-depends:
+  - xorg-lib-libX11
+  - xorg-proto-kbproto
diff --git a/strata/x-drivers.morph b/strata/x-drivers.morph
index 185d6b40..faf646f2 100644
--- a/strata/x-drivers.morph
+++ b/strata/x-drivers.morph
@@ -19,18 +19,8 @@ chunks:
   ref: 57725564179b8ddb48d5c9437fde91a6c02c0740
   unpetrify-ref: 2.99.917-381-g5772556
   build-system: autotools
-- name: xorg-driver-xf86-input-evdev
-  repo: upstream:xorg-driver-xf86-input-evdev
-  ref: 24368d8379cc47693dd1623168a6125faff57311
-  unpetrify-ref: xf86-input-evdev-2.9.2
-  build-system: autotools
-- name: xorg-driver-xf86-input-keyboard
-  repo: upstream:xorg-driver-xf86-input-keyboard
-  ref: 13d320076e5de2d6c3cbc170fc7e31c526ed8499
-  unpetrify-ref: xf86-input-keyboard-1.8.1
-  build-system: autotools
-- name: xorg-driver-xf86-input-mouse
-  repo: upstream:xorg-driver-xf86-input-mouse
-  ref: 6886084b192e681739fc55892f30681efb4f79f0
-  unpetrify-ref: xf86-input-mouse-1.9.1
+- name: xorg-driver-xf86-input-libinput
+  repo: upstream:xorg-driver-xf86-input-libinput
+  ref: 44f4b2ed7075d424e3621f30815e11875b364c27
+  unpetrify-ref: xf86-input-libinput-0.15.0
   build-system: autotools
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index 58d3d0d1..4d93d770 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.morph
@@ -7,11 +7,6 @@ build-depends:
 - morph: strata/x-common.morph
 - morph: strata/graphics-common.morph
 chunks:
-- name: xorg-lib-libxkbfile
-  repo: upstream:xorg-lib-libxkbfile
-  ref: 7381c2f9013ef7784c78091fa671e652a62ca706
-  unpetrify-ref: baserock/morph
-  build-system: autotools
 - name: xorg-font-util
   repo: upstream:xorg-font-util
   ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87
@@ -34,19 +29,16 @@ chunks:
 - name: xserver
   morph: strata/x-generic/xserver.morph
   repo: upstream:xserver
-  ref: 2123f7682d522619f101b05fb75efa75dabbe371
-  unpetrify-ref: xorg-server-1.17.2
+  ref: 43fb888bd01cf9d3d277e77a52a3d0c93ccff8bd
+  unpetrify-ref: xorg-server-1.18.0
   build-depends:
   - 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-system: autotools
-  build-depends:
-  - xorg-lib-libxkbfile
 - name: xorg-app-xinit
   repo: upstream:xorg-app-xinit
   ref: 4e85bce64acef1fa0ddff04d59737444e942ff12
diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index 9a5f48f2..6812e622 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -55,8 +55,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
index fd0cdfcb..22cac493 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -58,8 +58,10 @@ strata:
   morph: strata/unionfs-fuse-group.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
index 423648c9..9a38f5ba 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -56,8 +56,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
index 7e594710..c71a3319 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -56,8 +56,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
index 0c9344c1..b385161e 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -47,8 +47,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph
index 4bd34876..294ced01 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -54,8 +54,10 @@ strata:
   morph: strata/unionfs-fuse-group.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7l-altera-socfpga-devkit.morph b/systems/devel-system-armv7l-altera-socfpga-devkit.morph
index 94f85ec2..f73576bc 100644
--- a/systems/devel-system-armv7l-altera-socfpga-devkit.morph
+++ b/systems/devel-system-armv7l-altera-socfpga-devkit.morph
@@ -51,8 +51,10 @@ strata:
   morph: strata/libsoup-common.morph
 - name: ostree-core
   morph: strata/ostree-core.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index 203d5ef8..3e42adba 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -55,8 +55,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index c0ccfa66..21b31da7 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -61,8 +61,10 @@ strata:
   morph: strata/unionfs-fuse-group.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index 14bc1b27..9d343db4 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -59,8 +59,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
index 6cf81846..e2482245 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -59,8 +59,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv8b64.morph b/systems/devel-system-armv8b64.morph
index ab8dcd1b..496da0bd 100644
--- a/systems/devel-system-armv8b64.morph
+++ b/systems/devel-system-armv8b64.morph
@@ -58,8 +58,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph
index 3cf21388..fbfd8220 100644
--- a/systems/devel-system-armv8l64.morph
+++ b/systems/devel-system-armv8l64.morph
@@ -58,8 +58,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index 5e4c5f98..2fce60bf 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -53,8 +53,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
index be76353c..1d89eb8a 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -56,8 +56,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
index bcd0acfc..b28b1ca5 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -55,8 +55,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
index c03c8b73..ba103e9d 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -60,8 +60,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
index 49fc75af..efadb210 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -57,8 +57,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index 5ee32cc2..1dde180f 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -60,8 +60,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index e142c7c5..cf12e97e 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -58,8 +58,10 @@ strata:
   morph: strata/ostree-core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
-- name: compilers-extra
-  morph: strata/compilers-extra.morph
+- name: perl-common
+  morph: strata/perl-common.morph
+- name: CPAN-Mini-Inject
+  morph: strata/CPAN-Mini-Inject.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/gnome-system-armv7lhf-jetson.morph b/systems/gnome-system-armv7lhf-jetson.morph
new file mode 100644
index 00000000..44cf5e80
--- /dev/null
+++ b/systems/gnome-system-armv7lhf-jetson.morph
@@ -0,0 +1,90 @@
+name: gnome-system-armv7lhf-jetson
+kind: system
+description: A GNOME system system.
+arch: armv7lhf
+strata:
+- name: audio-bluetooth
+  morph: strata/audio-bluetooth.morph
+- name: bsp-jetson
+  morph: strata/bsp-jetson.morph
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: NetworkManager-common
+  morph: strata/NetworkManager-common.morph
+- name: core
+  morph: strata/core.morph
+- name: data-indexing-management
+  morph: strata/data-indexing-management.morph
+- name: dlna-services
+  morph: strata/dlna-services.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: geolocation
+  morph: strata/geolocation.morph
+- name: glib-common
+  morph: strata/glib-common.morph
+- name: gnome
+  morph: strata/gnome.morph
+- name: graphics-common
+  morph: strata/graphics-common.morph
+- name: gtk-deps
+  morph: strata/gtk-deps.morph
+- name: gtk2
+  morph: strata/gtk2.morph
+- name: gtk3
+  morph: strata/gtk3.morph
+- name: input-common
+  morph: strata/input-common.morph
+- name: llvm-common
+  morph: strata/llvm-common.morph
+- name: mesa-common
+  morph: strata/mesa-common.morph
+- name: multimedia-common
+  morph: strata/multimedia-common.morph
+- name: multimedia-gstreamer
+  morph: strata/multimedia-gstreamer.morph
+- name: python2-core
+  morph: strata/python2-core.morph
+- name: python3-gobject
+  morph: strata/python3-gobject.morph
+- name: libsoup-common
+  morph: strata/libsoup-common.morph
+- name: ruby
+  morph: strata/ruby.morph
+- name: libdrm-common
+  morph: strata/libdrm-common.morph
+- name: wayland-generic
+  morph: strata/wayland-generic.morph
+- name: weston-common
+  morph: strata/weston-common.morph
+- name: x-common
+  morph: strata/x-common.morph
+- name: x-drivers
+  morph: strata/x-drivers.morph
+- name: x-generic
+  morph: strata/x-generic.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
+- name: xdg-app-common
+  morph: strata/xdg-app-common.morph
+- name: network-security
+  morph: strata/network-security.morph
+- name: icu-common
+  morph: strata/icu-common.morph
+- name: samba
+  morph: strata/samba.morph
+- name: secret-service
+  morph: strata/secret-service.morph
+- name: spell-checking
+  morph: strata/spell-checking.morph
+- name: storage-management
+  morph: strata/storage-management.morph
+- name: cups
+  morph: strata/cups.morph
+- name: WebKitGtk1-common
+  morph: strata/WebKitGtk1-common.morph
+configuration-extensions:
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/install-files
+- extensions/install-essential-files
diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph
index 3166a486..2068397f 100644
--- a/systems/gnome-system-x86_64.morph
+++ b/systems/gnome-system-x86_64.morph
@@ -13,8 +13,14 @@ strata:
   morph: strata/NetworkManager-common.morph
 - name: core
   morph: strata/core.morph
+- name: data-indexing-management
+  morph: strata/data-indexing-management.morph
+- name: dlna-services
+  morph: strata/dlna-services.morph
 - name: foundation
   morph: strata/foundation.morph
+- name: geolocation
+  morph: strata/geolocation.morph
 - name: glib-common
   morph: strata/glib-common.morph
 - name: gnome
@@ -35,20 +41,24 @@ strata:
   morph: strata/mesa-common.morph
 - name: multimedia-common
   morph: strata/multimedia-common.morph
+- name: multimedia-hardware-codecs-x86
+  morph: strata/multimedia-hardware-codecs-x86.morph
 - name: multimedia-gstreamer
   morph: strata/multimedia-gstreamer.morph
+- name: privileges-management
+  morph: strata/privileges-management.morph
 - name: python2-core
   morph: strata/python2-core.morph
-- name: python-pygobject
-  morph: strata/python-pygobject.morph
+- name: python3-gobject
+  morph: strata/python3-gobject.morph
 - name: libsoup-common
   morph: strata/libsoup-common.morph
 - name: ruby
   morph: strata/ruby.morph
-- name: tools
-  morph: strata/tools.morph
 - name: libdrm-common
   morph: strata/libdrm-common.morph
+- name: vala-common
+  morph: strata/vala-common.morph
 - name: wayland-generic
   morph: strata/wayland-generic.morph
 - name: weston-common
@@ -69,8 +79,16 @@ strata:
   morph: strata/icu-common.morph
 - name: samba
   morph: strata/samba.morph
+- name: secret-service
+  morph: strata/secret-service.morph
+- name: spell-checking
+  morph: strata/spell-checking.morph
+- name: storage-management
+  morph: strata/storage-management.morph
 - name: cups
   morph: strata/cups.morph
+- name: WebKitGtk1-common
+  morph: strata/WebKitGtk1-common.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph
index e8230c88..d6a84fd6 100644
--- a/systems/qt4-devel-system-x86_64-generic.morph
+++ b/systems/qt4-devel-system-x86_64-generic.morph
@@ -30,8 +30,8 @@ strata:
   morph: strata/qt4-tools.morph
 - name: qt4-sdk
   morph: strata/qt4-sdk.morph
-- name: lua
-  morph: strata/lua.morph
+- name: lua51
+  morph: strata/lua51.morph
 - name: connectivity
   morph: strata/connectivity.morph
 - name: connman-common
diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph
index b68faf79..90b6703a 100644
--- a/systems/qt5-devel-system-x86_64-generic.morph
+++ b/systems/qt5-devel-system-x86_64-generic.morph
@@ -32,8 +32,8 @@ strata:
   morph: strata/qt5-tools-qtwebkit.morph
 - name: qt5-sdk
   morph: strata/qt5-sdk.morph
-- name: lua
-  morph: strata/lua.morph
+- name: lua51
+  morph: strata/lua51.morph
 - name: connectivity
   morph: strata/connectivity.morph
 - name: connman-common
diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph
index bd0a0ff4..43fd19fa 100644
--- a/systems/trove-system-x86_64.morph
+++ b/systems/trove-system-x86_64.morph
@@ -13,6 +13,8 @@ strata:
   morph: strata/core.morph
 - name: python2-core
   morph: strata/python2-core.morph
+- name: python3-core
+  morph: strata/python3-core.morph
 - name: tools
   morph: strata/tools.morph
 - name: python-cliapp
diff --git a/systems/weston-qt5-system-x86_64.morph b/systems/weston-qt5-system-x86_64.morph
new file mode 100644
index 00000000..b7fe546a
--- /dev/null
+++ b/systems/weston-qt5-system-x86_64.morph
@@ -0,0 +1,64 @@
+name: weston-qt5-system-x86_64.morph
+kind: system
+description: A system that is able to build other systems based on the 64-bit x86
+  architecture.
+arch: x86_64
+strata:
+- name: build-essential
+  morph: strata/build-essential.morph
+- name: core
+  morph: strata/core.morph
+- name: coreutils-common
+  morph: strata/coreutils-common.morph
+- name: foundation
+  morph: strata/foundation.morph
+- name: audio-bluetooth
+  morph: strata/audio-bluetooth.morph
+- name: libdrm-common
+  morph: strata/libdrm-common.morph
+- name: multimedia-common
+  morph: strata/multimedia-common.morph
+- name: multimedia-gstreamer
+  morph: strata/multimedia-gstreamer.morph
+- name: bsp-x86_64-generic
+  morph: strata/bsp-x86_64-generic.morph
+- name: tools
+  morph: strata/tools.morph
+- name: glib-common
+  morph: strata/glib-common.morph
+- name: wayland-generic
+  morph: strata/wayland-generic.morph
+- name: graphics-common
+  morph: strata/graphics-common.morph
+- name: input-common
+  morph: strata/input-common.morph
+- name: llvm-common
+  morph: strata/llvm-common.morph
+- name: mesa-common
+  morph: strata/mesa-common.morph
+- name: weston-common
+  morph: strata/weston-common.morph
+- name: x-common
+  morph: strata/x-common.morph
+- name: x-generic
+  morph: strata/x-generic.morph
+- name: qt5-tools
+  morph: strata/qt5-tools.morph
+- name: qt5-tools-qtwebkit
+  morph: strata/qt5-tools-qtwebkit.morph
+- name: qt5-sdk
+  morph: strata/qt5-sdk.morph
+- name: qt5-tools-qtwayland
+  morph: strata/qt5-tools-qtwayland.morph
+- name: connectivity
+  morph: strata/connectivity.morph
+- name: connman-common
+  morph: strata/connman-common.morph
+- name: icu-common
+  morph: strata/icu-common.morph
+configuration-extensions:
+- extensions/set-hostname
+- extensions/add-config-files
+- extensions/nfsboot
+- extensions/install-files
+- extensions/install-essential-files