Morph build 8bfd897f989a4650a1bb70745704762e

System branch: master

51 files changed, 396 insertions, 416 deletions

diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph
index 44adc1fb..8115c309 100644
--- a/strata/NetworkManager-common.morph
+++ b/strata/NetworkManager-common.morph
@@ -10,10 +10,16 @@ chunks:
   ref: f3a3a63d5b5abced8f75731d7b995606933c6e33
   unpetrify-ref: v1.4
   build-depends: []
+- name: readline6
+  repo: upstream:readline
+  ref: 7628b745a813aac53586b640da056a975f1c443e
+  unpetrify-ref: readline-6.3
+  build-depends: []
 - name: NetworkManager
   morph: strata/NetworkManager-common/NetworkManager.morph
   repo: upstream:NetworkManager
-  ref: 6eb82acd6dce882f4b91aafcf68dd9e143ce34e2
-  unpetrify-ref: 0.9.10
+  ref: acdaf78a068b6c65ba799a7098b867953db4801c
+  unpetrify-ref: 1.0.0
   build-depends:
   - libndp
+  - readline6
diff --git a/strata/NetworkManager-common/NetworkManager.morph b/strata/NetworkManager-common/NetworkManager.morph
index 9840dfa4..553c979b 100644
--- a/strata/NetworkManager-common/NetworkManager.morph
+++ b/strata/NetworkManager-common/NetworkManager.morph
@@ -2,4 +2,4 @@ name: NetworkManager
 kind: chunk
 build-system: autotools
 configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --with-session-tracking=systemd --disable-ppp
+- ./autogen.sh --prefix="$PREFIX" --with-session-tracking=systemd --disable-ppp --enable-more-warnings=yes
diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph
index 04a0a79b..44e08fdc 100644
--- a/strata/audio-bluetooth.morph
+++ b/strata/audio-bluetooth.morph
@@ -77,8 +77,8 @@ chunks:
 - name: json-c
   morph: strata/audio-bluetooth/json-c.morph
   repo: upstream:json-c
-  ref: 60a5f3dedc879db3e5dacdd3b7e3e543c2e1bae7
-  unpetrify-ref: baserock/morph
+  ref: e8bd6865d7a671e9f75ece05dfe86a19ba610581
+  unpetrify-ref: baserock/json-c-0.12-20140410-plus-patch
   build-depends: []
 - name: libsndfile
   morph: strata/audio-bluetooth/libsndfile.morph
@@ -89,8 +89,8 @@ chunks:
 - name: pulseaudio
   morph: strata/audio-bluetooth/pulseaudio.morph
   repo: upstream:pulseaudio
-  ref: e1b44688c0db505f70761fe76b4fed2ca6924a09
-  unpetrify-ref: baserock/morph
+  ref: 34862dbd43079d19faff31fa9ba996acc874d586
+  unpetrify-ref: v5.99.3
   build-depends:
   - libsndfile
   - libatomic_ops
diff --git a/strata/audio-bluetooth/pulseaudio.morph b/strata/audio-bluetooth/pulseaudio.morph
index 117f3396..1fa23d87 100644
--- a/strata/audio-bluetooth/pulseaudio.morph
+++ b/strata/audio-bluetooth/pulseaudio.morph
@@ -5,9 +5,8 @@ build-system: autotools
 configure-commands:
 - ./autogen.sh
 - ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --with-database=simple
+  --with-systemduserunitdir=/lib/systemd/system
 install-commands:
 - make DESTDIR="$DESTDIR" install
-- mkdir -p "$DESTDIR/lib/systemd/system"
-- install -m755 pulseaudio.service "$DESTDIR/lib/systemd/system"
 - 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"
diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph
index 480bd702..ad318db9 100644
--- a/strata/bsp-x86_32-generic.morph
+++ b/strata/bsp-x86_32-generic.morph
@@ -20,7 +20,7 @@ chunks:
 - name: syslinux
   morph: strata/bsp-x86_32-generic/syslinux.morph
   repo: upstream:syslinux
-  ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f
+  ref: 2aab8555987b547b617cbb887e61083fece01541
   unpetrify-ref: baserock/morph
   build-depends:
   - nasm
diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph
index e42cf1ed..624b31a4 100644
--- a/strata/bsp-x86_64-generic.morph
+++ b/strata/bsp-x86_64-generic.morph
@@ -9,6 +9,7 @@ chunks:
   morph: strata/bsp-x86_64-generic/linux-x86-64-generic.morph
   repo: upstream:linux
   ref: b2776bf7149bddd1f4161f14f79520f17fc1d71d
+  unpetrify-ref: v3.18
   build-depends: []
 - name: nasm
   morph: strata/bsp-x86_64-generic/nasm.morph
@@ -19,7 +20,7 @@ chunks:
 - name: syslinux
   morph: strata/bsp-x86_64-generic/syslinux.morph
   repo: upstream:syslinux
-  ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f
+  ref: 2aab8555987b547b617cbb887e61083fece01541
   unpetrify-ref: baserock/morph
   build-depends:
   - nasm
diff --git a/strata/bsp-x86_64-generic/syslinux.morph b/strata/bsp-x86_64-generic/syslinux.morph
index c0f15807..43356e36 100644
--- a/strata/bsp-x86_64-generic/syslinux.morph
+++ b/strata/bsp-x86_64-generic/syslinux.morph
@@ -2,7 +2,7 @@ name: syslinux
 kind: chunk
 build-commands:
 - make clean
-- make
-- make installer
+- make NO_WERROR=1
+- make NO_WERROR=1 installer
 install-commands:
 - make INSTALLROOT="$DESTDIR" install
diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph
index c1ba501c..008ddf3f 100644
--- a/strata/bsp-x86_both-tools.morph
+++ b/strata/bsp-x86_both-tools.morph
@@ -14,7 +14,7 @@ chunks:
 - name: syslinux
   morph: strata/bsp-x86_both-tools/syslinux.morph
   repo: upstream:syslinux
-  ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f
-  unpetrify-ref: baserock/morph
+  ref: baserock/morph
+  unpetrify-ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f
   build-depends:
   - nasm
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index b6f3ae6a..685a0dc9 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -41,7 +41,7 @@ chunks:
 - name: stage1-binutils
   morph: strata/build-essential/stage1-binutils.morph
   repo: upstream:binutils-redhat
-  ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
+  ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8
   unpetrify-ref: baserock/build-essential
   build-depends: []
   build-mode: bootstrap
@@ -49,7 +49,7 @@ chunks:
 - name: stage1-gcc
   morph: strata/build-essential/stage1-gcc.morph
   repo: upstream:gcc-tarball
-  ref: 999c918a7ad32ad436395666def22ab90b3447fe
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
   unpetrify-ref: baserock/build-essential
   build-depends:
   - stage1-binutils
@@ -76,10 +76,21 @@ chunks:
   - stage2-linux-api-headers
   build-mode: bootstrap
   prefix: /tools
+- name: stage2-libstdc++
+  morph: strata/build-essential/stage2-libstdc++.morph
+  repo: upstream:gcc-tarball
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+  unpetrify-ref: baserock/build-essential
+  build-depends:
+  - stage1-binutils
+  - stage1-gcc
+  - stage2-glibc
+  build-mode: bootstrap
+  prefix: /tools
 - name: stage2-binutils
   morph: strata/build-essential/stage2-binutils.morph
   repo: upstream:binutils-redhat
-  ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
+  ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8
   unpetrify-ref: baserock/build-essential
   build-depends:
   - stage1-binutils
@@ -90,7 +101,7 @@ chunks:
 - name: stage2-gcc-fixed-headers
   morph: strata/build-essential/stage2-gcc-fixed-headers.morph
   repo: upstream:gcc-tarball
-  ref: 999c918a7ad32ad436395666def22ab90b3447fe
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
   unpetrify-ref: baserock/build-essential
   build-depends:
   - stage1-binutils
@@ -101,13 +112,14 @@ chunks:
 - name: stage2-gcc
   morph: strata/build-essential/stage2-gcc.morph
   repo: upstream:gcc-tarball
-  ref: 999c918a7ad32ad436395666def22ab90b3447fe
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
   unpetrify-ref: baserock/build-essential
   build-depends:
   - stage1-binutils
   - stage1-gcc
   - stage2-glibc
   - stage2-gcc-fixed-headers
+  - stage2-libstdc++
   build-mode: bootstrap
   prefix: /tools
 - name: stage2-busybox
@@ -243,7 +255,7 @@ chunks:
 - name: binutils
   morph: strata/build-essential/binutils.morph
   repo: upstream:binutils-redhat
-  ref: 987eb543a034cddc4eeb103f08f566f24a5f964a
+  ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8
   unpetrify-ref: baserock/build-essential
   build-depends:
   - stage2-binutils
@@ -289,11 +301,25 @@ chunks:
   - stage2-make
   - stage2-reset-specs
   - glibc
+- name: m4-tarball
+  morph: strata/build-essential/m4-tarball.morph
+  repo: upstream:m4-tarball
+  ref: 23c11479b3ad787adc7a651ee0c4347839e47723
+  unpetrify-ref: m4-1.4.17
+  build-depends:
+  - stage2-binutils
+  - stage2-busybox
+  - stage2-glibc
+  - stage2-fhs-dirs
+  - stage2-gcc
+  - stage2-make
+  - stage2-reset-specs
+  - glibc
 - name: gcc
   morph: strata/build-essential/gcc.morph
   repo: upstream:gcc-tarball
-  ref: 5c08cea34d5562dc828b85c7c02519246823aaf0
-  unpetrify-ref: baserock/build-essential-4.7
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+  unpetrify-ref: baserock/build-essential
   build-depends:
   - stage2-binutils
   - stage2-busybox
@@ -306,6 +332,7 @@ chunks:
   - stage2-reset-specs
   - glibc
   - zlib
+  - m4-tarball
   artifacts:
     gcc-libs: build-essential-minimal
 - name: make
diff --git a/strata/build-essential/gcc.morph b/strata/build-essential/gcc.morph
index c57edb61..4dccd185 100644
--- a/strata/build-essential/gcc.morph
+++ b/strata/build-essential/gcc.morph
@@ -3,22 +3,30 @@ kind: chunk
 configure-commands:
 - mkdir o
 - |
-  cd o && \
-  ../configure \
-    $(../morph-arch-config) \
-    --prefix="$PREFIX" \
-    `# [1]` --libdir=$PREFIX/lib \
-    --disable-nls \
-    --enable-languages=c,c++,fortran \
-    --enable-shared --enable-threads=posix \
-    `# [2]` --disable-multilib \
-    `# [3]` --disable-libgomp --without-cloog --without-ppl \
-    `# [4]` --enable-__cxa_atexit \
-    `# [5]` --with-mpfr-include="$(pwd)/../mpfr/src" \
-            --with-mpfr-lib="$(pwd)/mpfr/src/.libs" \
-    `# [6]` --with-system-zlib
+  case "$MORPH_ARCH" in
+      armv7lhf) ARCH_FLAGS="--with-arch=armv7-a \
+                            --with-cpu=cortex-a9 \
+                            --with-tune=cortex-a9 \
+                            --with-fpu=vfpv3-d16 \
+                            --with-float=hard" ;;
+      armv7*)   ARCH_FLAGS="--with-arch=armv7-a" ;;
+  esac
+
+  cd o && ../configure                                        \
+            $ARCH_FLAGS                                       \
+            --prefix="$PREFIX"                                \
+    `# [1]` --libdir=$PREFIX/lib                              \
+            --disable-bootstrap                               \
+    `# [2]` --with-system-zlib                                \
+    `# [3]` --disable-multilib                                \
+            --enable-languages=c,c++,fortran
 build-commands:
-- cd o && make
+- |
+  case "$MORPH_ARCH" in
+      armv7*)   sed -i "s/--host=none/--host=armv7a/" o/Makefile
+                sed -i "s/--target=none/--target=armv7a/" o/Makefile ;;
+  esac
+  cd o && make
 install-commands:
 - cd o && make DESTDIR="$DESTDIR" install
 - ln -s gcc "$DESTDIR/$PREFIX/bin/cc"
diff --git a/strata/build-essential/linux-api-headers.morph b/strata/build-essential/linux-api-headers.morph
index e1ff2638..0f7ce171 100644
--- a/strata/build-essential/linux-api-headers.morph
+++ b/strata/build-essential/linux-api-headers.morph
@@ -1,6 +1,20 @@
 name: linux-api-headers
 kind: chunk
 install-commands:
-- ARCH=$(./morph-arch) make INSTALL_HDR_PATH=dest headers_install
+- |
+  case "$MORPH_ARCH" in
+      armv7b|armv7l|armv7lhf)
+          ARCH="arm" ;;
+      x86_32)
+          ARCH="i386" ;;
+      x86_64)
+          ARCH="x86_64" ;;
+      ppc64)
+          ARCH="powerpc" ;;
+      *)
+          echo "Error: unsupported Morph architecture: $MORPH_ARCH" >&2
+          exit 1
+  esac
+  ARCH=$ARCH make INSTALL_HDR_PATH=dest headers_install
 - install -d "$DESTDIR${PREFIX-/usr}/include"
 - cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
diff --git a/strata/core/autoconf.morph b/strata/build-essential/m4-tarball.morph
index 046bfc40..e460a9dc 100644
--- a/strata/core/autoconf.morph
+++ b/strata/build-essential/m4-tarball.morph
@@ -1,4 +1,4 @@
-name: autoconf
+name: m4-tarball
 kind: chunk
 build-system: autotools
 configure-commands:
diff --git a/strata/build-essential/stage1-binutils.morph b/strata/build-essential/stage1-binutils.morph
index d3e73a87..cef40164 100644
--- a/strata/build-essential/stage1-binutils.morph
+++ b/strata/build-essential/stage1-binutils.morph
@@ -7,4 +7,4 @@ configure-commands:
     --build=$(sh config.guess) \
     --host=$(sh config.guess) \
     --target=$TARGET_STAGE1 \
-    --with-sysroot="/" --with-lib-path="=$PREFIX/lib"
+    --with-sysroot=/nonexistentdir --with-lib-path="=$PREFIX/lib:=$PREFIX/lib64"
diff --git a/strata/build-essential/stage1-gcc.morph b/strata/build-essential/stage1-gcc.morph
index 0e0c2d81..7fa628f3 100644
--- a/strata/build-essential/stage1-gcc.morph
+++ b/strata/build-essential/stage1-gcc.morph
@@ -1,30 +1,57 @@
 name: stage1-gcc
 kind: chunk
 configure-commands:
+- sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' gcc/configure
 - mkdir o
 - |
-  cd o &&
-  ../configure \
-    $(../morph-arch-config) \
-    --build=$(sh ../config.guess) --host=$(sh ../config.guess) \
-    --target=$TARGET_STAGE1 \
-    --prefix="$PREFIX" \
-    --disable-bootstrap --disable-nls \
-    `# [1]` --libdir="$PREFIX/lib" --disable-multilib --disable-libgomp \
-            --without-cloog --without-ppl \
-            --with-mpfr-include="$(pwd)/../mpfr/src" \
-            --with-mpfr-lib="$(pwd)/mpfr/src/.libs" \
-    `# [2]` --with-local-prefix="$PREFIX" \
-    `# [3]` --with-native-system-header-dir="$PREFIX/include" \
-    `# [4]` --enable-languages=c --disable-decimal-float \
-            --disable-libmudflap --disable-libquadmath --disable-libssp \
-            --disable-shared --disable-threads --disable-target-libiberty \
-            --disable-target-zlib --without-headers --with-newlib \
-            --with-system-zlib
+  case "$MORPH_ARCH" in
+      armv7lhf) ARCH_FLAGS="--with-arch=armv7-a \
+                            --with-cpu=cortex-a9 \
+                            --with-tune=cortex-a9 \
+                            --with-fpu=vfpv3-d16 \
+                            --with-float=hard" ;;
+      armv7*)   ARCH_FLAGS="--with-arch=armv7-a" ;;
+  esac
+
+  cd o && ../configure                                        \
+            $ARCH_FLAGS                                       \
+            --build=$(sh ../config.guess)                     \
+            --host=$(sh ../config.guess)                      \
+            --target=$TARGET_STAGE1                           \
+            --prefix="$PREFIX"                                \
+    `# [1]` --libdir="$PREFIX/lib"                            \
+    `# [2]` --with-sysroot=/nonexistentdir                    \
+            --with-newlib                                     \
+    `# [3]` --with-local-prefix="$PREFIX"                     \
+    `# [4]` --with-native-system-header-dir="$PREFIX/include" \
+            --without-headers                                 \
+            --disable-nls                                     \
+            --disable-shared                                  \
+            --disable-multilib                                \
+    `# [5]` --disable-decimal-float                           \
+    `# [5]` --disable-threads                                 \
+    `# [5]` --disable-libatomic                               \
+    `# [5]` --disable-libgomp                                 \
+    `# [5]` --disable-libitm                                  \
+    `# [5]` --disable-libquadmath                             \
+    `# [5]` --disable-libsanitizer                            \
+    `# [5]` --disable-libssp                                  \
+    `# [5]` --disable-libvtv                                  \
+    `# [5]` --disable-libcilkrts                              \
+    `# [5]` --disable-libstdc++-v3                            \
+            --enable-languages=c,c++
 build-commands:
-- cd o && make
+- |
+  # GCC is not passing the correct host/target flags to GMP's configure
+  # script, which causes it to not use the machine-dependent code for
+  # the platform and use the generic one instead.  However, the generic
+  # code results on an undefined reference to `__gmpn_invert_limb' in
+  # ARMv7.  Fix the invocation of GMP's configure script so that GMP can
+  # use the machine-dependent code.
+  case "$MORPH_ARCH" in
+      armv7*)   sed -i "s/--host=none/--host=armv7a/" o/Makefile
+                sed -i "s/--target=none/--target=armv7a/" o/Makefile ;;
+  esac
+  cd o && make
 install-commands:
 - cd o && make DESTDIR="$DESTDIR" install
-- |
-  libgcc_filename=$($DESTDIR$PREFIX/bin/$TARGET_STAGE1-gcc -print-libgcc-file-name)
-  ln -sv libgcc.a $(echo $libgcc_filename | sed 's/libgcc/&_eh/')
diff --git a/strata/build-essential/stage2-binutils.morph b/strata/build-essential/stage2-binutils.morph
index a3701b2c..d738ded7 100644
--- a/strata/build-essential/stage2-binutils.morph
+++ b/strata/build-essential/stage2-binutils.morph
@@ -4,9 +4,11 @@ build-system: autotools
 configure-commands:
 - |
   export STAGE2_SYSROOT="$(dirname $(pwd))"
-  export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
   export CXX=false
-  export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
+  # binutils has its own embedded libtool, which is old and strips out
+  # `--sysroot`.  Work around by modifying the compiler command to
+  # include the sysroot flag
+  export CC="$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT"
   ./configure --prefix="$PREFIX" --disable-nls --disable-werror \
     --build=$(sh config.guess) \
     --host=$TARGET_STAGE1 \
@@ -14,6 +16,4 @@ configure-commands:
 build-commands:
 - |
   export STAGE2_SYSROOT="$(dirname $(pwd))"
-  export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
-  export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
   make
diff --git a/strata/build-essential/stage2-busybox.morph b/strata/build-essential/stage2-busybox.morph
index 7d17ea40..999a3118 100644
--- a/strata/build-essential/stage2-busybox.morph
+++ b/strata/build-essential/stage2-busybox.morph
@@ -45,13 +45,13 @@ build-commands:
 - |
   export STAGE2_SYSROOT="$(dirname $(pwd))"
   export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
-  export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
+  export LDFLAGS="--sysroot=$STAGE2_SYSROOT"
   make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1-
 install-commands:
 - |
   export STAGE2_SYSROOT="$(dirname $(pwd))"
   export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
-  export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
+  export LDFLAGS="--sysroot=$STAGE2_SYSROOT"
   make CONFIG_PREFIX="$DESTDIR$PREFIX" \
        HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- install &&
   chmod 6755 "$DESTDIR$PREFIX"/bin/busybox
diff --git a/strata/build-essential/stage2-gawk.morph b/strata/build-essential/stage2-gawk.morph
index f644d72b..15c838b6 100644
--- a/strata/build-essential/stage2-gawk.morph
+++ b/strata/build-essential/stage2-gawk.morph
@@ -3,7 +3,7 @@ kind: chunk
 build-system: autotools
 configure-commands:
 - STAGE2_SYSROOT="$(dirname $(pwd))" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false
-  LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT" ./configure --prefix="$PREFIX" --disable-nls
+  LDFLAGS="--sysroot=$STAGE2_SYSROOT" ./configure --prefix="$PREFIX" --disable-nls
   --build=$(sh config.guess)  --host=$TARGET_STAGE1
 build-commands:
 - STAGE2_SYSROOT="$(dirname $(pwd))" make
diff --git a/strata/build-essential/stage2-gcc.morph b/strata/build-essential/stage2-gcc.morph
index e342d648..d1246d26 100644
--- a/strata/build-essential/stage2-gcc.morph
+++ b/strata/build-essential/stage2-gcc.morph
@@ -3,27 +3,40 @@ kind: chunk
 configure-commands:
 - mkdir o
 - |
+  case "$MORPH_ARCH" in
+      armv7lhf) ARCH_FLAGS="--with-arch=armv7-a \
+                            --with-cpu=cortex-a9 \
+                            --with-tune=cortex-a9 \
+                            --with-fpu=vfpv3-d16 \
+                            --with-float=hard" ;;
+      armv7*)   ARCH_FLAGS="--with-arch=armv7-a" ;;
+  esac
   export STAGE2_SYSROOT="$(dirname $(pwd))"
   export CC="$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT"
-  export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
-  cd o && ../configure \
-    $(../morph-arch-config) \
-    `# [1]` --build=$(sh ../config.guess) \
-            --host=$TARGET_STAGE1 \
-            --target=$TARGET_STAGE1 \
-    --prefix="$PREFIX" \
-    `# [2]` --with-local-prefix=$PREFIX \
-    `# [3]` --with-build-sysroot="$STAGE2_SYSROOT" \
-    --disable-bootstrap \
-    --enable-clocale=gnu --enable-shared --enable-threads=posix \
-    `# [4]` --enable-languages=c \
-    `# [5]` --libdir=$PREFIX/lib \
-            --disable-libgomp --disable-multilib --disable-nls \
-            --without-cloog --without-ppl \
-            --with-mpfr-include="$(pwd)/../mpfr/src" \
-            --with-mpfr-lib="$(pwd)/mpfr/src/.libs"
+  export CXX="$TARGET_STAGE1-g++ --sysroot=$STAGE2_SYSROOT"
+  export AR="$TARGET_STAGE1-ar"
+  export RANLIB="$TARGET_STAGE1-ranlib"
+  cd o && ../configure                                         \
+            $ARCH_FLAGS                                        \
+            --build=$(sh ../config.guess)                      \
+    `# [1]` --host=$TARGET_STAGE1                              \
+    `# [1]` --target=$TARGET_STAGE1                            \
+            --prefix="$PREFIX"                                 \
+    `# [2]` --libdir=$PREFIX/lib                               \
+    `# [3]` --with-local-prefix=$PREFIX                        \
+    `# [4]` --with-build-sysroot="$STAGE2_SYSROOT"             \
+            --disable-bootstrap                                \
+            --disable-nls                                      \
+            --disable-multilib                                 \
+            --disable-libgomp                                  \
+            --disable-libstdcxx-pch                            \
+            --enable-languages=c,c++
 build-commands:
 - |
+  case "$MORPH_ARCH" in
+      armv7*)   sed -i "s/--host=none/--host=armv7a/" o/Makefile
+                sed -i "s/--target=none/--target=armv7a/" o/Makefile ;;
+  esac
   export STAGE2_SYSROOT="$(dirname $(pwd))"
   cd o && make
 install-commands:
diff --git a/strata/build-essential/stage2-libstdc++.morph b/strata/build-essential/stage2-libstdc++.morph
new file mode 100644
index 00000000..b747f22b
--- /dev/null
+++ b/strata/build-essential/stage2-libstdc++.morph
@@ -0,0 +1,25 @@
+name: stage2-libstdc++
+kind: chunk
+configure-commands:
+- mkdir o
+- |
+  export STAGE2_SYSROOT="$(dirname $(pwd))"
+  # -fPIC must be given, otherwise it will not be possible to create
+  # shared libraries linked to libstdc++
+  export CPPFLAGS="--sysroot=$STAGE2_SYSROOT -fPIC"
+  export LDFLAGS="--sysroot=$STAGE2_SYSROOT"
+  cd o && ../libstdc++-v3/configure                           \
+            --build=$(sh ../config.guess)                     \
+            --host="$TARGET_STAGE1"                           \
+            --target="$TARGET_STAGE1"                         \
+            --prefix="$PREFIX"                                \
+            --disable-nls                                     \
+            --disable-shared                                  \
+            --disable-multilib                                \
+    `# [1]` --disable-libstdcxx-threads                       \
+    `# [2]` --disable-libstdcxx-pch                           \
+    `# [3]` --with-gxx-include-dir=/tools/"$TARGET_STAGE1"/include/c++/4.9.2
+build-commands:
+- cd o && make
+install-commands:
+- cd o && make DESTDIR="$DESTDIR" install
diff --git a/strata/build-essential/stage2-linux-api-headers.morph b/strata/build-essential/stage2-linux-api-headers.morph
index 5cbf2f05..50e1aaa5 100644
--- a/strata/build-essential/stage2-linux-api-headers.morph
+++ b/strata/build-essential/stage2-linux-api-headers.morph
@@ -2,7 +2,19 @@ name: stage2-linux-api-headers
 kind: chunk
 install-commands:
 - |
-  export ARCH=$(./morph-arch)
-  make INSTALL_HDR_PATH=dest headers_install
+  case "$MORPH_ARCH" in
+      armv7b|armv7l|armv7lhf)
+          ARCH="arm" ;;
+      x86_32)
+          ARCH="i386" ;;
+      x86_64)
+          ARCH="x86_64" ;;
+      ppc64)
+          ARCH="powerpc" ;;
+      *)
+          echo "Error: unsupported Morph architecture: $MORPH_ARCH" >&2
+          exit 1
+  esac
+  ARCH=$ARCH make INSTALL_HDR_PATH=dest headers_install
 - install -d "$DESTDIR${PREFIX-/usr}/include"
 - cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
diff --git a/strata/build-essential/stage2-make.morph b/strata/build-essential/stage2-make.morph
index d3c8bf22..0b05581c 100644
--- a/strata/build-essential/stage2-make.morph
+++ b/strata/build-essential/stage2-make.morph
@@ -3,7 +3,7 @@ kind: chunk
 build-system: autotools
 configure-commands:
 - STAGE2_SYSROOT="$(dirname $(pwd))" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false
-  LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT" ./configure --prefix="$PREFIX" --disable-nls
+  LDFLAGS="--sysroot=$STAGE2_SYSROOT" ./configure --prefix="$PREFIX" --disable-nls
   --build=$(sh config/config.guess) --host=$TARGET_STAGE1
 build-commands:
 - STAGE2_SYSROOT="$(dirname $(pwd))" make
diff --git a/strata/core.morph b/strata/core.morph
index f9db0399..7bd45767 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -7,8 +7,8 @@ build-depends:
 chunks:
 - name: sqlite3
   repo: upstream:sqlite3
-  ref: f6c2a9fe49d20654c2c41844d056033692a223b7
-  unpetrify-ref: baserock/morph
+  ref: 24adc227bc29cd17e39df097fbca389c7724cd14
+  unpetrify-ref: sqlite-autoconf-3080801
   build-depends: []
 - name: cmake
   morph: strata/core/cmake.morph
@@ -22,17 +22,11 @@ chunks:
   ref: 51871d08a48ff781186f7a7b22ec69a1db38eb4c
   unpetrify-ref: baserock/build-essential
   build-depends: []
-- name: gettext
-  morph: strata/core/gettext.morph
-  repo: upstream:gettext
-  ref: 3898e324f07c05404b63d71f0e519f352fb1e072
-  unpetrify-ref: baserock/build-essential
-  build-depends: []
-- name: m4
-  morph: strata/core/m4.morph
-  repo: upstream:m4
-  ref: cfbd353f3a2dc517992bcdc747281a22feb0c4db
-  unpetrify-ref: baserock/build-essential
+- name: gettext-tarball
+  morph: strata/core/gettext-tarball.morph
+  repo: upstream:gettext-tarball
+  ref: 482840e61f86ca321838a91e902c41d40c098bbb
+  unpetrify-ref: gettext-0.19.4
   build-depends: []
 - name: mini-utils
   morph: strata/core/mini-utils.morph
@@ -53,12 +47,6 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends:
   - gdbm
-- name: pkg-config
-  morph: strata/core/pkg-config.morph
-  repo: upstream:pkg-config
-  ref: 67a702a15cf88e270539484929ffa1f42b90c728
-  unpetrify-ref: baserock/build-essential
-  build-depends: []
 - name: texinfo-tarball
   morph: strata/core/texinfo-tarball.morph
   repo: upstream:texinfo-tarball
@@ -66,13 +54,12 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends:
   - ncurses
-- name: autoconf
-  morph: strata/core/autoconf.morph
-  repo: upstream:autoconf
-  ref: cffdb90be331111ce3fbe4a32320181ec2b92652
-  unpetrify-ref: baserock/build-essential
+- name: autoconf-tarball
+  morph: strata/core/autoconf-tarball.morph
+  repo: upstream:autoconf-tarball
+  ref: 55d1d2c339bc5f935f6d8d702e98b7bd5d968e9d
+  unpetrify-ref: autoconf-2.69
   build-depends:
-  - m4
   - perl
 - name: automake
   morph: strata/core/automake.morph
@@ -80,7 +67,7 @@ chunks:
   ref: ba4b42faff673e3e5265416dff09e59affc688fb
   unpetrify-ref: v1.14.1
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - perl
   - texinfo-tarball
 - name: bash
@@ -94,8 +81,7 @@ chunks:
   repo: upstream:flex
   ref: de10f98e8a2dc2a021796811490d0f30c3cd90bf
   unpetrify-ref: baserock/build-essential
-  build-depends:
-  - m4
+  build-depends: []
 - name: openssl-new
   morph: strata/core/openssl-new.morph
   repo: upstream:openssl-new
@@ -125,11 +111,11 @@ chunks:
   - sqlite3
   - ncurses
   - readline
-- name: libtool
-  morph: strata/core/libtool.morph
-  repo: upstream:libtool
-  ref: d388b7f2dc628b22006025d01179bc09b8aabe81
-  unpetrify-ref: baserock/build-essential
+- name: libtool-tarball
+  morph: strata/core/libtool-tarball.morph
+  repo: upstream:libtool-tarball
+  ref: f7bbc21981ffdbbe2d4435556e3ead0828dce160
+  unpetrify-ref: libtool-2.4.5
   build-depends:
   - bash
 - name: gtk-doc-stub
@@ -137,28 +123,27 @@ chunks:
   ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0
   unpetrify-ref: baserock/morph
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
-  - libtool
+  - libtool-tarball
 - name: xz
-  morph: strata/core/xz.morph
   repo: upstream:xz
-  ref: 581deedf9d1eadcd84c4fcd23b9fdfe2dde18cc2
-  unpetrify-ref: baserock/morph
+  ref: a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
+  unpetrify-ref: v5.2.0
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
-  - gettext
-  - libtool
+  - gettext-tarball
+  - libtool-tarball
 - name: libxml2
   repo: upstream:libxml2
   ref: ee8f1d4cda8dc1a6f2c515fe234f7bc89cdc9f80
   unpetrify-ref: baserock/morph
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
   - cpython
-  - libtool
+  - libtool-tarball
   - xz
 - name: ca-certificates
   morph: strata/core/ca-certificates.morph
@@ -174,9 +159,9 @@ chunks:
   ref: 202aa9f7758636730299b86715d924f54468a908
   unpetrify-ref: curl-7_38_0
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
-  - libtool
+  - libtool-tarball
   - openssl-new
   - ca-certificates
 - name: libexpat
@@ -185,9 +170,9 @@ chunks:
   ref: 97678ab13f6d29878997256b6ae1ded679ae5c5c
   unpetrify-ref: baserock/morph
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
-  - libtool
+  - libtool-tarball
 - name: XML-Parser
   repo: upstream:XML-Parser
   ref: e1a3ec157140a699e3020836475a0df622f70f1b
@@ -202,10 +187,10 @@ chunks:
   ref: 49c3e926349e964b311b46251bb2b97d3d669855
   unpetrify-ref: v2.1.3
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - cpython
   - curl
-  - gettext
+  - gettext-tarball
   - libexpat
   - openssl-new
 - name: help2man
@@ -214,7 +199,7 @@ chunks:
   ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71
   unpetrify-ref: baserock/morph
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
 - name: bison
   morph: strata/core/bison.morph
@@ -222,11 +207,11 @@ chunks:
   ref: 2ab6d1daaccf32fc4314e4b2fe44da977f11a308
   unpetrify-ref: baserock/v3.0.2
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
   - bash
   - flex
-  - gettext
+  - gettext-tarball
   - git
   - help2man
   - mini-utils
@@ -242,20 +227,29 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends:
   - XML-Parser
-  - autoconf
+  - autoconf-tarball
   - automake
   - perl
+- name: pkg-config
+  morph: strata/core/pkg-config.morph
+  repo: upstream:pkg-config
+  ref: 74ceac54ef6f9247c00f08eecd8cca811a3c5934
+  unpetrify-ref: pkg-config-0.28
+  build-depends:
+  - autoconf-tarball
+  - automake
+  - libtool-tarball
 - name: util-linux
   morph: strata/core/util-linux.morph
   repo: upstream:util-linux
   ref: c5c1033c5c7deda8abe3448ec81bbb33c72219e0
   unpetrify-ref: baserock/morph
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
-  - gettext
+  - gettext-tarball
   - git
-  - libtool
+  - libtool-tarball
   - pkg-config
 - name: nano
   repo: upstream:nano-tarball
@@ -290,10 +284,10 @@ chunks:
   ref: 4f5000a45963c2cc2a403ad23e459f20296b29c2
   unpetrify-ref: baserock/4.2
   build-depends:
-  - autoconf
+  - autoconf-tarball
   - automake
-  - gettext
-  - libtool
+  - gettext-tarball
+  - libtool-tarball
   - bison
 - name: patch
   morph: strata/core/patch.morph
diff --git a/strata/core/libtool.morph b/strata/core/autoconf-tarball.morph
index f311281d..fbdc5768 100644
--- a/strata/core/libtool.morph
+++ b/strata/core/autoconf-tarball.morph
@@ -1,6 +1,5 @@
-name: libtool
+name: autoconf-tarball
 kind: chunk
-max-jobs: 1
 build-system: autotools
 configure-commands:
 - ./configure --prefix="$PREFIX"
diff --git a/strata/core/m4.morph b/strata/core/gettext-tarball.morph
index b76afbe4..4983b484 100644
--- a/strata/core/m4.morph
+++ b/strata/core/gettext-tarball.morph
@@ -1,5 +1,5 @@
-name: m4
+name: gettext-tarball
 kind: chunk
 build-system: autotools
 configure-commands:
-- ./configure --prefix="$PREFIX" --disable-nls
+- ./configure --prefix="$PREFIX"
diff --git a/strata/core/gettext.morph b/strata/core/gettext.morph
deleted file mode 100644
index 3e2c56b5..00000000
--- a/strata/core/gettext.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: gettext
-kind: chunk
-max-jobs: 1
-configure-commands:
-- ./configure --prefix=/usr
-build-commands:
-- make EXAMPLESPOFILES=
-install-commands:
-- make EXAMPLESPOFILES= DESTDIR="$DESTDIR" install
diff --git a/strata/core/libtool-tarball.morph b/strata/core/libtool-tarball.morph
new file mode 100644
index 00000000..65a3edbc
--- /dev/null
+++ b/strata/core/libtool-tarball.morph
@@ -0,0 +1,5 @@
+name: libtool-tarball
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX"
diff --git a/strata/core/pkg-config.morph b/strata/core/pkg-config.morph
index 090a65e5..ed35a2ac 100644
--- a/strata/core/pkg-config.morph
+++ b/strata/core/pkg-config.morph
@@ -2,4 +2,4 @@ name: pkg-config
 kind: chunk
 build-system: autotools
 configure-commands:
-- ./configure --prefix="$PREFIX" --with-internal-glib
+- ./autogen.sh --prefix="$PREFIX" --with-internal-glib
diff --git a/strata/core/xz.morph b/strata/core/xz.morph
deleted file mode 100644
index 8165abdc..00000000
--- a/strata/core/xz.morph
+++ /dev/null
@@ -1,3 +0,0 @@
-name: xz
-kind: chunk
-build-system: autotools
diff --git a/strata/coreutils-common/coreutils.morph b/strata/coreutils-common/coreutils.morph
index 479e9925..08808333 100644
--- a/strata/coreutils-common/coreutils.morph
+++ b/strata/coreutils-common/coreutils.morph
@@ -5,5 +5,7 @@ configure-commands:
 - sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
 - bash bootstrap --skip-po
 - FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix="$PREFIX" --disable-nls
+build-commands:
+- make WERROR_CFLAGS=
 install-commands:
 - make INSTALL_PROGRAM=install DESTDIR="$DESTDIR" install
diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph
index 845e7fab..541b4f7a 100644
--- a/strata/enlightenment.morph
+++ b/strata/enlightenment.morph
@@ -28,7 +28,6 @@ chunks:
   build-depends:
   - bullet3
   - fribidi
-  - luajit2
 - name: elementary
   morph: strata/enlightenment/elementary.morph
   repo: upstream:enlightenment/elementary
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 71358ea3..9738938b 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -35,23 +35,12 @@ chunks:
   ref: 77d4586cc47e8f4c02278afbc220145bba0d442b
   unpetrify-ref: baserock/morph
   build-depends: []
-- name: libusbx
-  repo: upstream:libusbx
-  ref: 7ec94a45ed8155e7a1d4d5d75575099b09c78834
-  unpetrify-ref: baserock/morph
-  build-depends: []
 - name: pciutils
   morph: strata/foundation/pciutils.morph
   repo: upstream:pciutils
   ref: bae04bd0473c68a2f21b7712a627abb08fd84b29
   unpetrify-ref: baserock/morph
   build-depends: []
-- name: usbutils
-  repo: upstream:usbutils
-  ref: 410f1474af0ddb391bc6ec391777f116eee31569
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - libusbx
 - name: glib
   repo: upstream:glib
   ref: 4125415e7f4d1213fc7122beac0d91af08e37b28
@@ -89,6 +78,18 @@ chunks:
   - kmod
   - libcap2
   - libgcrypt
+- name: libusb
+  repo: upstream:libusb
+  ref: e11525c66c7dd2db466c8f5785ff0b37d6a99ec9
+  unpetrify-ref: v1.0.19
+  build-depends:
+  - systemd
+- name: usbutils
+  repo: upstream:usbutils
+  ref: c37f146eb2c6642c600f1b025a6d56996b0697ff
+  unpetrify-ref: baserock/v008
+  build-depends:
+  - libusb
 - name: lzo
   morph: strata/foundation/lzo.morph
   repo: upstream:lzo
@@ -98,8 +99,8 @@ chunks:
 - name: fuse
   morph: strata/foundation/fuse.morph
   repo: upstream:fuse
-  ref: fuse_2_9_2
-  unpetrify-ref: baserock/genivi/morph
+  ref: 4163109fd5bfe67973262610dd95ae60888c92e9
+  unpetrify-ref: fuse_2_9_bugfix
   build-depends: []
 - name: btrfs-progs
   morph: strata/foundation/btrfs-progs.morph
diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph
index b187df8f..9fc05b7c 100644
--- a/strata/graphics-common.morph
+++ b/strata/graphics-common.morph
@@ -2,6 +2,7 @@ name: graphics-common
 kind: stratum
 build-depends:
 - morph: strata/mesa-common.morph
+- morph: strata/x-common.morph
 chunks:
 - name: pixman
   repo: upstream:pixman
diff --git a/strata/lorry.morph b/strata/lorry.morph
index bbe6d845..470a0cca 100644
--- a/strata/lorry.morph
+++ b/strata/lorry.morph
@@ -111,7 +111,7 @@ chunks:
 - name: lorry
   morph: strata/lorry/lorry.morph
   repo: baserock:baserock/lorry
-  ref: c972012707f6555de6cf636d8eb5e2bf6e8ebf87
+  ref: 4fcff82742ce3325a860c060b597ff281872c594
   unpetrify-ref: master
   build-depends:
   - bzr-tarball
diff --git a/strata/lvm.morph b/strata/lvm.morph
new file mode 100644
index 00000000..8c1c3f67
--- /dev/null
+++ b/strata/lvm.morph
@@ -0,0 +1,16 @@
+name: lvm
+kind: stratum
+description: |
+  LVM userland tools.
+
+  LVM is a logical volume manager for the Linux kernel. This stratum contains
+  the tools necessary to manage volumes with LVM.
+build-depends:
+- morph: strata/foundation.morph
+chunks:
+- name: lvm2
+  morph: strata/lvm/lvm2.morph
+  repo: upstream:lvm2
+  ref: fa01faaa4aa96de834ba7e8fbb9d9aff908571c3
+  unpetrify-ref: v2_02_115
+  build-depends: []
diff --git a/strata/lvm/lvm2.morph b/strata/lvm/lvm2.morph
new file mode 100644
index 00000000..86a0e83f
--- /dev/null
+++ b/strata/lvm/lvm2.morph
@@ -0,0 +1,18 @@
+name: lvm2
+kind: chunk
+build-system: autotools
+configure-commands:
+- |
+  ./configure --prefix="$PREFIX" \
+    --sbindir="$PREFIX"/sbin \
+    --with-udev-prefix=/ \
+    --with-systemdsystemunitdir="$PREFIX"/lib/systemd/system \
+    --enable-applib --enable-cmdlib --enable-pkgconfig --enable-lvmetad \
+    --enable-dmeventd --enable-udev_sync
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- make DESTDIR="$DESTDIR" install_system_dirs
+- make DESTDIR="$DESTDIR" install_systemd_generators
+- make DESTDIR="$DESTDIR" install_systemd_units
+- make DESTDIR="$DESTDIR" install_tmpfiles_configuration
+- sed -e 's/use_lvmetad = 0/use_lvmetad = 1/' -i "$DESTDIR"/etc/lvm/lvm.conf
diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph
index 4d38c735..95d9807c 100644
--- a/strata/morph-utils.morph
+++ b/strata/morph-utils.morph
@@ -71,7 +71,7 @@ chunks:
   build-depends: []
 - name: morph
   repo: baserock:baserock/morph
-  ref: f2f3e4e5f3d5162890d03494f405cff5177aaad8
+  ref: f0c5d4c0ef35cc43aa059cd2255e41c60c4cac77
   unpetrify-ref: master
   build-depends:
   - cliapp
diff --git a/strata/ostree-core.morph b/strata/ostree-core.morph
new file mode 100644
index 00000000..74feb840
--- /dev/null
+++ b/strata/ostree-core.morph
@@ -0,0 +1,14 @@
+name: ostree-core
+kind: stratum
+build-depends:
+- morph: strata/virtualization.morph
+chunks:
+- name: libgsystem
+  repo: upstream:libgsystem
+  ref: master
+  build-depends: []
+- name: ostree
+  repo: upstream:ostree
+  ref: master
+  build-depends:
+  - libgsystem
diff --git a/strata/qt5-sdk.morph b/strata/qt5-sdk.morph
index 0d877a62..066f62a0 100644
--- a/strata/qt5-sdk.morph
+++ b/strata/qt5-sdk.morph
@@ -8,6 +8,6 @@ chunks:
 - name: qt-creator
   morph: strata/qt5-sdk/qt-creator.morph
   repo: upstream:qt-creator
-  ref: v3.2.1
-  unpetrify-ref: baserock/morph/2.7
+  ref: d81cd236df1cc6bc6977c438f0edbff35eef6682
+  unpetrify-ref: baserock/3.3.0
   build-depends: []
diff --git a/strata/tools.morph b/strata/tools.morph
index 0c4771dc..4d8c3f44 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -22,6 +22,7 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends: []
 - name: gdb
+  morph: strata/tools/gdb.morph
   repo: upstream:gdb
   ref: c4bf5268b1a32ec475b61d2fe90e9218780c03c8
   unpetrify-ref: baserock/morph
@@ -48,12 +49,18 @@ chunks:
   ref: ad232c6aa0c2a07830d61dc4b9912478634b23b5
   unpetrify-ref: baserock/morph
   build-depends: []
-- name: vala
-  morph: strata/tools/vala.morph
+- name: vala-bootstrap
+  morph: strata/tools/vala-bootstrap.morph
   repo: upstream:vala
   ref: 4e4a02c03445336237b36723b23a91670ef7621b
   unpetrify-ref: baserock/bootstrap
   build-depends: []
+- name: vala
+  repo: upstream:vala
+  ref: 682eba5880fbd76402dec10118883da913a7b255
+  unpetrify-ref: 0.26.2
+  build-depends:
+  - vala-bootstrap
 - name: u-boot
   morph: strata/tools/u-boot.morph
   repo: upstream:u-boot
diff --git a/strata/tools/e2fsprogs.morph b/strata/tools/e2fsprogs.morph
index 9d3b32a8..db1ea4cc 100644
--- a/strata/tools/e2fsprogs.morph
+++ b/strata/tools/e2fsprogs.morph
@@ -9,6 +9,7 @@ install-commands:
 - |
   td="$(mktemp -d)"
   make DESTDIR="$td" install
+  make DESTDIR="$td" install-libs
   find "$td" \( -name blkid -o -name findfs -o -name fsck \) -delete
   find "$td" \( -name blkid.8 -o -name findfs.8 \) -delete
   mv "$td"/* "$DESTDIR"
diff --git a/strata/tools/gdb.morph b/strata/tools/gdb.morph
new file mode 100644
index 00000000..8b82b9d9
--- /dev/null
+++ b/strata/tools/gdb.morph
@@ -0,0 +1,5 @@
+name: gdb
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --disable-werror
diff --git a/strata/tools/vala.morph b/strata/tools/vala-bootstrap.morph
index dcac5d49..c09299f6 100644
--- a/strata/tools/vala.morph
+++ b/strata/tools/vala-bootstrap.morph
@@ -1,4 +1,4 @@
-name: vala
+name: vala-bootstrap
 kind: chunk
 build-system: autotools
 configure-commands:
diff --git a/strata/virtualization.morph b/strata/virtualization.morph
index e3261f84..7aa8f6af 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.morph
@@ -16,19 +16,12 @@ chunks:
   ref: 1d4a2abc875c4dda1b5eadc0a097a48a8d2ec82b
   unpetrify-ref: master
   build-depends: []
-- name: lvm2
-  morph: strata/virtualization/lvm2.morph
-  repo: upstream:lvm2
-  ref: 8c5b90b50bdf9f1a7ae1d3c4cf58ce4b0d7c2768
-  unpetrify-ref: baserock/morph
-  build-depends: []
 - name: dnsmasq
   morph: strata/virtualization/dnsmasq.morph
   repo: upstream:dnsmasq
   ref: 8471cd938ca41fbe4fee8ae3f657625c92cfb954
   unpetrify-ref: baserock/morph
-  build-depends:
-  - lvm2
+  build-depends: []
 - name: qemu
   morph: strata/virtualization/qemu.morph
   repo: upstream:qemu
diff --git a/strata/virtualization/lvm2.morph b/strata/virtualization/lvm2.morph
deleted file mode 100644
index 49c166dc..00000000
--- a/strata/virtualization/lvm2.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: lvm2
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix="$PREFIX" --enable-applib --enable-cmdlib --enable-pkgconfig
-  --enable-dmeventd --enable-udev_sync
diff --git a/strata/weston-common/weston.morph b/strata/weston-common/weston.morph
index 2efd662e..c49b8d5b 100644
--- a/strata/weston-common/weston.morph
+++ b/strata/weston-common/weston.morph
@@ -4,6 +4,4 @@ build-system: autotools
 configure-commands:
 - |
   ./autogen.sh --prefix="$PREFIX" \
-  --disable-xwayland \
-  --disable-x11-compositor \
   --enable-demo-clients-install
diff --git a/strata/x-common.morph b/strata/x-common.morph
index 0382cd90..43e64a38 100644
--- a/strata/x-common.morph
+++ b/strata/x-common.morph
@@ -98,21 +98,11 @@ chunks:
   ref: f805b328b2195de384c0fb6b82ef5f88c179b2c0
   unpetrify-ref: baserock/morph
   build-depends: []
-- name: xorg-proto-xf86dgaproto
-  repo: upstream:xorg-proto-xf86dgaproto
-  ref: c52b205c3175309be7952774668c87dd2d5ce30e
-  unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-xf86driproto
   repo: upstream:xorg-proto-xf86driproto
   ref: cb03b8d49bf063860859c1ed8bcecd055551e93a
   unpetrify-ref: baserock/morph
   build-depends: []
-- name: xorg-proto-xf86vidmodeproto
-  repo: upstream:xorg-proto-xf86vidmodeproto
-  ref: 15c05b263eb6cc0eaa7ab49c39fe489613d6d796
-  unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-proto-x11proto
   repo: upstream:xorg-proto-x11proto
   ref: 03cbbf6c3e811c026c86e3a60d2f9af56606e155
@@ -165,13 +155,10 @@ chunks:
   unpetrify-ref: libX11-1.6.2
   build-depends:
   - xcb-libxcb
-  - xorg-lib-libXau
   - xorg-lib-libxtrans
-  - xorg-proto-bigreqsproto
   - xorg-proto-inputproto
   - xorg-proto-kbproto
   - xorg-proto-x11proto
-  - xorg-proto-xcmiscproto
   - xorg-proto-xextproto
   - xorg-proto-xf86bigfontproto
 - name: xorg-lib-libXext
@@ -193,12 +180,6 @@ chunks:
   - xorg-proto-inputproto
   - xorg-proto-x11proto
   - xorg-proto-xextproto
-- name: xorg-util-makedepend
-  repo: upstream:xorg-util-makedepend
-  ref: 87fd28cd5a5acfe6e91c97c4af0a469e1e86cbd5
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-proto-x11proto
 - name: xorg-lib-libXfixes
   repo: upstream:xorg-lib-libXfixes
   ref: 0cb446962381f750e05d97bfb974ca1e32481d5d
@@ -206,14 +187,6 @@ chunks:
   build-depends:
   - xorg-lib-libXext
   - xorg-proto-fixesproto
-- name: xorg-lib-libXcomposite
-  repo: upstream:xorg-lib-libXcomposite
-  ref: eda48b1bedaa344ada8e13930c9ab3058b836190
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-lib-libX11
-  - xorg-lib-libXfixes
-  - xorg-proto-compositeproto
 - name: xorg-lib-libXrender
   repo: upstream:xorg-lib-libXrender
   ref: 1af52cb334377611233d7dc156bc1e6f7923756d
@@ -232,24 +205,6 @@ chunks:
   - xorg-proto-randrproto
   - xorg-proto-renderproto
   - xorg-proto-xextproto
-- name: xorg-lib-libXinerama
-  repo: upstream:xorg-lib-libXinerama
-  ref: 470b9356af961ff7d3968b164aa73872b49a5dcc
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-lib-libX11
-  - xorg-lib-libXext
-  - xorg-proto-xextproto
-  - xorg-proto-xineramaproto
-- name: xorg-lib-libdmx
-  repo: upstream:xorg-lib-libdmx
-  ref: 9f470c92bc2d194c8abb9154f42864e6c82f43ef
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-lib-libX11
-  - xorg-lib-libXext
-  - xorg-proto-dmxproto
-  - xorg-proto-xextproto
 - name: xorg-lib-libXtst
   repo: upstream:xorg-lib-libXtst
   ref: 2aafac9474a0a0a0c39797862f823255918cf368
@@ -261,15 +216,6 @@ chunks:
   - xorg-proto-inputproto
   - xorg-proto-recordproto
   - xorg-proto-xextproto
-- name: xorg-lib-libXRes
-  repo: upstream:xorg-lib-libXRes
-  ref: 83e7693515369d57dcd11c2bb1f03563f51bc500
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-lib-libX11
-  - xorg-lib-libXext
-  - xorg-proto-resourceproto
-  - xorg-proto-xextproto
 - name: xorg-lib-libXdamage
   repo: upstream:xorg-lib-libXdamage
   ref: 0d35761dc39409b70e04dd0786aef6537f92976a
@@ -287,26 +233,3 @@ chunks:
   - xorg-proto-fixesproto
   - xorg-lib-libXau
   - xorg-lib-libX11
-- name: xorg-proto-printproto
-  repo: upstream:xorg-proto-printproto
-  ref: cca2ca69d2a6b4b133dba69d5330499fbfe88257
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: xorg-lib-libXp
-  repo: upstream:xorg-lib-libXp
-  ref: 41aab7d289aba2aaf3839e96d0c9e2f15ede4bd1
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-proto-printproto
-  - xorg-proto-xextproto
-  - xorg-lib-libXext
-  - xorg-lib-libX11
-- name: xorg-lib-libXScrnSaver
-  repo: upstream:xorg-lib-libXScrnSaver
-  ref: f388a2ff259ee1c1c6058762e900bb29550e8246
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-proto-scrnsaverproto
-  - xorg-proto-xextproto
-  - xorg-lib-libXext
-  - xorg-lib-libX11
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index 84f685b0..572932b4 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.morph
@@ -3,9 +3,15 @@ kind: stratum
 build-depends:
 - morph: strata/foundation.morph
 - morph: strata/libdrm-common.morph
+- morph: strata/mesa-common.morph
 - morph: strata/x-common.morph
 - morph: strata/graphics-common.morph
 chunks:
+- name: libepoxy
+  repo: upstream:libepoxy
+  ref: 7422de5b4be7b19d789136b3bb5f932de42db27c
+  unpetrify-ref: v1.2
+  build-depends: []
 - name: xorg-lib-libxkbfile
   repo: upstream:xorg-lib-libxkbfile
   ref: 7381c2f9013ef7784c78091fa671e652a62ca706
@@ -28,153 +34,19 @@ chunks:
   unpetrify-ref: libXfont-1.5.0
   build-depends:
   - xorg-lib-libfontenc
-- name: xorg-lib-libICE
-  repo: upstream:xorg-lib-libICE
-  ref: 1b1cf8072b2559e15ac440d5484a29a81d6918c6
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: xorg-lib-libSM
-  repo: upstream:xorg-lib-libSM
-  ref: 77ddd273239a629eeed7bd1d5b4509b1bd6d4e37
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-lib-libICE
-- name: xorg-lib-libXt
-  repo: upstream:xorg-lib-libXt
-  ref: ead50a9a274aa96bef94e57c4625be8e9288af4e
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-lib-libSM
-- name: xorg-lib-libXmu
-  repo: upstream:xorg-lib-libXmu
-  ref: 474d22468c90f99104873b4c5fd7b0f0d2cbf823
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-lib-libXt
-- name: xorg-lib-libXpm
-  repo: upstream:xorg-lib-libXpm
-  ref: 81608285e11f2455800001a965dfece878861162
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-lib-libXt
-- name: xorg-lib-libXaw
-  repo: upstream:xorg-lib-libXaw
-  ref: a5630e166921b5b5322b30fb152df01bb6536e42
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-lib-libXmu
-  - xorg-lib-libXpm
-  - xorg-lib-libXt
-- name: libsha1
-  repo: upstream:libsha1
-  ref: 17173732b9f1b2d4142de27913250b4563db2436
-  unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xserver
   morph: strata/x-generic/xserver.morph
   repo: upstream:xserver
   ref: 4393c7f1ba6140a02232f04fbb434a80d663a99d
   unpetrify-ref: xorg-server-1.16.2
   build-depends:
-  - libsha1
+  - libepoxy
   - xorg-font-util
-  - xorg-lib-libXaw
   - xorg-lib-libXfont
-  - xorg-lib-libXmu
-  - xorg-lib-libXpm
-  - xorg-lib-libXt
-  - xorg-lib-libfontenc
   - xorg-lib-libxkbfile
-- name: xorg-driver-xf86-video-cirrus
-  repo: upstream:xorg-driver-xf86-video-cirrus
-  ref: 6504929481eab616f064b5d661a057de74b8b488
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xserver
-- name: xorg-driver-xf86-video-fbdev
-  repo: upstream:xorg-driver-xf86-video-fbdev
-  ref: ac293412a01d87f87eb61f4adb9db7486a75d3fc
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xserver
-- name: xorg-driver-xf86-video-vesa
-  repo: upstream:xorg-driver-xf86-video-vesa
-  ref: 29a149544e2120a582043738d5b09dd80e896345
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xserver
-- name: xorg-driver-xf86-input-evdev
-  repo: upstream:xorg-driver-xf86-input-evdev
-  ref: 2b8b0df62ec554952784f2820fb4143c495232b0
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xserver
-- name: xorg-driver-xf86-input-keyboard
-  repo: upstream:xorg-driver-xf86-input-keyboard
-  ref: 4a954bc6a8fbc4aa50dfcabec011274252713204
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xserver
-- name: xorg-driver-xf86-input-mouse
-  repo: upstream:xorg-driver-xf86-input-mouse
-  ref: 585f4030d77accf2a4ba115729ca08da82217863
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xserver
 - name: xorg-app-xkbcomp
   repo: upstream:xorg-app-xkbcomp
   ref: 705b9bbb426410f9510601c7010da51184919b36
   unpetrify-ref: baserock/morph
   build-depends:
   - xorg-lib-libxkbfile
-- name: xkeyboard-config
-  repo: upstream:xkeyboard-config
-  ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-app-xkbcomp
-- name: xorg-app-xinit
-  repo: upstream:xorg-app-xinit
-  ref: 4e85bce64acef1fa0ddff04d59737444e942ff12
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: xorg-lib-libXft
-  repo: upstream:xorg-lib-libXft
-  ref: 214f9b5306d833e2787c75fe41dfdc9228fcb738
-  unpetrify-ref: libXft-2.3.2
-  build-depends: []
-- name: xcb-util
-  repo: upstream:xcb-util
-  ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: util-wm
-  repo: upstream:util-wm
-  ref: 18bde07dc7cb44617c0d159ccd9ef640804296e3
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: util-keysyms
-  morph: strata/x-generic/util-keysyms.morph
-  repo: upstream:util-keysyms
-  ref: 0be179eff4eadb99ee303891d1c29c4e4dd6fbab
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: util-image
-  repo: upstream:util-image
-  ref: 66b0caa72eb5011d89d0346424ea40b9e8e93816
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xcb-util
-- name: xterm
-  repo: upstream:xterm
-  ref: 7fc0a9529babac61d9a0b30e6ddb3c79e44af0e5
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-lib-libXaw
-  - xorg-lib-libxkbfile
-- name: xorg-app-xauth
-  repo: upstream:xorg-app-xauth
-  ref: 6dda11c17f2fdc47d43f269dccee98ec66cc8c4b
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-lib-libXmu
diff --git a/strata/x-generic/xserver.morph b/strata/x-generic/xserver.morph
index f8495057..ca678331 100644
--- a/strata/x-generic/xserver.morph
+++ b/strata/x-generic/xserver.morph
@@ -2,4 +2,12 @@ name: xserver
 kind: chunk
 build-system: autotools
 configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --with-sha1=libsha1 --disable-glx
+- |
+  ./autogen.sh --prefix="$PREFIX" \
+  --disable-glx \
+  --disable-xorg \
+  --disable-xvfb \
+  --disable-xnest \
+  --disable-xquartz \
+  --disable-xwin \
+  --enable-xwayland
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index 32ddfc56..1b725b0f 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -36,6 +36,10 @@ strata:
   morph: strata/python-tools.morph
 - name: devtools
   morph: strata/devtools.morph
+- name: virtualization
+  morph: strata/virtualization.morph
+- name: ostree-core
+  morph: strata/ostree-core.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph
index 9eabc403..b4e20ec7 100644
--- a/systems/gitlab-ci-runner.morph
+++ b/systems/gitlab-ci-runner.morph
@@ -27,6 +27,8 @@ strata:
   morph: strata/genivi.morph
 - name: tools
   morph: strata/tools.morph
+- name: lvm
+  morph: strata/lvm.morph
 - name: virtualization
   morph: strata/virtualization.morph
 - name: openstack-clients
diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph
index 491a34bc..b84eaeb5 100644
--- a/systems/weston-system-x86_64-generic.morph
+++ b/systems/weston-system-x86_64-generic.morph
@@ -33,6 +33,10 @@ strata:
   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
 configuration-extensions:
 - set-hostname
 - add-config-files