Firehose test commit

author: Firehose merge bot <firehose@merge.bot> 2015-09-11 14:53:48 +0000
committer: Firehose merge bot <firehose@merge.bot> 2015-09-11 14:53:48 +0000
commit: b4d53e2cc0e63babbc4b3fec8a68ae67f47fab00 (patch)
tree: 862c0d368c4d561b57b940d173152e1c541ba933 /strata
parent: 0fcbdc18897c838d5ef56be15f3a25c4f506c6fb (diff)
download: definitions-b4d53e2cc0e63babbc4b3fec8a68ae67f47fab00.tar.gz
226 files changed, 2548 insertions, 1488 deletions
diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph
index 93b94dff..9072966d 100644
--- a/strata/NetworkManager-common.morph
+++ b/strata/NetworkManager-common.morph
@@ -9,15 +9,23 @@ chunks:
   repo: upstream:libndp
   ref: f3a3a63d5b5abced8f75731d7b995606933c6e33
   unpetrify-ref: v1.4
+  build-system: autotools
 - name: readline6
   repo: upstream:readline
   ref: 7628b745a813aac53586b640da056a975f1c443e
   unpetrify-ref: readline-6.3
+  build-system: autotools
+- name: libgudev
+  repo: upstream:libgudev
+  ref: d722339aae9065a379acc0c421e8bbab866d5a38
+  unpetrify-ref: 230
+  build-system: autotools
 - name: NetworkManager
   morph: strata/NetworkManager-common/NetworkManager.morph
   repo: upstream:NetworkManager
   ref: acdaf78a068b6c65ba799a7098b867953db4801c
   unpetrify-ref: 1.0.0
   build-depends:
+  - libgudev
   - libndp
   - readline6
diff --git a/strata/apache-httpd-server.morph b/strata/apache-httpd-server.morph
index 7a403535..74aa72f5 100644
--- a/strata/apache-httpd-server.morph
+++ b/strata/apache-httpd-server.morph
@@ -11,7 +11,7 @@ chunks:
   repo: upstream:apache/apr
   ref: 3c818c6d7351f0130282d212a69035642f5fecad
   unpetrify-ref: trunk
-- name: httpd
+- name: httpd-server
   morph: strata/apache-httpd-server/httpd-server.morph
   repo: upstream:apache/httpd
   ref: 6d8e0b2fd95268fcba96326ba9dce7bb8f712c19
@@ -22,10 +22,12 @@ chunks:
   repo: upstream:python-packages/psutil
   ref: 2bc8555f0428af81c2d067aa76168ed7bc5e0179
   unpetrify-ref: release-2.2.0
+  build-system: python-distutils
 - name: mod_wsgi-metrics
   repo: upstream:python-packages/mod_wsgi-metrics
   ref: ec715eb593255229f9f45f3f323edbb845c691d8
   unpetrify-ref: 1.1.1
+  build-system: python-distutils
   build-depends:
   - psutil
 - name: mod_wsgi
@@ -35,5 +37,5 @@ chunks:
   unpetrify-ref: 4.4.5
   build-depends:
   - apr
-  - httpd
+  - httpd-server
   - mod_wsgi-metrics
diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph
index 591fa587..7112653a 100644
--- a/strata/armv7lhf-cross-toolchain.morph
+++ b/strata/armv7lhf-cross-toolchain.morph
@@ -6,9 +6,9 @@ build-depends:
 chunks:
 - name: armv7lhf-cross-binutils
   morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-binutils.morph
-  repo: upstream:binutils-redhat
-  ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8
-  unpetrify-ref: baserock/build-essential
+  repo: upstream:binutils-tarball
+  ref: 5500a97a2ad1735db5b35bc51cfb825c1f4c38df
+  unpetrify-ref: binutils-2.25
 
 - name: armv7lhf-cross-linux-api-headers
   morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
@@ -19,8 +19,8 @@ chunks:
 - name: armv7lhf-cross-gcc-nolibc
   morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph
   repo: upstream:gcc-tarball
-  ref: cca9d546d497fac90f862e52c61177ba1daa9a84
-  unpetrify-ref: baserock/5.1.0/gmp_mpfr_mpc
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+  unpetrify-ref: baserock/build-essential
   build-depends:
   - armv7lhf-cross-binutils
 
@@ -37,8 +37,8 @@ chunks:
 - name: armv7lhf-cross-gcc
   morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc.morph
   repo: upstream:gcc-tarball
-  ref: cca9d546d497fac90f862e52c61177ba1daa9a84
-  unpetrify-ref: baserock/5.1.0/gmp_mpfr_mpc
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+  unpetrify-ref: baserock/build-essential
   build-depends:
   - armv7lhf-cross-binutils
   - armv7lhf-cross-glibc
@@ -46,8 +46,8 @@ chunks:
 - name: armv7lhf-cross-libstdc++
   morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-libstdc++.morph
   repo: upstream:gcc-tarball
-  ref: cca9d546d497fac90f862e52c61177ba1daa9a84
-  unpetrify-ref: baserock/5.1.0/gmp_mpfr_mpc
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+  unpetrify-ref: baserock/build-essential
   build-depends:
   - armv7lhf-cross-binutils
   - armv7lhf-cross-gcc
diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph
index 00a614c9..0bf1c220 100644
--- a/strata/audio-bluetooth.morph
+++ b/strata/audio-bluetooth.morph
@@ -2,16 +2,19 @@ name: audio-bluetooth
 kind: stratum
 description: Components required for audio and bluetooth.
 build-depends:
+- morph: strata/glib-common.morph
 - morph: strata/foundation.morph
 chunks:
 - name: libatomic_ops
   repo: upstream:libatomic_ops
   ref: 0a58f5d63969c10d2141af89cb7a53df786909ab
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: alsa-lib
   repo: upstream:alsa-lib
   ref: 9cfd1faa27511edbb8bebbab85030125f33590ae
   unpetrify-ref: v1.0.28
+  build-system: autotools
 - name: alsa-utils
   morph: strata/audio-bluetooth/alsa-utils.morph
   repo: upstream:alsa-utils
@@ -32,15 +35,23 @@ chunks:
   build-depends:
   - libical
   - alsa-lib
+- name: dbus-glib
+  repo: upstream:dbus-glib
+  ref: 397e8297d433547c9bf4150ddd2b9e0b4c39628c
+  unpetrify-ref: dbus-glib_0.102
+  build-system: autotools
 - name: bluez-tools
   morph: strata/audio-bluetooth/bluez-tools.morph
   repo: upstream:bluez-tools
   ref: 7350787e96a6ecf2cc5d4afddb3321ccad9fa461
   unpetrify-ref: baserock/morph
+  build-depends:
+  - dbus-glib
 - name: obexd
   repo: upstream:obexd
   ref: 4225280022c206762c91beee47c62d05e1baeacc
   unpetrify-ref: baserock/morph
+  build-system: autotools
   build-depends:
   - bluez
   - libical
@@ -48,6 +59,7 @@ chunks:
   repo: upstream:speex
   ref: e5dc987a403426ee3d0d81768afffa0fe74e20fa
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: nohands
   morph: strata/audio-bluetooth/nohands.morph
   repo: upstream:nohands
@@ -60,11 +72,12 @@ chunks:
   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"
+  unpetrify-ref: '1.15'
   build-depends:
   - mobile-broadband-provider-info
   - bluez
@@ -81,7 +94,7 @@ chunks:
 - name: pulseaudio
   morph: strata/audio-bluetooth/pulseaudio.morph
   repo: upstream:pulseaudio
-  ref:  53ad8aa7caa33caac52e35f71253e29d5a15f6e7
+  ref: 53ad8aa7caa33caac52e35f71253e29d5a15f6e7
   unpetrify-ref: v6.0
   build-depends:
   - libsndfile
diff --git a/strata/audio-bluetooth/pulseaudio.morph b/strata/audio-bluetooth/pulseaudio.morph
index fa183fcb..be4cb557 100644
--- a/strata/audio-bluetooth/pulseaudio.morph
+++ b/strata/audio-bluetooth/pulseaudio.morph
@@ -2,9 +2,11 @@ name: pulseaudio
 kind: chunk
 description: PulseAudio System
 build-system: autotools
+pre-configure-commands:
+- NOCONFIGURE=1 ./bootstrap.sh
 configure-commands:
-- ./autogen.sh
-- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --with-database=simple --with-systemduserunitdir=/lib/systemd/system
+- ./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"
diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph
index c0861105..74fc9363 100644
--- a/strata/baserock-import.morph
+++ b/strata/baserock-import.morph
@@ -9,23 +9,16 @@ chunks:
   repo: upstream:python-packages/ansicolor
   ref: 9d3adbaff35bb6cde1d63414a8cc72f572c4d0ef
   unpetrify-ref: 0.2.4
-- name: python-decorator
-  repo: upstream:python-packages/python-decorator
-  ref: b02f7a254c3679dfac57a824e08dd02ced850636
-  unpetrify-ref: decorator-3.4.0
-- name: networkx
-  repo: upstream:python-packages/networkx
-  ref: 8ac796aba866ade1a56b83e30f25ed392ca3512c
-  unpetrify-ref: networkx-1.9.1
+  build-system: python-distutils
 - name: requests-cache
   repo: upstream:python-packages/requests-cache
   ref: a1b5e65ccd715f1e8434f18f27913715340d6aaf
   unpetrify-ref: 0.4.6
+  build-system: python-distutils
 - name: baserock-import
   repo: baserock:baserock/import
-  ref: 461979515ca30cd8e5acdec4cdb5ca3adeb6a9e7
+  ref: f74e7e428325be1cb018898a52d0aed4aec7a549
   unpetrify-ref: master
+  build-system: python-distutils
   build-depends:
   - ansicolor
-  - networkx
-  - python-decorator
diff --git a/strata/bsp-armv5l-openbmc-aspeed.morph b/strata/bsp-armv5l-openbmc-aspeed.morph
new file mode 100644
index 00000000..d7e1f180
--- /dev/null
+++ b/strata/bsp-armv5l-openbmc-aspeed.morph
@@ -0,0 +1,18 @@
+name: bsp-armv5l-openbmc-aspeed
+kind: stratum
+description: |
+  The set of platform specific components required for booting
+  armvl5-openbmc-aspeed based systems
+build-depends:
+- morph: strata/core.morph
+chunks:
+- name: linux-armv5l-openbmc-aspeed
+  morph: strata/bsp-armv5l-openbmc-aspeed/linux-armv5l-openbmc-aspeed.morph
+  repo: upstream:linux-stable
+  ref: 5cbce86c2115075b8054e4dba8cdf328aa6fa5b6
+  unpetrify-ref: baserock/v2.6.28.9/openbmc_aspeed_wedge
+- name: u-boot@aspeed
+  morph: strata/bsp-armv5l-openbmc-aspeed/u-boot@aspeed.morph
+  repo: upstream:u-boot
+  ref: af962087db0b88f4073f8f5a6184cb7f011d224d
+  unpetrify-ref: baserock/v2013.07+aspeed_wedge
diff --git a/strata/bsp-armv5l-openbmc-aspeed/linux-armv5l-openbmc-aspeed.morph b/strata/bsp-armv5l-openbmc-aspeed/linux-armv5l-openbmc-aspeed.morph
new file mode 100644
index 00000000..c6e38c63
--- /dev/null
+++ b/strata/bsp-armv5l-openbmc-aspeed/linux-armv5l-openbmc-aspeed.morph
@@ -0,0 +1,9 @@
+name: linux-armv5l-openbmc-aspeed
+kind: chunk
+configure-commands:
+- make ast2400_defconfig
+build-commands:
+- make $MAKEFLAGS
+install-commands:
+- mkdir -p "$DESTDIR"/boot
+- cp arch/arm/boot/Image "$DESTDIR/boot/vmlinux"
diff --git a/strata/bsp-armv5l-openbmc-aspeed/u-boot@aspeed.morph b/strata/bsp-armv5l-openbmc-aspeed/u-boot@aspeed.morph
new file mode 100644
index 00000000..1ded05c5
--- /dev/null
+++ b/strata/bsp-armv5l-openbmc-aspeed/u-boot@aspeed.morph
@@ -0,0 +1,14 @@
+name: u-boot@aspeed
+kind: chunk
+configure-commands:
+- make ast2400_spi_config
+build-commands:
+- make
+- make tools
+install-commands:
+- mkdir -p "$DESTDIR$PREFIX/bin"
+- install -m 755 tools/img2brec.sh "$DESTDIR$PREFIX/bin/"
+- install -m 755 tools/jtagconsole "$DESTDIR$PREFIX/bin/"
+- install -m 755 tools/netconsole "$DESTDIR$PREFIX/bin/"
+- install -m 755 tools/mkenvimage "$DESTDIR$PREFIX/bin/"
+- install -m 755 tools/mkimage "$DESTDIR$PREFIX/bin/"
diff --git a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph
index b03e17ad..e904ff45 100644
--- a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph
+++ b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph
@@ -33,6 +33,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config --set-str UEVENT_HELPER_PATH ''
 - scripts/config -e DM_SNAPSHOT
 - scripts/config -e IKCONFIG
diff --git a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph b/strata/bsp-armv7-versatile/linux-armv7-versatile.morph
index 7e66ce73..ed0194b8 100644
--- a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph
+++ b/strata/bsp-armv7-versatile/linux-armv7-versatile.morph
@@ -10,6 +10,7 @@ configure-commands:
 - scripts/config -e FUSE_FS
 - scripts/config -e OVERLAY_FS
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e CGROUPS
 - scripts/config -e AUTOFS4_FS
 - scripts/config -e BLK_DEV_LOOP
diff --git a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph
index 377aaa8d..1b86d320 100644
--- a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph
+++ b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph
@@ -18,6 +18,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e BLK_DEV_LOOP
 - scripts/config -e BTRFS_FS
 - scripts/config -e TMPFS
diff --git a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph
index c232c493..fd6fab15 100644
--- a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph
+++ b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph
@@ -26,6 +26,7 @@ configure-commands:
 - scripts/config -e IKCONFIG_PROC
 - scripts/config -e CGROUPS
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e AUTOFS4_FS
 - scripts/config -e NETWORK_FILESYSTEMS
 - scripts/config -e NFS_FS
diff --git a/strata/bsp-armv8b64-generic.morph b/strata/bsp-armv8b64-generic.morph
index a4d6645b..636e62b4 100644
--- a/strata/bsp-armv8b64-generic.morph
+++ b/strata/bsp-armv8b64-generic.morph
@@ -1,7 +1,6 @@
 name: bsp-armv8b64-generic
 kind: stratum
-description:
-- |
+description: |
   The set of platform specific components required for booting generic ARMv8
   systems in big-endian mode, such as the 64-bit APM XGene ARM based m400
   Moonshot cartridge.
diff --git a/strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph b/strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph
index ecf383b0..9362eb6e 100644
--- a/strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph
+++ b/strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph
@@ -12,6 +12,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e CGROUPS
 - scripts/config -e AUTOFS4_FS
 - scripts/config --set-str UEVENT_HELPER_PATH ''
diff --git a/strata/bsp-armv8l64-generic.morph b/strata/bsp-armv8l64-generic.morph
index a5edb9db..ca74dbe3 100644
--- a/strata/bsp-armv8l64-generic.morph
+++ b/strata/bsp-armv8l64-generic.morph
@@ -1,7 +1,6 @@
 name: bsp-armv8l64-generic
 kind: stratum
-description:
-- |
+description: |
   The set of platform specific components required for booting
   armv8l64-based systems, like the 64-bit APM XGene ARM based m400
   Moonshot cartridge.
diff --git a/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph b/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph
index 018e5710..dd54b4e4 100644
--- a/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph
+++ b/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph
@@ -12,6 +12,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e CGROUPS
 - scripts/config -e AUTOFS4_FS
 - scripts/config --set-str UEVENT_HELPER_PATH ''
diff --git a/strata/bsp-jetson/bsp-support.morph b/strata/bsp-jetson/bsp-support.morph
deleted file mode 100644
index 5adb02e4..00000000
--- a/strata/bsp-jetson/bsp-support.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: bsp-support
-kind: chunk
-install-commands:
-- install -o 0 -g 0 -m 644 -D nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service"
-- install -d "$DESTDIR/usr/lib/systemd/system/sysinit.target.wants"
-- ln -s /usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/sysinit.target.wants/nv-ondemand-cpufreq-governor.service"
diff --git a/strata/bsp-jetson/linux-jetson-tk1.morph b/strata/bsp-jetson/linux-jetson-tk1.morph
index 073a5a02..784a39c4 100644
--- a/strata/bsp-jetson/linux-jetson-tk1.morph
+++ b/strata/bsp-jetson/linux-jetson-tk1.morph
@@ -15,6 +15,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e CGROUPS
 - scripts/config -e AUTOFS4_FS
 - scripts/config --set-str UEVENT_HELPER_PATH ''
diff --git a/strata/bsp-jetson/nouveau-drm.morph b/strata/bsp-jetson/nouveau-drm.morph
index 33221a70..218091f4 100644
--- a/strata/bsp-jetson/nouveau-drm.morph
+++ b/strata/bsp-jetson/nouveau-drm.morph
@@ -1,12 +1,14 @@
 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
+- 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
+- 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)
+  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-ppc64-generic.morph b/strata/bsp-ppc64-generic.morph
index 82395569..ea606a75 100644
--- a/strata/bsp-ppc64-generic.morph
+++ b/strata/bsp-ppc64-generic.morph
@@ -6,6 +6,6 @@ build-depends:
 chunks:
 - name: linux-ppc64
   morph: strata/bsp-ppc64-generic/linux-ppc64.morph
-  repo: upstream:linux-stable
-  ref: 660613d1a4e94144490850b6c3d350331860fac4
-  unpetrify-ref: v3.19.2
+  repo: upstream:linux
+  ref: 39a8804455fb23f09157341d3ba7db6d7ae6ee76
+  unpetrify-ref: v4.0
diff --git a/strata/bsp-ppc64-generic/linux-ppc64.morph b/strata/bsp-ppc64-generic/linux-ppc64.morph
index b8b189c7..d2ef0747 100644
--- a/strata/bsp-ppc64-generic/linux-ppc64.morph
+++ b/strata/bsp-ppc64-generic/linux-ppc64.morph
@@ -13,6 +13,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e CGROUPS
 - scripts/config -e AUTOFS4_FS
 - scripts/config --set-str UEVENT_HELPER_PATH ''
diff --git a/strata/bsp-wandboard/linux-armv7-wandboard.morph b/strata/bsp-wandboard/linux-armv7-wandboard.morph
index bf337725..8137198e 100644
--- a/strata/bsp-wandboard/linux-armv7-wandboard.morph
+++ b/strata/bsp-wandboard/linux-armv7-wandboard.morph
@@ -15,6 +15,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e CGROUPS
 - scripts/config -e AUTOFS4_FS
 - scripts/config --set-str UEVENT_HELPER_PATH ''
diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph
index 41003643..05d179b5 100644
--- a/strata/bsp-x86_32-generic.morph
+++ b/strata/bsp-x86_32-generic.morph
@@ -3,7 +3,9 @@ kind: stratum
 description: The set of platform specific components required for booting a 32-bit
   x86 based system.
 build-depends:
-- morph: strata/core.morph
+# nasm wants asciidoc and xmlto for generating its docs
+# so include docutils here
+- morph: strata/docutils.morph
 chunks:
 - name: linux-x86-32-generic
   morph: strata/bsp-x86_32-generic/linux-x86-32-generic.morph
@@ -13,8 +15,8 @@ chunks:
 - name: nasm
   morph: strata/bsp-x86_32-generic/nasm.morph
   repo: upstream:nasm
-  ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0
-  unpetrify-ref: baserock/morph
+  ref: 8fa0fe16408afc76ce1ae4387e1a9d46893cfda6
+  unpetrify-ref: nasm-2.11.08
 - name: syslinux
   morph: strata/bsp-x86_32-generic/syslinux.morph
   repo: upstream:syslinux
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 3d936150..208eb506 100644
--- a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph
+++ b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph
@@ -22,6 +22,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e CGROUPS
 - scripts/config -e AUTOFS4_FS
 - scripts/config --set-str UEVENT_HELPER_PATH ''
@@ -260,6 +261,9 @@ configure-commands:
 - scripts/config -e SCSI_ISCSI_ATTRS
 - scripts/config -e ISCSI_TCP
 - scripts/config -e SCSI_LOWLEVEL
+- scripts/config -e SCSI_VIRTIO
+- scripts/config -e HYPERVISOR_GUEST
+- scripts/config -e PARAVIRT
 - yes '' | make oldconfig
 build-commands:
 - make $MAKEFLAGS
diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph
index e26bdfed..fe8bede7 100644
--- a/strata/bsp-x86_64-generic.morph
+++ b/strata/bsp-x86_64-generic.morph
@@ -3,7 +3,7 @@ kind: stratum
 description: The set of platform specific components required for booting a 64-bit
   x86 based system.
 build-depends:
-- morph: strata/core.morph
+- morph: strata/docutils.morph
 chunks:
 - name: linux-x86-64-generic
   morph: strata/bsp-x86_64-generic/linux-x86-64-generic.morph
@@ -13,8 +13,8 @@ chunks:
 - name: nasm
   morph: strata/bsp-x86_64-generic/nasm.morph
   repo: upstream:nasm
-  ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0
-  unpetrify-ref: baserock/morph
+  ref: 8fa0fe16408afc76ce1ae4387e1a9d46893cfda6
+  unpetrify-ref: nasm-2.11.08
 - name: syslinux
   morph: strata/bsp-x86_64-generic/syslinux.morph
   repo: upstream:syslinux
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 7364b033..bc8ac7d1 100644
--- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
+++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
@@ -22,6 +22,7 @@ configure-commands:
 - scripts/config -e DEVTMPFS
 - scripts/config -e DEVTMPFS_MOUNT
 - scripts/config -e CONFIG_FHANDLE
+- scripts/config -e DEVPTS_MULTIPLE_INSTANCES
 - scripts/config -e CGROUPS
 - scripts/config -e AUTOFS4_FS
 - scripts/config --set-str UEVENT_HELPER_PATH ''
diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph
index f7212054..0d159ce6 100644
--- a/strata/bsp-x86_both-tools.morph
+++ b/strata/bsp-x86_both-tools.morph
@@ -3,17 +3,19 @@ kind: stratum
 description: The set of platform specific components required for configuring a bootable
   x86 based system.
 build-depends:
-- morph: strata/core.morph
+# nasm wants asciidoc and xmlto for generating its docs
+# so include docutils here
+- morph: strata/docutils.morph
 chunks:
 - name: nasm
   morph: strata/bsp-x86_both-tools/nasm.morph
   repo: upstream:nasm
-  ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0
-  unpetrify-ref: baserock/morph
+  ref: 8fa0fe16408afc76ce1ae4387e1a9d46893cfda6
+  unpetrify-ref: nasm-2.11.08
 - name: syslinux
   morph: strata/bsp-x86_both-tools/syslinux.morph
   repo: upstream:syslinux
-  ref:  d715b39c0801ecea5e52f9029cea7c76320f93cf
+  ref: d715b39c0801ecea5e52f9029cea7c76320f93cf
   unpetrify-ref: baserock/morph
   build-depends:
   - nasm
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 3cb87fa4..78063ce4 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -50,17 +50,17 @@ products:
 chunks:
 - name: stage1-binutils
   morph: strata/build-essential/stage1-binutils.morph
-  repo: upstream:binutils-redhat
-  ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8
-  unpetrify-ref: baserock/build-essential
+  repo: upstream:binutils-tarball
+  ref: 5500a97a2ad1735db5b35bc51cfb825c1f4c38df
+  unpetrify-ref: binutils-2.25
   build-mode: bootstrap
   prefix: /tools
 
 - name: stage1-gcc
   morph: strata/build-essential/stage1-gcc.morph
   repo: upstream:gcc-tarball
-  ref: cca9d546d497fac90f862e52c61177ba1daa9a84
-  unpetrify-ref: baserock/5.1.0/gmp_mpfr_mpc
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+  unpetrify-ref: baserock/build-essential
   build-depends:
   - stage1-binutils
   build-mode: bootstrap
@@ -92,8 +92,8 @@ chunks:
 - name: stage2-libstdc++
   morph: strata/build-essential/stage2-libstdc++.morph
   repo: upstream:gcc-tarball
-  ref: cca9d546d497fac90f862e52c61177ba1daa9a84
-  unpetrify-ref: baserock/5.1.0/gmp_mpfr_mpc
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+  unpetrify-ref: baserock/build-essential
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -104,9 +104,9 @@ chunks:
 
 - name: stage2-binutils
   morph: strata/build-essential/stage2-binutils.morph
-  repo: upstream:binutils-redhat
-  ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8
-  unpetrify-ref: baserock/build-essential
+  repo: upstream:binutils-tarball
+  ref: 5500a97a2ad1735db5b35bc51cfb825c1f4c38df
+  unpetrify-ref: binutils-2.25
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -118,8 +118,8 @@ chunks:
 - name: stage2-gcc-fixed-headers
   morph: strata/build-essential/stage2-gcc-fixed-headers.morph
   repo: upstream:gcc-tarball
-  ref: cca9d546d497fac90f862e52c61177ba1daa9a84
-  unpetrify-ref: baserock/5.1.0/gmp_mpfr_mpc
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+  unpetrify-ref: baserock/build-essential
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -131,8 +131,8 @@ chunks:
 - name: stage2-gcc
   morph: strata/build-essential/stage2-gcc.morph
   repo: upstream:gcc-tarball
-  ref: cca9d546d497fac90f862e52c61177ba1daa9a84
-  unpetrify-ref: baserock/5.1.0/gmp_mpfr_mpc
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+  unpetrify-ref: baserock/build-essential
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -147,7 +147,7 @@ chunks:
   morph: strata/build-essential/stage2-busybox.morph
   repo: upstream:busybox
   ref: 1ecfe811fe2f70380170ef7d820e8150054e88ca
-  unpetrify-ref: 1_23_1
+  unpetrify-ref: '1_23_1'
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -167,7 +167,7 @@ chunks:
 - name: stage2-fhs-dirs
   morph: strata/build-essential/stage2-fhs-dirs.morph
   repo: baserock:baserock/fhs-dirs
-  ref: 41bbb474cd4647ee715bc94c21c161d12a20deb4
+  ref: 1218cbd38a4f4e9da75af6f7fae946ca92666afb
   unpetrify-ref: master
   build-mode: bootstrap
   prefix: /tools
@@ -188,8 +188,8 @@ chunks:
 - name: stage2-make
   morph: strata/build-essential/stage2-make.morph
   repo: upstream:make-tarball
-  ref: f75919b038da8a28388a911303fb86ed7a70ea2c
-  unpetrify-ref: make-4.1
+  ref: 4978d7129e42340ab9efeb0cb9cae4ad0fa052d4
+  unpetrify-ref: baserock/make-4.1-ttyname-segfault-fix
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -214,7 +214,7 @@ chunks:
 - name: fhs-dirs
   morph: strata/build-essential/fhs-dirs.morph
   repo: baserock:baserock/fhs-dirs
-  ref: 41bbb474cd4647ee715bc94c21c161d12a20deb4
+  ref: 1218cbd38a4f4e9da75af6f7fae946ca92666afb
   unpetrify-ref: master
   build-depends:
   - stage2-binutils
@@ -266,10 +266,10 @@ chunks:
     glibc-nss: build-essential-runtime
 
 - name: zlib
-  morph: strata/build-essential/zlib.morph
   repo: upstream:zlib
-  ref: db333af7e9b90a23fd7f9cd8dc128123b34bf698
-  unpetrify-ref: baserock/build-essential
+  ref: 50893291621658f355bc5b4d450a8d06a563053d
+  unpetrify-ref: v1.2.8
+  build-system: autotools
   build-depends:
   - stage2-binutils
   - stage2-busybox
@@ -286,9 +286,9 @@ chunks:
 
 - name: binutils
   morph: strata/build-essential/binutils.morph
-  repo: upstream:binutils-redhat
-  ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8
-  unpetrify-ref: baserock/build-essential
+  repo: upstream:binutils-tarball
+  ref: 5500a97a2ad1735db5b35bc51cfb825c1f4c38df
+  unpetrify-ref: binutils-2.25
   build-depends:
   - stage2-binutils
   - stage2-busybox
@@ -306,7 +306,7 @@ chunks:
   morph: strata/build-essential/busybox.morph
   repo: upstream:busybox
   ref: 1ecfe811fe2f70380170ef7d820e8150054e88ca
-  unpetrify-ref: 1_23_1
+  unpetrify-ref: '1_23_1'
   build-depends:
   - stage2-binutils
   - stage2-busybox
@@ -356,8 +356,8 @@ chunks:
 - name: gcc
   morph: strata/build-essential/gcc.morph
   repo: upstream:gcc-tarball
-  ref: 7b410925ecc2c60653378a7ff26ce64f4095858c
-  unpetrify-ref: baserock/5.1.0/gmp_mpfr_mpc+docs_fix
+  ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
+  unpetrify-ref: baserock/build-essential
   build-depends:
   - stage2-binutils
   - stage2-busybox
@@ -378,8 +378,8 @@ chunks:
 - name: make
   morph: strata/build-essential/make.morph
   repo: upstream:make-tarball
-  ref: f75919b038da8a28388a911303fb86ed7a70ea2c
-  unpetrify-ref: make-4.1
+  ref: 4978d7129e42340ab9efeb0cb9cae4ad0fa052d4
+  unpetrify-ref: baserock/make-4.1-ttyname-segfault-fix
   build-depends:
   - stage2-binutils
   - stage2-busybox
diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.morph
index b5418bc0..1bbd97a6 100644
--- a/strata/build-essential/busybox.morph
+++ b/strata/build-essential/busybox.morph
@@ -3,14 +3,16 @@ kind: chunk
 
 configure-commands:
 # Busybox's default config has everything enabled.
-- make defconfig
+- make defconfig KCONFIG_NOTIMESTAMP=1
 
-- sed -e 's|.*UDHCPC_DEFAULT_SCRIPT.*|CONFIG_UDHCPC_DEFAULT_SCRIPT="'"$PREFIX"/share/udhcpc/default.script'"|' -i .config
-- sed -e 's|.*IFUPDOWN_IFSTATE_PATH.*|CONFIG_IFUPDOWN_IFSTATE_PATH="/run/ifstate"|' -i .config
+- sed -e 's|.*UDHCPC_DEFAULT_SCRIPT.*|CONFIG_UDHCPC_DEFAULT_SCRIPT="'"$PREFIX"/share/udhcpc/default.script'"|'
+  -i .config
+- sed -e 's|.*IFUPDOWN_IFSTATE_PATH.*|CONFIG_IFUPDOWN_IFSTATE_PATH="/run/ifstate"|'
+  -i .config
 
 # Avoid dividing applets between $PREFIX/[s]bin and $PREFIX/usr/[s]bin.
-- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' -i .config'
-
+- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/''
+  -i .config'
 # We have GAWK, but in GENIVI baseline we want to get rid of it
 # - sed -e 's/CONFIG_AWK=y.*/# CONFIG_AWK is not set/' -i .config
 
@@ -31,11 +33,16 @@ configure-commands:
 - sed -e 's/CONFIG_RMMOD=y.*/# CONFIG_RMMOD is not set/' -i .config
 
 # General features that we don't need.
-- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/'
+  -i .config
+- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/'
+  -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not
+  set/' -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/'
+  -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/'
+  -i .config
 - sed -e 's/CONFIG_FEATURE_INITRD=y.*/# CONFIG_FEATURE_INITRD is not set/' -i .config
 - sed -e 's/CONFIG_FEATURE_MINIX2=y.*/# CONFIG_FEATURE_MINIX2 is not set/' -i .config
 - sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config
@@ -52,19 +59,20 @@ configure-commands:
 
 # Now turn on some little bits we do need
 - sed -e 's/# CONFIG_BBCONFIG is not set/CONFIG_BBCONFIG=y/' -i .config
-- sed -e 's/# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set/CONFIG_FEATURE_COMPRESS_BBCONFIG=y/' -i .config
-- sed -e 's/# CONFIG_FEATURE_MOUNT_HELPERS is not set/CONFIG_FEATURE_MOUNT_HELPERS=y/' -i .config
+- sed -e 's/# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set/CONFIG_FEATURE_COMPRESS_BBCONFIG=y/'
+  -i .config
+- sed -e 's/# CONFIG_FEATURE_MOUNT_HELPERS is not set/CONFIG_FEATURE_MOUNT_HELPERS=y/'
+  -i .config
 
 
 build-commands:
-- make
+- make KCONFIG_NOTIMESTAMP=1
 
 install-commands:
 - |
   if [ "$PREFIX" = /usr ]; then PREFIX=; fi &&
-    make CONFIG_PREFIX="$DESTDIR$PREFIX" install &&
+    make CONFIG_PREFIX="$DESTDIR$PREFIX" KCONFIG_NOTIMESTAMP=1 install &&
     chmod 6755 "$DESTDIR$PREFIX"/bin/busybox
-
 # Set up man environment variables
 - mkdir -p "$DESTDIR"/etc
 - |
diff --git a/strata/build-essential/gcc.morph b/strata/build-essential/gcc.morph
index a9d25ac1..f16b3c0e 100644
--- a/strata/build-essential/gcc.morph
+++ b/strata/build-essential/gcc.morph
@@ -15,8 +15,7 @@ products:
   # everything else gcc produces is required for compiling
   # this is the -devel artifact instead of -misc, since it goes in -devel
   # stratum artifacts by default
-  include: [ .* ]
-
+  include: [.*]
 configure-commands:
 - mkdir o
 
@@ -58,7 +57,7 @@ build-commands:
 install-commands:
 - cd o && make DESTDIR="$DESTDIR" install
 - ln -s gcc "$DESTDIR/$PREFIX/bin/cc"
-- >
+- |
   for fortran_alias in f77 f90 f95; do
-      ln -s gfortran "$DESTDIR/$PREFIX/bin/$fortran_alias"
+    ln -s gfortran "$DESTDIR/$PREFIX/bin/$fortran_alias"
   done
diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.morph
index ecd7c7c4..54dbbd9c 100644
--- a/strata/build-essential/glibc.morph
+++ b/strata/build-essential/glibc.morph
@@ -17,10 +17,13 @@ products:
   include:
   - (usr/)?s?bin/.*
   - (usr/)?libexec/getconf/.*
-  - (usr/)?lib/libSegFault\.so(\.\d+)*$
+  - (usr/)?lib(32|64)?/libSegFault\.so(\.\d+)*$
 - artifact: glibc-libs
   include:
+  # This is processed after bins, so bins can take libSegFault.so
   - (usr/)?lib(32|64)?/lib[^/]*\.so(\.\d+)*$
+  - etc/ld.so.conf
+  - etc/ld.so.conf.d
 - artifact: glibc-devel
   include:
   - (usr/)?include/.*
@@ -67,6 +70,7 @@ build-commands:
 install-commands:
 - cd o && make install_root="$DESTDIR" localtime=UTC install
 - mkdir -p "$DESTDIR/etc"
+- mkdir -p "$DESTDIR/etc/ld.so.conf.d"
 - |
   cat <<EOF > nsswitch.conf
   passwd: compat
diff --git a/strata/build-essential/stage1-gcc.morph b/strata/build-essential/stage1-gcc.morph
index ed85b684..6418ed6a 100644
--- a/strata/build-essential/stage1-gcc.morph
+++ b/strata/build-essential/stage1-gcc.morph
@@ -3,7 +3,10 @@ kind: chunk
 
 configure-commands:
 # Workaround from LFS due GCC not detecting stack protection correctly
-- sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' gcc/configure
+- |
+  sed -i -e '/k prot/a \
+  gcc_cv_libc_provides_ssp=yes
+  ' gcc/configure
 
 - mkdir o
 
@@ -69,6 +72,8 @@ build-commands:
   # ARMv7.  Fix the invocation of GMP's configure script so that GMP can
   # use the machine-dependent code.
   case "$MORPH_ARCH" in
+      armv5*)   sed -i "s/--host=none/--host=armv5/" o/Makefile
+                sed -i "s/--target=none/--target=armv5/" o/Makefile ;;
       armv7*)   sed -i "s/--host=none/--host=armv7a/" o/Makefile
                 sed -i "s/--target=none/--target=armv7a/" o/Makefile ;;
   esac
diff --git a/strata/build-essential/stage2-binutils.morph b/strata/build-essential/stage2-binutils.morph
index 1c64fb29..b07b56a4 100644
--- a/strata/build-essential/stage2-binutils.morph
+++ b/strata/build-essential/stage2-binutils.morph
@@ -5,7 +5,7 @@ build-system: autotools
 configure-commands:
 - |
   export STAGE2_SYSROOT="$(dirname $(pwd))"
-  export CXX=false
+  export CXX="$TARGET_STAGE1-g++ --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
diff --git a/strata/build-essential/stage2-busybox.morph b/strata/build-essential/stage2-busybox.morph
index 98e4bf33..f271a40d 100644
--- a/strata/build-essential/stage2-busybox.morph
+++ b/strata/build-essential/stage2-busybox.morph
@@ -5,11 +5,11 @@ configure-commands:
 # Explicitly setting HOSTCC is required because we have a 'gcc' earlier in
 # the PATH supplied by the stage2-gcc chunk, which can't execute outside of
 # the stage 3 staging area.
-- make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- defconfig
+- make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- KCONFIG_NOTIMESTAMP=1 defconfig
 
 # Avoid dividing applets between $PREFIX/[s]bin and $PREFIX/usr/[s]bin.
-- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' -i .config'
-
+- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/''
+  -i .config'
 # We have GAWK.
 - sed -e 's/CONFIG_AWK=y.*/# CONFIG_AWK is not set/' -i .config
 
@@ -30,13 +30,19 @@ configure-commands:
 - sed -e 's/CONFIG_RMMOD=y.*/# CONFIG_RMMOD is not set/' -i .config
 
 # General features that we don't need.
-- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/'
+  -i .config
+- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/'
+  -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not
+  set/' -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/'
+  -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/'
+  -i .config
 - sed -e 's/CONFIG_FEATURE_INITRD=y.*/# CONFIG_FEATURE_INITRD is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_USE_INITTAB=y.*/# CONFIG_FEATURE_USE_INITTAB is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_USE_INITTAB=y.*/# CONFIG_FEATURE_USE_INITTAB is not set/'
+  -i .config
 - sed -e 's/CONFIG_FEATURE_MINIX2=y.*/# CONFIG_FEATURE_MINIX2 is not set/' -i .config
 - sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config
 - sed -e 's/CONFIG_HALT=y.*/# CONFIG_HALT is not set/' -i .config
@@ -58,7 +64,7 @@ build-commands:
   export STAGE2_SYSROOT="$(dirname $(pwd))"
   export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
   export LDFLAGS="--sysroot=$STAGE2_SYSROOT"
-  make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1-
+  make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- KCONFIG_NOTIMESTAMP=1
 
 install-commands:
 # We expect to be built with a non-standard prefix in stage 2 (i.e. not
@@ -68,5 +74,7 @@ install-commands:
   export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
   export LDFLAGS="--sysroot=$STAGE2_SYSROOT"
   make CONFIG_PREFIX="$DESTDIR$PREFIX" \
-       HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- install &&
+       HOSTCC="/usr/bin/gcc" \
+       CROSS_COMPILE=$TARGET_STAGE1- \
+       KCONFIG_NOTIMESTAMP=1 install &&
   chmod 6755 "$DESTDIR$PREFIX"/bin/busybox
diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.morph
index c480c875..f44d0ebb 100644
--- a/strata/build-essential/stage2-glibc.morph
+++ b/strata/build-essential/stage2-glibc.morph
@@ -21,7 +21,6 @@ configure-commands:
     $ARCH_FLAGS \
     --build=$(../scripts/config.guess) --host=$TARGET_STAGE1 \
     --prefix="$PREFIX" \
-    --enable-obsolete-rpc \
     `# [1]` --libdir="$PREFIX/lib" \
     `# [2]` --with-headers="$(pwd)/../../$PREFIX/include" \
     `# [3]` --disable-profile  --enable-kernel=2.6.25 \
@@ -34,6 +33,7 @@ build-commands:
 install-commands:
 - cd o && make install_root="$DESTDIR" localtime=UTC install
 - mkdir -p "$DESTDIR/etc"
+- mkdir -p "$DESTDIR/etc/ld.so.conf.d"
 - |
   cat <<EOF > ld.so.conf
   /lib
diff --git a/strata/build-essential/stage2-libstdc++.morph b/strata/build-essential/stage2-libstdc++.morph
index f9f245c1..3d89ad85 100644
--- a/strata/build-essential/stage2-libstdc++.morph
+++ b/strata/build-essential/stage2-libstdc++.morph
@@ -27,7 +27,7 @@ configure-commands:
             --disable-multilib                                \
     `# [1]` --disable-libstdcxx-threads                       \
     `# [2]` --disable-libstdcxx-pch                           \
-    `# [3]` --with-gxx-include-dir=/tools/"$TARGET_STAGE1"/include/c++/5.1.0
+    `# [3]` --with-gxx-include-dir=/tools/"$TARGET_STAGE1"/include/c++/4.9.2
 
 build-commands:
 - cd o && make
diff --git a/strata/build-essential/zlib.morph b/strata/build-essential/zlib.morph
deleted file mode 100644
index a69eebf3..00000000
--- a/strata/build-essential/zlib.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: zlib
-kind: chunk
-max-jobs: 1
-configure-commands:
-- ./configure --prefix="$PREFIX"
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph
index 0fc987c4..c428a1ba 100644
--- a/strata/ceph-service.morph
+++ b/strata/ceph-service.morph
@@ -18,16 +18,19 @@ chunks:
   repo: upstream:libunwind
   ref: d7322f0f64dab715c4feb5f08edef5660d8719c0
   unpetrify-ref: v1.1
+  build-system: autotools
 - name: gperftools
   repo: upstream:gperftools
   ref: 846b775dfadb77901202ae7ddbac30ad1de7df01
-  unpetrify-ref: gperftools-2.2 
+  unpetrify-ref: gperftools-2.2
+  build-system: autotools
   build-depends:
   - libunwind
 - name: snappy
   repo: upstream:snappy-git
   ref: 1ff9be9b8fafc8528ca9e055646f5932aa5db9c4
   unpetrify-ref: master
+  build-system: autotools
 - name: leveldb
   morph: strata/ceph-service/leveldb.morph
   repo: upstream:leveldb
@@ -40,16 +43,17 @@ chunks:
   repo: upstream:libeditline-tarball
   ref: 7503ff5f8610734521f40e276b59b3b6291830e7
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: boost
   morph: strata/ceph-service/boost.morph
   repo: upstream:boost-tarball
-  ref: 1c3648bf5b7d17fcd4fe9bc95802b16fd9eee304
-  unpetrify-ref: boost_1_56_0
+  ref: ed232fdd34968697a68783b3195b1da4226915b5
+  unpetrify-ref: boost_1_57_0
 - name: ceph
   morph: strata/ceph-service/ceph.morph
   repo: upstream:ceph
-  ref: d3f2ec34d26264ec4deb0b54678ee7bbb2ebc76f
-  unpetrify-ref: master
+  ref: f4f12a634b0a92938d54d77910134dbbcdf864e6
+  unpetrify-ref: v0.94.1.1
   build-depends:
   - libaio
   - gperftools
diff --git a/strata/ceph-service/boost.morph b/strata/ceph-service/boost.morph
index cc954076..fa785e3c 100644
--- a/strata/ceph-service/boost.morph
+++ b/strata/ceph-service/boost.morph
@@ -3,6 +3,6 @@ kind: chunk
 configure-commands:
 - ./bootstrap.sh
 build-commands:
-- ./b2 
+- ./b2
 install-commands:
 - ./b2 install --prefix="$DESTDIR$PREFIX"
diff --git a/strata/ceph-service/ceph.morph b/strata/ceph-service/ceph.morph
index a6b06759..56d30ead 100644
--- a/strata/ceph-service/ceph.morph
+++ b/strata/ceph-service/ceph.morph
@@ -3,7 +3,8 @@ kind: chunk
 build-system: autotools
 configure-commands:
 - NOCONFIGURE=1 ./autogen.sh
-- ./configure --with-nss --prefix="$PREFIX" --sysconfdir=/etc --without-fuse --without-libatomic-ops --without-libxfs
+- ./configure --with-nss --prefix="$PREFIX" --sysconfdir=/etc --without-fuse --without-libatomic-ops
+  --without-libxfs
 build-commands:
 - make
 install-commands:
diff --git a/strata/ceph-service/leveldb.morph b/strata/ceph-service/leveldb.morph
index bff2b87a..2b97c6e6 100644
--- a/strata/ceph-service/leveldb.morph
+++ b/strata/ceph-service/leveldb.morph
@@ -4,6 +4,6 @@ build-commands:
 - make
 install-commands:
 - mkdir -p "$DESTDIR$PREFIX"/lib
-- mkdir -p "$DESTDIR$PREFIX"/include 
+- mkdir -p "$DESTDIR$PREFIX"/include
 - cp --preserve=links libleveldb.* "$DESTDIR$PREFIX"/lib
 - cp -r include/leveldb "$DESTDIR$PREFIX"/include
diff --git a/strata/chef.morph b/strata/chef.morph
index 69b495aa..b28298e0 100644
--- a/strata/chef.morph
+++ b/strata/chef.morph
@@ -71,8 +71,8 @@ chunks:
   unpetrify-ref: v1.2.5
   build-depends:
   - hoe-master
-- name: ipaddress-master
-  morph: strata/chef/ipaddress-master.morph
+- name: ipaddress-0.8.0
+  morph: strata/chef/ipaddress-0.8.0.morph
   repo: upstream:ruby-gems/ipaddress
   ref: dae93ad0e4fb9a5d547a15dae0c3f2417078c845
   unpetrify-ref: master
diff --git a/strata/chef/erubis-master.morph b/strata/chef/erubis-master.morph
index f15e0968..05d1a9f9 100644
--- a/strata/chef/erubis-master.morph
+++ b/strata/chef/erubis-master.morph
@@ -1,4 +1,3 @@
----
 name: erubis-master
 kind: chunk
 build-system: manual
@@ -10,7 +9,8 @@ configure-commands:
 # Manually do what it seems like the 'rook' build system would do, if it worked
 # Values taken from 'Rookbook.props'.
 - find -type f -exec sed -e 's/\$Release\$/2.7.0/g' -i \{} \;
-- find -type f -exec sed -e 's/\$Copyright\$/copyright(c) 2006-2011 kuwata-lab.com all rights reserved./g' -i \{} \;
+- find -type f -exec sed -e 's/\$Copyright\$/copyright(c) 2006-2011 kuwata-lab.com
+  all rights reserved./g' -i \{} \;
 build-commands:
 - gem build erubis.gemspec
 install-commands:
diff --git a/strata/chef/hoe-master.morph b/strata/chef/hoe-master.morph
index 9fe7ff8e..1a468789 100644
--- a/strata/chef/hoe-master.morph
+++ b/strata/chef/hoe-master.morph
@@ -1,4 +1,3 @@
----
 name: hoe-master
 kind: chunk
 build-system: manual
diff --git a/strata/chef/ipaddress-master.morph b/strata/chef/ipaddress-0.8.0.morph
index fdaa5de6..fdaa5de6 100644
--- a/strata/chef/ipaddress-master.morph
+++ b/strata/chef/ipaddress-0.8.0.morph
diff --git a/strata/chef/libyajl2-1.0.1.morph b/strata/chef/libyajl2-1.0.1.morph
index d85d1567..7a21831d 100644
--- a/strata/chef/libyajl2-1.0.1.morph
+++ b/strata/chef/libyajl2-1.0.1.morph
@@ -9,5 +9,5 @@ build-commands:
 - USE_SYSTEM_LIBYAJL2=yes gem build libyajl2.gemspec
 install-commands:
 - mkdir -p "$DESTDIR/$(gem environment home)"
-- USE_SYSTEM_LIBYAJL2=yes gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin"
-  --ignore-dependencies --local ./libyajl2-1.0.1.gem
+- USE_SYSTEM_LIBYAJL2=yes gem install --install-dir "$DESTDIR/$(gem environment home)"
+  --bindir "$DESTDIR/$PREFIX/bin" --ignore-dependencies --local ./libyajl2-1.0.1.gem
diff --git a/strata/chef/plist-master.morph b/strata/chef/plist-master.morph
index bef39f7d..7cf7cbb6 100644
--- a/strata/chef/plist-master.morph
+++ b/strata/chef/plist-master.morph
@@ -1,4 +1,3 @@
----
 name: plist-master
 kind: chunk
 build-system: manual
diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.morph
index 92d6f03d..fc7d73ad 100644
--- a/strata/cloudinit-support.morph
+++ b/strata/cloudinit-support.morph
@@ -11,15 +11,11 @@ chunks:
   repo: upstream:python-cheetah
   ref: 831aa6b99d9b4fb012ee644d8e80e0bc0eb6d6ed
   unpetrify-ref: baserock/morph
-- name: boto
-  repo: upstream:boto
-  ref: bd49c22b5a30bf58096d58efc4762f1fea3e2caf
-  unpetrify-ref: baserock/morph
+  build-system: python-distutils
 - name: cloud-init
   morph: strata/cloudinit-support/cloud-init.morph
   repo: upstream:cloud-init
   ref: 130d51acc5b0becd64e7007f9dfe41a6e022eaec
   unpetrify-ref: baserock/morph
   build-depends:
-  - boto
   - python-cheetah
diff --git a/strata/connectivity.morph b/strata/connectivity.morph
index dbd4a263..124b4cac 100644
--- a/strata/connectivity.morph
+++ b/strata/connectivity.morph
@@ -7,6 +7,7 @@ chunks:
   repo: upstream:libnl
   ref: a2c4bd8f094a7247903578860a9c42049991860b
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: wpa_supplicant
   morph: strata/connectivity/wpa_supplicant.morph
   repo: upstream:hostap
@@ -18,3 +19,4 @@ chunks:
   repo: upstream:iptables
   ref: 482c6d3731e2681cb4baae835c294840300197e6
   unpetrify-ref: v1.4.21
+  build-system: autotools
diff --git a/strata/connman-common.morph b/strata/connman-common.morph
index a22b7e90..fde00436 100644
--- a/strata/connman-common.morph
+++ b/strata/connman-common.morph
@@ -2,6 +2,7 @@ name: connman-common
 kind: stratum
 build-depends:
 - morph: strata/connectivity.morph
+- morph: strata/glib-common.morph
 chunks:
 - name: connman
   morph: strata/connman-common/connman.morph
diff --git a/strata/core.morph b/strata/core.morph
index 7f30de1c..5ef86c1b 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -5,42 +5,23 @@ description: Core components of a Baserock base system that are build tools requ
 build-depends:
 - morph: strata/build-essential.morph
 chunks:
-- name: sqlite3
-  repo: upstream:sqlite3
-  ref: 24adc227bc29cd17e39df097fbca389c7724cd14
-  unpetrify-ref: sqlite-autoconf-3080801
-- name: cmake
-  morph: strata/core/cmake.morph
-  repo: upstream:cmake
-  ref: 732d8a467ab8a295b1bbf580f865980f8a1a9b29
-  unpetrify-ref: v3.2.1
 - name: gdbm
   morph: strata/core/gdbm.morph
   repo: upstream:gdbm-tarball
   ref: e5faeaaf75ecfb705a9b643b3e4cb881ebb69f48
   unpetrify-ref: gdbm-1.11
-- name: gettext-tarball
-  morph: strata/core/gettext-tarball.morph
-  repo: upstream:gettext-tarball
-  ref: 482840e61f86ca321838a91e902c41d40c098bbb
-  unpetrify-ref: gettext-0.19.4
-- name: mini-utils
-  morph: strata/core/mini-utils.morph
-  repo: baserock:baserock/mini-utils
-  ref: 5293265b29bbf468ab9d7f3302b19dbc81d0f8b8
-  unpetrify-ref: master
-- name: ncurses
-  morph: strata/core/ncurses.morph
-  repo: upstream:ncurses
-  ref: f67398afa6a76fbc902cc0cea963d5151fa2a953
-  unpetrify-ref: ncurses-5.9-20150131
 - name: perl
   morph: strata/core/perl.morph
   repo: upstream:perl
-  ref: 78f9a3c880f11578fb9ff9c7d5f7e34b602d2ad1
-  unpetrify-ref: baserock/morph
+  ref: 70f63a4c7dba89e8e48b44de7978faae4319e693
+  unpetrify-ref: v5.22.0
   build-depends:
   - gdbm
+- name: ncurses
+  morph: strata/core/ncurses.morph
+  repo: upstream:ncurses
+  ref: f67398afa6a76fbc902cc0cea963d5151fa2a953
+  unpetrify-ref: ncurses-5.9-20150131
 - name: texinfo-tarball
   morph: strata/core/texinfo-tarball.morph
   repo: upstream:texinfo-tarball
@@ -65,19 +46,47 @@ chunks:
   - autoconf-tarball
   - perl
   - texinfo-tarball
-- name: bash
-  morph: strata/core/bash.morph
-  repo: upstream:bash
-  ref: 3590145af6f1c9fa321dff231f69ae696e7e740b
-  unpetrify-ref: baserock/bash-4.3-patch-27
-- name: flex
-  morph: strata/core/flex.morph
-  repo: upstream:flex
-  ref: de10f98e8a2dc2a021796811490d0f30c3cd90bf
-  unpetrify-ref: baserock/build-essential
+- name: help2man
+  repo: upstream:help2man
+  ref: 83bab7e2e8e24a380266a9a247c029c49b0de666
+  unpetrify-ref: baserock/v1.46.5
+  build-system: autotools
   build-depends:
+  - autoconf-tarball
   - automake
-  - gettext-tarball
+# Note: autoconf's version number must be set in autoconf's chunk morph,
+# so if you update autoconf be sure to also update the version number
+# in strata/core/autoconf.morph
+- name: autoconf
+  morph: strata/core/autoconf.morph
+  repo: upstream:autoconf
+  ref: 218f9347c9c34919c2b8eef8d9a0513ac567a3c1
+  unpetrify-ref: baserock/v2.69-texinfo-fix
+  build-depends:
+  - autoconf-tarball
+  - automake
+  - help2man
+  - texinfo-tarball
+- name: libtool-tarball
+  morph: strata/core/libtool-tarball.morph
+  repo: upstream:libtool-tarball
+  ref: c026ca36e37d2643623a75d0d3e9e451023139f3
+  unpetrify-ref: libtool-2.4.6
+- name: file
+  repo: upstream:file
+  ref: f69c3fd9bcb108292e7887dd889e8b49f68c4a52
+  unpetrify-ref: file-5.22
+  build-system: autotools
+- name: libexpat
+  morph: strata/core/libexpat.morph
+  repo: upstream:libexpat
+  ref: 7cfc09db3e258129ab05811f2f9e351746ddab9f
+  unpetrify-ref: R_2_1_0
+  build-depends:
+  - autoconf
+  - automake
+  - file
+  - libtool-tarball
 - name: openssl-new
   morph: strata/core/openssl-new.morph
   repo: upstream:openssl-new
@@ -97,53 +106,32 @@ chunks:
   unpetrify-ref: baserock/genivi/baseline
   build-depends:
   - automake
+- name: libffi
+  morph: strata/core/libffi.morph
+  repo: upstream:libffi
+  ref: 77d4586cc47e8f4c02278afbc220145bba0d442b
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - autoconf
+  - automake
+- name: sqlite3
+  repo: upstream:sqlite3
+  ref: 24adc227bc29cd17e39df097fbca389c7724cd14
+  unpetrify-ref: sqlite-autoconf-3080801
+  build-system: autotools
 - name: cpython
   morph: strata/core/cpython.morph
   repo: upstream:cpython
-  ref: d0188e98ecf02e007d85fc34944f8be8f91b7e94
-  unpetrify-ref: v2.7.9
+  ref: 57af3f22d11600ca98c0c9073d0b3b57d43f7c4b
+  unpetrify-ref: v2.7.10
   build-depends:
   - openssl-new
   - bzip2
+  - libexpat
+  - libffi
   - sqlite3
   - ncurses
   - readline
-- name: cython
-  repo: upstream:cython
-  ref: 4dd8e762fa51d01775506fbbc102c45dbcea065d
-  unpetrify-ref: 0.22
-  build-depends:
-  - cpython
-- name: libtool-tarball
-  morph: strata/core/libtool-tarball.morph
-  repo: upstream:libtool-tarball
-  ref: c026ca36e37d2643623a75d0d3e9e451023139f3
-  unpetrify-ref: libtool-2.4.6
-- name: gtk-doc-stub
-  repo: upstream:gtk-doc-stub
-  ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - bash
-- name: xz
-  repo: upstream:xz
-  ref: a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
-  unpetrify-ref: v5.2.0
-  build-depends:
-  - autoconf-tarball
-  - automake
-  - gettext-tarball
-  - libtool-tarball
-- name: libxml2
-  repo: upstream:libxml2
-  ref: ee8f1d4cda8dc1a6f2c515fe234f7bc89cdc9f80
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - autoconf-tarball
-  - automake
-  - cpython
-  - libtool-tarball
-  - xz
 - name: ca-certificates
   morph: strata/core/ca-certificates.morph
   repo: upstream:ca-certificates
@@ -158,102 +146,124 @@ chunks:
   ref: 202aa9f7758636730299b86715d924f54468a908
   unpetrify-ref: curl-7_38_0
   build-depends:
-  - autoconf-tarball
+  - autoconf
   - automake
+  - file
   - libtool-tarball
   - openssl-new
   - ca-certificates
-- name: libexpat
-  morph: strata/core/libexpat.morph
-  repo: upstream:libexpat
-  ref: 7cfc09db3e258129ab05811f2f9e351746ddab9f
-  unpetrify-ref: R_2_1_0
-  build-depends:
-  - cmake
-- name: XML-Parser
-  repo: upstream:XML-Parser
-  ref: e1a3ec157140a699e3020836475a0df622f70f1b
-  unpetrify-ref: baserock/morph
+- name: gettext-tarball
+  morph: strata/core/gettext-tarball.morph
+  repo: upstream:gettext-tarball
+  ref: 482840e61f86ca321838a91e902c41d40c098bbb
+  unpetrify-ref: gettext-0.19.4
   build-depends:
   - libexpat
-  - libxml2
-  - perl
 - name: git
   morph: strata/core/git.morph
   repo: upstream:git
   ref: 9874fca7122563e28d699a911404fc49d2a24f1c
   unpetrify-ref: v2.3.0
   build-depends:
-  - autoconf-tarball
+  - autoconf
   - cpython
   - curl
   - gettext-tarball
   - libexpat
   - openssl-new
-- name: help2man
-  repo: upstream:help2man
-  ref: 83bab7e2e8e24a380266a9a247c029c49b0de666
-  unpetrify-ref: baserock/v1.46.5
+- name: flex
+  morph: strata/core/flex.morph
+  repo: upstream:flex
+  ref: de10f98e8a2dc2a021796811490d0f30c3cd90bf
+  unpetrify-ref: baserock/build-essential
   build-depends:
-  - autoconf-tarball
   - automake
+  - file
+  - gettext-tarball
+- name: mini-utils
+  morph: strata/core/mini-utils.morph
+  repo: baserock:baserock/mini-utils
+  ref: 5293265b29bbf468ab9d7f3302b19dbc81d0f8b8
+  unpetrify-ref: master
 - name: bison
   morph: strata/core/bison.morph
   repo: upstream:bison
   ref: 2ab6d1daaccf32fc4314e4b2fe44da977f11a308
   unpetrify-ref: baserock/v3.0.2
   build-depends:
-  - autoconf-tarball
+  - autoconf
   - automake
-  - bash
   - flex
   - gettext-tarball
   - git
   - help2man
   - mini-utils
-- name: gperf
-  morph: strata/core/gperf.morph
-  repo: upstream:gperf
-  ref: 5094e4a539adf845111013f82c2c4fcaec637983
-  unpetrify-ref: baserock/morph
-- name: intltool
-  repo: upstream:intltool
-  ref: 12f04c88be9ff8a578d8fd6990ee2448c66dc5f4
-  unpetrify-ref: baserock/morph
+- name: patch
+  morph: strata/core/patch.morph
+  repo: upstream:patch
+  ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f
+  unpetrify-ref: baserock/v2.7.1
   build-depends:
-  - XML-Parser
-  - autoconf-tarball
+  - autoconf
   - automake
-  - perl
+  - bison
+  - git
+  - mini-utils
+- name: xz
+  repo: upstream:xz
+  ref: a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
+  unpetrify-ref: v5.2.0
+  build-system: autotools
+  build-depends:
+  - autoconf
+  - automake
+  - file
+  - gettext-tarball
+  - libtool-tarball
+- name: libtool
+  morph: strata/core/libtool.morph
+  repo: upstream:libtool
+  ref: 5e11a17c39a2a976a09c33a568431a9f7ad00d48
+  unpetrify-ref: baserock/v2.4.6
+  build-depends:
+  - autoconf
+  - automake
+  - file
+  - help2man
+  - git
+  - patch
+  - texinfo-tarball
+  - xz
 - 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
+  - autoconf
   - automake
-  - libtool-tarball
+  - libtool
 - name: attr
   morph: strata/core/attr.morph
   repo: upstream:attr
   ref: 4b005410f865895d4dcd56e2c135278a7a315877
   unpetrify-ref: baserock/morph
   build-depends:
-  - autoconf-tarball
+  - file
+  - autoconf
   - automake
   - gettext-tarball
-  - libtool-tarball
+  - libtool
 - name: acl
   morph: strata/core/acl.morph
   repo: upstream:acl
   ref: f13e09bd54fd4a501c4952f002ed2752bdd9f93b
   unpetrify-ref: v2.2.52
   build-depends:
-  - autoconf-tarball
+  - autoconf
   - automake
   - gettext-tarball
-  - libtool-tarball
+  - libtool
   - attr
 - name: linux-pam
   morph: strata/core/linux-pam.morph
@@ -261,10 +271,10 @@ chunks:
   ref: b1521c97e73b10469f7b34c0571d51c647eca83c
   unpetrify-ref: Linux-PAM-1.1.8
   build-depends:
-  - autoconf-tarball
+  - autoconf
   - automake
   - gettext-tarball
-  - libtool-tarball
+  - libtool
   - pkg-config
   - flex
   - attr
@@ -275,10 +285,10 @@ chunks:
   ref: 4f7cca1bc9c2a274edb39d351b65747010d3ba7b
   unpetrify-ref: baserock/morph
   build-depends:
-  - autoconf-tarball
+  - autoconf
   - automake
   - gettext-tarball
-  - libtool-tarball
+  - libtool
   - pkg-config
   - attr
   - acl
@@ -286,13 +296,13 @@ chunks:
 - name: shadow
   morph: strata/core/shadow.morph
   repo: upstream:shadow
-  ref: 4f5000a45963c2cc2a403ad23e459f20296b29c2
-  unpetrify-ref: baserock/4.2
+  ref: bfaa59229d61adb7fa0c570f0d94fd324c6e05aa
+  unpetrify-ref: upstream/4.2.1
   build-depends:
-  - autoconf-tarball
+  - autoconf
   - automake
   - gettext-tarball
-  - libtool-tarball
+  - libtool
   - bison
   - attr
   - acl
@@ -304,73 +314,91 @@ chunks:
   ref: 34760e62e0d5a25262a6aa801b2f1df61216363f
   unpetrify-ref: v2.26.1
   build-depends:
-  - autoconf-tarball
+  - autoconf
   - automake
   - gettext-tarball
   - git
-  - libtool-tarball
+  - libtool
   - pkg-config
   - linux-pam
   - shadow
-- name: bc
-  repo: upstream:bc-tarball
-  ref: 0956d119432ff6a2e85bae1fa336df799cad70b0
-  unpetrify-ref: baserock/morph
+- name: e2fsprogs
+  morph: strata/core/e2fsprogs.morph
+  repo: upstream:e2fsprogs
+  ref: 6a3741ad293031447b95b88431eafa77401a8987
+  unpetrify-ref: v1.42.12
   build-depends:
-  - flex
-  - texinfo-tarball
-- name: patch
-  morph: strata/core/patch.morph
-  repo: upstream:patch
-  ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f
-  unpetrify-ref: baserock/v2.7.1
+  - pkg-config
+  - util-linux
+  - file
+- name: libxml2
+  repo: upstream:libxml2
+  ref: ee8f1d4cda8dc1a6f2c515fe234f7bc89cdc9f80
+  unpetrify-ref: baserock/morph
+  build-system: autotools
   build-depends:
-  - shadow
+  - autoconf
+  - automake
+  - file
+  - cpython
+  - libtool
+  - xz
 - name: libxslt
   repo: upstream:libxslt
   ref: 73e08bf7c36a9145d38f51d37e66529b873c011a
   unpetrify-ref: master
+  build-system: autotools
   build-depends:
-  - autoconf-tarball
-  - libtool-tarball
+  - autoconf
+  - libtool
   - automake
+  - file
   - libxml2
-- name: gnome-common
-  repo: upstream:gnome-common
-  ref: 5d61b55e8bea32fe2b52e21682ee4b3719b290c5
-  unpetrify-ref: 3.14.0
+- name: XML-Parser
+  repo: upstream:XML-Parser
+  ref: e1a3ec157140a699e3020836475a0df622f70f1b
+  unpetrify-ref: baserock/morph
+  build-system: cpan
   build-depends:
-  - autoconf-tarball
-  - automake
-- name: libffi
-  morph: strata/foundation/libffi.morph
-  repo: upstream:libffi
-  ref: 77d4586cc47e8f4c02278afbc220145bba0d442b
+  - libexpat
+  - perl
+- name: intltool
+  repo: upstream:intltool
+  ref: 12f04c88be9ff8a578d8fd6990ee2448c66dc5f4
   unpetrify-ref: baserock/morph
+  build-system: autotools
   build-depends:
-  - autoconf-tarball
+  - XML-Parser
+  - autoconf
   - automake
-- name: glib
-  repo: upstream:glib
-  ref: 966ffb16f6bd54cb3d928a55d00d0eda73592094
-  unpetrify-ref: 2.44.0
+  - perl
+- name: bash
+  morph: strata/core/bash.morph
+  repo: upstream:bash
+  ref: 3590145af6f1c9fa321dff231f69ae696e7e740b
+  unpetrify-ref: baserock/bash-4.3-patch-27
+- name: cmake
+  morph: strata/core/cmake.morph
+  repo: upstream:cmake
+  ref: 732d8a467ab8a295b1bbf580f865980f8a1a9b29
+  unpetrify-ref: v3.2.1
+- name: cython
+  repo: upstream:cython
+  ref: 4dd8e762fa51d01775506fbbc102c45dbcea065d
+  unpetrify-ref: 0.22
+  build-system: python-distutils
   build-depends:
-  - autoconf-tarball
-  - automake
   - cpython
-  - gettext-tarball
-  - libffi
-  - pkg-config
-- name: gobject-introspection
-  repo: upstream:gobject-introspection
-  ref: c0243e116c5e261c262dded9f4d7726a770c5a19
-  unpetrify-ref: GOBJECT_INTROSPECTION_1_44_0
+- name: gperf
+  morph: strata/core/gperf.morph
+  repo: upstream:gperf
+  ref: 5094e4a539adf845111013f82c2c4fcaec637983
+  unpetrify-ref: baserock/morph
+- name: bc
+  repo: upstream:bc-tarball
+  ref: 0956d119432ff6a2e85bae1fa336df799cad70b0
+  unpetrify-ref: baserock/morph
+  build-system: autotools
   build-depends:
-  - autoconf-tarball
-  - automake
-  - bison
-  - cpython
   - flex
-  - glib
-  - libffi
-  - pkg-config
+  - texinfo-tarball
diff --git a/strata/core/attr.morph b/strata/core/attr.morph
index 46d0b9c0..d0bf6976 100644
--- a/strata/core/attr.morph
+++ b/strata/core/attr.morph
@@ -1,8 +1,9 @@
 name: attr
 kind: chunk
 build-system: autotools
-configure-commands:
+pre-configure-commands:
 - make configure
+configure-commands:
 - |
   ./configure --prefix="$PREFIX" \
               --exec-prefix="$PREFIX" \
diff --git a/strata/core/autoconf.morph b/strata/core/autoconf.morph
new file mode 100644
index 00000000..63b95ba8
--- /dev/null
+++ b/strata/core/autoconf.morph
@@ -0,0 +1,5 @@
+name: autoconf
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- echo "2.69" > .tarball-version
diff --git a/strata/core/bison.morph b/strata/core/bison.morph
index 7c7fffd9..f122ca3f 100644
--- a/strata/core/bison.morph
+++ b/strata/core/bison.morph
@@ -2,4 +2,4 @@ name: bison
 kind: chunk
 build-system: autotools
 pre-configure-commands:
-- bash bootstrap --skip-po
+- sh bootstrap --skip-po --no-git --gnulib-srcdir=gnulib
diff --git a/strata/core/ca-certificates.morph b/strata/core/ca-certificates.morph
index b7bd9e5a..5bdb18ea 100644
--- a/strata/core/ca-certificates.morph
+++ b/strata/core/ca-certificates.morph
@@ -1,11 +1,12 @@
 name: ca-certificates
 kind: chunk
-build-system: autotools
-configure-commands: []
-pre-install-commands:
+build-system: manual
+build-commands:
+- make
+install-commands:
 - mkdir -p "$DESTDIR"/usr/share/ca-certificates
 - mkdir -p "$DESTDIR"/usr/sbin
-post-install-commands:
+- make DESTDIR="$DESTDIR" install
 - mkdir "$DESTDIR"/etc
 - |
   cd "$DESTDIR"/usr/share/ca-certificates
diff --git a/strata/core/cpython.morph b/strata/core/cpython.morph
index 6c9e4b3d..d0c80220 100644
--- a/strata/core/cpython.morph
+++ b/strata/core/cpython.morph
@@ -2,6 +2,10 @@ name: cpython
 kind: chunk
 build-system: autotools
 configure-commands:
-- ./configure --prefix="$PREFIX" --enable-shared
+- |
+  ./configure --prefix="$PREFIX"  \
+              --enable-shared     \
+              --with-system-expat \
+              --with-system-ffi
 post-install-commands:
 - test -x "$DESTDIR"/"$PREFIX"/bin/python2 || ln -s python2.7 "$DESTDIR"/"$PREFIX"/bin/python2
diff --git a/strata/foundation/e2fsprogs.morph b/strata/core/e2fsprogs.morph
index 55ac486c..55ac486c 100644
--- a/strata/foundation/e2fsprogs.morph
+++ b/strata/core/e2fsprogs.morph
diff --git a/strata/core/libexpat.morph b/strata/core/libexpat.morph
index b36a67aa..05285c0d 100644
--- a/strata/core/libexpat.morph
+++ b/strata/core/libexpat.morph
@@ -1,8 +1,6 @@
 name: libexpat
 kind: chunk
-configure-commands:
-- mkdir o && cd o && cmake -DCMAKE_INSTALL_PREFIX=/usr ..
-build-commands:
-- cd o && make
-install-commands:
-- cd o && make DESTDIR="$DESTDIR" install
+build-system: autotools
+pre-configure-commands:
+- ./buildconf.sh
+- automake --add-missing --copy || true
diff --git a/strata/foundation/libffi.morph b/strata/core/libffi.morph
index 174477af..174477af 100644
--- a/strata/foundation/libffi.morph
+++ b/strata/core/libffi.morph
diff --git a/strata/core/libtool.morph b/strata/core/libtool.morph
new file mode 100644
index 00000000..04263ac9
--- /dev/null
+++ b/strata/core/libtool.morph
@@ -0,0 +1,5 @@
+name: libtool
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- ./bootstrap
diff --git a/strata/core/mini-utils.morph b/strata/core/mini-utils.morph
index dc915b30..a3d1109e 100644
--- a/strata/core/mini-utils.morph
+++ b/strata/core/mini-utils.morph
@@ -1,6 +1,7 @@
 name: mini-utils
 kind: chunk
-build-system: autotools
-configure-commands: []
+build-system: manual
+build-commands:
+- make
 install-commands:
 - make PREFIX="$PREFIX" DESTDIR="$DESTDIR" install
diff --git a/strata/core/shadow.morph b/strata/core/shadow.morph
index d709ddcb..cdb1ff75 100644
--- a/strata/core/shadow.morph
+++ b/strata/core/shadow.morph
@@ -1,18 +1,18 @@
 name: shadow
 kind: chunk
 build-system: autotools
+pre-configure-commands:
+- autoreconf -vfi
 configure-commands:
 # Installing to /bin so that they overwrite busybox login.
 - |
-  ./autogen.sh --with-selinux=no \
+  ./configure  --with-selinux=no \
                --sysconfdir=/etc \
-               --with-pam=yes \
+               --with-libpam=yes \
                --prefix="$PREFIX" \
                --bindir=/bin
 post-install-commands:
 # Disable things handled by pam instead
-- rm "$DESTDIR/etc/limits"
-- rm "$DESTDIR/etc/login.access"
 - |
   for OPTION in FAIL_DELAY \
                 FAILLOG_ENAB \
@@ -31,9 +31,25 @@ post-install-commands:
                 PASS_CHANGE_TRIES \
                 PASS_ALWAYS_WARN \
                 CHFN_AUTH \
-                ENCRYPT_METHOD \
                 ENVIRON_FILE
   do
-    sed -i "s/^${OPTION}.*/# & #This option is handled by PAM instead./" \
+    sed -i -e "s/^${OPTION}.*/# & #This option is handled by PAM instead./" \
         "$DESTDIR/etc/login.defs"
   done
+# ENCRYPT_METHOD is handled specially with PAM, it will use the default as
+# provided in login.defs, but it may be overridden in the pam.d config.
+# We do not currently override this though, and it's better to guard oursleves
+# against accidentally reducing password security by forgetting to include the
+# algorithm as an argument to the PAM module, so ENCRYPT_METHOD is configured
+# here, rather than in PAM.
+- |
+  if grep -q '[\s#]ENCRYPT_METHOD' "$DESTDIR/etc/login.defs"; then
+      sed -i -e '/^[\s#]*ENCRYPT_METHOD /s/.*/ENCRYPT_METHOD SHA512/g' "$DESTDIR/etc/login.defs"
+  else
+      echo 'ENCRYPT_METHOD SHA512' >>"$DESTDIR/etc/login.defs"
+  fi
+
+# The default pam.d config files have pam_selinux.so as a requirement, even
+# when shadow is configured '--with-selinux=no'. We change this default config
+# to make this requirement optional.
+- sed -i -e 's/\(.*\)required\(.*pam_selinux.so.*\)/\1optional\2/' "$DESTDIR"/etc/pam.d/*
diff --git a/strata/core/util-linux.morph b/strata/core/util-linux.morph
index eebba6f6..1ec7f8e2 100644
--- a/strata/core/util-linux.morph
+++ b/strata/core/util-linux.morph
@@ -1,8 +1,9 @@
 name: util-linux
 kind: chunk
 build-system: autotools
-configure-commands:
+pre-configure-commands:
 - ./autogen.sh
+configure-commands:
 # Installing to /bin so that they overwrite busybox login.
 - |
   ./configure --prefix="$PREFIX" \
diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph
index 430e3fe5..2ad2d866 100644
--- a/strata/coreutils-common.morph
+++ b/strata/coreutils-common.morph
@@ -33,3 +33,8 @@ chunks:
   unpetrify-ref: baserock/release_1_28
   build-depends:
   - coreutils
+- name: findutils
+  morph: strata/coreutils-common/findutils.morph
+  repo: upstream:findutils
+  ref: ee6b25541336f9d74624ca814538ddc8c67f0732
+  unpetrify-ref: baserock/v4.5.14
diff --git a/strata/coreutils-common/diff.morph b/strata/coreutils-common/diff.morph
index 346f8635..c5eb809d 100644
--- a/strata/coreutils-common/diff.morph
+++ b/strata/coreutils-common/diff.morph
@@ -1,7 +1,8 @@
 name: diff
 kind: chunk
 build-system: autotools
-configure-commands:
+pre-configure-commands:
 - sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
-- ./bootstrap --skip-po
+- ./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib
+configure-commands:
 - ./configure --prefix="$PREFIX" --disable-gcc-warnings
diff --git a/strata/coreutils-common/findutils.morph b/strata/coreutils-common/findutils.morph
new file mode 100644
index 00000000..c9ba5ab6
--- /dev/null
+++ b/strata/coreutils-common/findutils.morph
@@ -0,0 +1,5 @@
+name: findutils
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- ./import-gnulib.sh -d gnulib
diff --git a/strata/coreutils-common/sed.morph b/strata/coreutils-common/sed.morph
index 92f6fa51..75b969de 100644
--- a/strata/coreutils-common/sed.morph
+++ b/strata/coreutils-common/sed.morph
@@ -1,9 +1,10 @@
 name: sed
 kind: chunk
 build-system: autotools
-configure-commands:
+pre-configure-commands:
 - sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
-- ./bootstrap --skip-po
+- ./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib
+configure-commands:
 - ./configure --prefix="$PREFIX" --disable-gcc-warnings
 post-install-commands:
 # This hack is to use GNU sed instead the busybox one.
diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph
index ffed2e66..e0c5991d 100644
--- a/strata/cross-bootstrap.morph
+++ b/strata/cross-bootstrap.morph
@@ -21,6 +21,7 @@ chunks:
   repo: upstream:linux-user-chroot
   ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: rsync
   morph: strata/cross-bootstrap/rsync.morph
   repo: upstream:rsync
diff --git a/strata/cross-tools.morph b/strata/cross-tools.morph
index 36a82808..795d3936 100644
--- a/strata/cross-tools.morph
+++ b/strata/cross-tools.morph
@@ -8,3 +8,4 @@ chunks:
   repo: upstream:patchelf
   ref: 21a85cc1c63cf3ef060ece59cdd82455e2884703
   unpetrify-ref: baserock/morph
+  build-system: autotools
diff --git a/strata/cups.morph b/strata/cups.morph
new file mode 100644
index 00000000..b10bcd6c
--- /dev/null
+++ b/strata/cups.morph
@@ -0,0 +1,11 @@
+name: cups
+kind: stratum
+description: Cups printer driver
+build-depends:
+- morph: strata/core.morph
+chunks:
+- name: cups
+  morph: strata/cups/cups.morph
+  repo: upstream:cups
+  ref: f28bae1aeae3964fba4f0728263657405f63c417
+  unpetrify-ref: release-1.7.0
diff --git a/strata/cups/cups.morph b/strata/cups/cups.morph
new file mode 100644
index 00000000..a3c2edf8
--- /dev/null
+++ b/strata/cups/cups.morph
@@ -0,0 +1,12 @@
+name: cups
+kind: chunk
+build-system: manual
+configure-commands:
+- autoconf
+- ./configure --prefix="$PREFIX"
+build-commands:
+- make
+# Note: BUILDROOT is the variable recommended in INSTALL.txt for the
+# destination directory.
+install-commands:
+- make BUILDROOT="$DESTDIR" install
diff --git a/strata/cxmanage.morph b/strata/cxmanage.morph
index 326f7a59..adc9faba 100644
--- a/strata/cxmanage.morph
+++ b/strata/cxmanage.morph
@@ -8,6 +8,7 @@ chunks:
   repo: upstream:ipmitool
   ref: 830d5a3787b265e5dde154d2f0e08b10ae9a7bcd
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: pexpect
   morph: strata/cxmanage/pexpect.morph
   repo: upstream:pexpect
@@ -17,14 +18,17 @@ chunks:
   repo: upstream:pyipmi
   ref: bb7dba84578c05ba87db3c4186a2989c89e4e519
   unpetrify-ref: baserock/morph
+  build-system: python-distutils
 - name: tftpy
   repo: upstream:tftpy
   ref: f3d2fc4c62c1e64dd49adfaf8e65097eb8ea307b
   unpetrify-ref: baserock/morph
+  build-system: python-distutils
 - name: cxmanage
   repo: upstream:cxmanage
   ref: 54116d3c486ed7aa49f284e4cad9e6e7c293bea6
   unpetrify-ref: baserock/morph
+  build-system: python-distutils
   build-depends:
   - ipmitool
   - pexpect
diff --git a/strata/databases.morph b/strata/databases.morph
index 89aa996e..1f8f7b8d 100644
--- a/strata/databases.morph
+++ b/strata/databases.morph
@@ -10,6 +10,7 @@ chunks:
   repo: upstream:postgresql
   ref: d4f8dde3c1c2c90c723ab550e7f449fc75599316
   unpetrify-ref: REL9_3_4
+  build-system: autotools
 - name: redis
   morph: strata/databases/redis.morph
   repo: upstream:redis
@@ -24,9 +25,11 @@ chunks:
   repo: upstream:python-packages/psycopg2
   ref: 00cafbe85bb82d85cbfe0f062a73c562433b5bc8
   unpetrify-ref: 2.5.4
+  build-system: python-distutils
   build-depends:
   - postgresql
 - name: python-memcached
   repo: upstream:python-packages/python-memcached
   ref: 156ee975ff6e5c69e1d6c58b09bedf03c182c5db
   unpetrify-ref: master
+  build-system: python-distutils
diff --git a/strata/devtools.morph b/strata/devtools.morph
index 5fb93c1d..7bc8b581 100644
--- a/strata/devtools.morph
+++ b/strata/devtools.morph
@@ -23,6 +23,7 @@ chunks:
   repo: upstream:pv
   ref: d6ce7cfec684fa72d7a919d7b1aa817a0ca6102a
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: screen
   morph: strata/devtools/screen.morph
   repo: upstream:screen
@@ -32,7 +33,14 @@ chunks:
   repo: upstream:less
   ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: git-review
   repo: upstream:git-review
   ref: 79262a52301c146a6b60d09a828661a83a5f5ba7
   unpetrify-ref: master
+  build-system: python-distutils
+- name: wget
+  morph: strata/devtools/wget.morph
+  repo: upstream:wget
+  ref: 71d79f4f3043cf4ca3b2fb7f5328eae725c1293f
+  unpetrify-ref: baserock/v1.16.3
diff --git a/strata/devtools/wget.morph b/strata/devtools/wget.morph
new file mode 100644
index 00000000..a3a7995a
--- /dev/null
+++ b/strata/devtools/wget.morph
@@ -0,0 +1,10 @@
+name: wget
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+# rsync is needed if we want the bootstrap script to download .po files,
+# we can't download into our chroot so we remove this dependency
+- sed -i '/^buildreq="/,/"/ { /^rsync.*/ d }' bootstrap.conf
+- ./bootstrap --no-bootstrap-sync --skip-po
+configure-commands:
+- ./configure --prefix="$PREFIX" --with-ssl=openssl
diff --git a/strata/django.morph b/strata/django.morph
index 8ae63801..7da11a9f 100644
--- a/strata/django.morph
+++ b/strata/django.morph
@@ -9,24 +9,29 @@ chunks:
   repo: upstream:python-packages/django
   ref: 811508b0512d3fa6b2328f8647fbf9eace68eceb
   unpetrify-ref: 1.6.8
+  build-system: python-distutils
 - name: django-appconf
   repo: upstream:python-packages/django-appconf
   ref: 0c9835f95b44db1b3eb1a9409f95a3ecd63b8ff5
   unpetrify-ref: 0.6
+  build-system: python-distutils
 - name: django-compressor
   repo: upstream:python-packages/django-compressor
   ref: e747dce3d7e04fe595bbfed54f9554c2725eb757
   unpetrify-ref: 1.4
+  build-system: python-distutils
   build-depends:
   - django-appconf
 - name: pyscss
   repo: upstream:python-packages/pyscss
   ref: 85e8806e39e840c4402ee813c3e38fefaf9212b4
   unpetrify-ref: 1.2.1
+  build-system: python-distutils
 - name: django-pyscss
   repo: upstream:python-packages/django-pyscss
   ref: 665270b54eea5de5aca379a78673b411ed6b1f04
   unpetrify-ref: v1.0.6
+  build-system: python-distutils
   build-depends:
   - django
   - pyscss
diff --git a/strata/docutils.morph b/strata/docutils.morph
new file mode 100644
index 00000000..4329bb42
--- /dev/null
+++ b/strata/docutils.morph
@@ -0,0 +1,52 @@
+name: docutils
+kind: stratum
+description: Stuff for generating documentation
+build-depends:
+- morph: strata/core.morph
+chunks:
+- name: xml-catalog
+  morph: strata/docutils/xml-catalog.morph
+  repo: baserock:baserock/xml-catalog
+  ref: 1d4a2abc875c4dda1b5eadc0a097a48a8d2ec82b
+  unpetrify-ref: master
+- name: docbook-xml
+  morph: strata/docutils/docbook-xml.morph
+  repo: upstream:docbook-xml
+  ref: c8f0ce32a8075e9ab21e5cf734fb96195455264d
+  unpetrify-ref: docbook-xml-4.5
+  build-depends:
+  # This is a little awkward, we don't really build-depend on xml-catalog,
+  # but if we don't include it as a build dependency
+  # then we won't have the existing xml catalog in our staging area
+  # which would cause this chunk to create a new catalog which would
+  # overwrite the catalog created by the 'xml-catalog' chunk.
+  #
+  # construction of the catalog cannot be done at system-integration time
+  # because we need the catalog *here* in order to build nasm complete with
+  # man pages.
+  - xml-catalog
+- name: docbook-xsl
+  morph: strata/docutils/docbook-xsl.morph
+  repo: upstream:docbook-xsl
+  ref: 802da9dd5d4bc18f46a916eedc0c5c1980a15e59
+  unpetrify-ref: docbook-xsl-1.78.1
+  build-depends:
+  # Same issue as above, except this time we don't want to overwrite
+  # the catalog that now contains the XML DTDs.
+  - docbook-xml
+- name: asciidoc
+  repo: upstream:asciidoc
+  ref: d3a6df0caa94edaf8180bd71bf2fc68390f56520
+  unpetrify-ref: 8.6.9
+  build-system: autotools
+  build-depends:
+  - docbook-xml
+  - docbook-xsl
+- name: xmlto
+  repo: upstream:xmlto-tarball
+  ref: 6a590aba95cbcce0f184381fb19d16558e56832d
+  unpetrify-ref: xmlto-0.0.26
+  build-system: autotools
+  build-depends:
+  - docbook-xml
+  - docbook-xsl
diff --git a/strata/docutils/docbook-xml.morph b/strata/docutils/docbook-xml.morph
new file mode 100644
index 00000000..91233b6d
--- /dev/null
+++ b/strata/docutils/docbook-xml.morph
@@ -0,0 +1,104 @@
+name: docbook-xml
+kind: chunk
+build-system: manual
+install-commands:
+- install -v -d -m755 "$DESTDIR$PREFIX/share/xml/docbook/xml-dtd-4.5"
+- install -v -d -m755 "$DESTDIR/etc/xml"
+- |
+  cp -v -af docbook.cat *.dtd ent/ *.mod \
+       "$DESTDIR$PREFIX/share/xml/docbook/xml-dtd-4.5"
+post-install-commands:
+- |
+  # Create (or update) and populate the "$DESTDIR/etc/xml/docbook" catalog file
+  if [ ! -e /etc/xml/docbook ]; then
+      xmlcatalog --noout --create "$DESTDIR/etc/xml/docbook"
+  else
+      # Copy the existing catalog so we can update it
+      cp /etc/xml/docbook "$DESTDIR/etc/xml/docbook"
+  fi
+
+- |
+  xmlcatalog --noout --add "public" \
+   "-//OASIS//DTD DocBook XML V4.5//EN" \
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
+   "$DESTDIR/etc/xml/docbook"
+- |
+  xmlcatalog --noout --add "public" \
+   "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
+   "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \
+   "$DESTDIR/etc/xml/docbook"
+- |
+  xmlcatalog --noout --add "public" \
+   "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+   "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \
+   "$DESTDIR/etc/xml/docbook"
+- |
+  xmlcatalog --noout --add "public" \
+   "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
+   "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \
+   "$DESTDIR/etc/xml/docbook"
+- |
+  xmlcatalog --noout --add "public" \
+   "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
+   "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \
+   "$DESTDIR/etc/xml/docbook"
+- |
+  xmlcatalog --noout --add "public" \
+   "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
+   "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \
+   "$DESTDIR/etc/xml/docbook"
+- |
+  xmlcatalog --noout --add "public" \
+   "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
+   "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \
+   "$DESTDIR/etc/xml/docbook"
+- |
+  xmlcatalog --noout --add "public" \
+   "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
+   "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \
+   "$DESTDIR/etc/xml/docbook"
+- |
+  xmlcatalog --noout --add "public" \
+   "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \
+   "$DESTDIR/etc/xml/docbook"
+- |
+  xmlcatalog --noout --add "rewriteSystem" \
+   "http://www.oasis-open.org/docbook/xml/4.5" \
+   "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+   "$DESTDIR/etc/xml/docbook"
+- |
+  xmlcatalog --noout --add "rewriteURI" \
+   "http://www.oasis-open.org/docbook/xml/4.5" \
+   "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+   "$DESTDIR/etc/xml/docbook"
+
+- |
+  # Create (or update) and populate the "$DESTDIR/etc/xml/catalog" catalog file
+  if [ ! -e /etc/xml/catalog ]; then
+      echo 'Creating new xml catalog'
+      xmlcatalog --noout --create "$DESTDIR/etc/xml/catalog"
+  else
+      # Copy the existing catalog so we can update it
+      cp /etc/xml/catalog "$DESTDIR/etc/xml/catalog"
+  fi
+
+- |
+  xmlcatalog --noout --add "delegatePublic" \
+   "-//OASIS//ENTITIES DocBook XML" \
+   "file:///etc/xml/docbook" \
+   "$DESTDIR/etc/xml/catalog"
+- |
+  xmlcatalog --noout --add "delegatePublic" \
+   "-//OASIS//DTD DocBook XML" \
+   "file:///etc/xml/docbook" \
+   "$DESTDIR/etc/xml/catalog"
+- |
+  xmlcatalog --noout --add "delegateSystem" \
+   "http://www.oasis-open.org/docbook/" \
+   "file:///etc/xml/docbook" \
+   "$DESTDIR/etc/xml/catalog"
+- |
+  xmlcatalog --noout --add "delegateURI" \
+   "http://www.oasis-open.org/docbook/" \
+   "file:///etc/xml/docbook" \
+   "$DESTDIR/etc/xml/catalog"
diff --git a/strata/docutils/docbook-xsl.morph b/strata/docutils/docbook-xsl.morph
new file mode 100644
index 00000000..b3bf396d
--- /dev/null
+++ b/strata/docutils/docbook-xsl.morph
@@ -0,0 +1,50 @@
+name: docbook-xsl
+kind: chunk
+install-commands:
+- install -v -m755 -d "$DESTDIR$PREFIX/share/xml/docbook/xsl-stylesheets-1.78.1"
+- |
+  cp -v -R VERSION common eclipse epub extensions fo highlighting html \
+           htmlhelp images javahelp lib manpages params profiling \
+           roundtrip slides template tests tools webhelp website \
+           xhtml xhtml-1_1 \
+           "$DESTDIR$PREFIX/share/xml/docbook/xsl-stylesheets-1.78.1"
+
+- ln -s VERSION "$DESTDIR$PREFIX/share/xml/docbook/xsl-stylesheets-1.78.1/VERSION.xsl"
+
+- install -v -m644 -D README "$DESTDIR$PREFIX/share/doc/docbook-xsl-1.78.1/README.txt"
+- |
+  install -v -m644    RELEASE-NOTES* NEWS* \
+                      "$DESTDIR$PREFIX/share/doc/docbook-xsl-1.78.1"
+post-install-commands:
+- if [ ! -d "$DESTDIR/etc/xml" ]; then install -v -m755 -d "$DESTDIR/etc/xml"; fi
+- |
+  if [ ! -e /etc/xml/catalog ]; then
+    echo "Creating new xml catalog"
+    xmlcatalog --noout --create "$DESTDIR/etc/xml/catalog"
+  else
+    cp /etc/xml/catalog "$DESTDIR/etc/xml/catalog"
+  fi
+
+- |
+  xmlcatalog --noout --add "rewriteSystem" \
+        "http://docbook.sourceforge.net/release/xsl/1.78.1" \
+        "/usr/share/xml/docbook/xsl-stylesheets-1.78.1" \
+    "$DESTDIR/etc/xml/catalog"
+
+- |
+  xmlcatalog --noout --add "rewriteURI" \
+        "http://docbook.sourceforge.net/release/xsl/1.78.1" \
+        "/usr/share/xml/docbook/xsl-stylesheets-1.78.1" \
+    "$DESTDIR/etc/xml/catalog"
+
+- |
+  xmlcatalog --noout --add "rewriteSystem" \
+         "http://docbook.sourceforge.net/release/xsl/current" \
+         "/usr/share/xml/docbook/xsl-stylesheets-1.78.1" \
+    "$DESTDIR/etc/xml/catalog"
+
+- |
+  xmlcatalog --noout --add "rewriteURI" \
+        "http://docbook.sourceforge.net/release/xsl/current" \
+        "/usr/share/xml/docbook/xsl-stylesheets-1.78.1" \
+    "$DESTDIR/etc/xml/catalog"
diff --git a/strata/virtualization/xml-catalog.morph b/strata/docutils/xml-catalog.morph
index 34ba0306..34ba0306 100644
--- a/strata/virtualization/xml-catalog.morph
+++ b/strata/docutils/xml-catalog.morph
diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph
index d1637f48..cf3d0e8b 100644
--- a/strata/enlightenment.morph
+++ b/strata/enlightenment.morph
@@ -13,6 +13,7 @@ chunks:
   repo: upstream:fribidi
   ref: c9916f2ab289126a32febcc4754efc73a011fb0c
   unpetrify-ref: baserock/morph/0.19.6
+  build-system: autotools
 - name: bullet3
   morph: strata/enlightenment/bullet3.morph
   repo: upstream:bullet3
diff --git a/strata/enlightenment/bullet3.morph b/strata/enlightenment/bullet3.morph
index 74cb097a..357e1f67 100644
--- a/strata/enlightenment/bullet3.morph
+++ b/strata/enlightenment/bullet3.morph
@@ -1,4 +1,4 @@
-name: bullet
+name: bullet3
 kind: chunk
 configure-commands:
 - cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON
diff --git a/strata/erlang.morph b/strata/erlang.morph
index d31e78cd..e9e61bea 100644
--- a/strata/erlang.morph
+++ b/strata/erlang.morph
@@ -2,7 +2,7 @@ name: erlang
 kind: stratum
 description: stratum for erlang/otp and stuff
 build-depends:
-- morph: strata/tools.morph
+- morph: strata/core.morph
 chunks:
 - name: erlang
   morph: strata/erlang/erlang.morph
@@ -16,11 +16,3 @@ chunks:
   unpretrify-ref: master
   build-depends:
   - erlang
-- name: erlang-sd_notify
-  morph: strata/erlang/erlang-sd_notify.morph
-  repo: upstream:erlang-modules/erlang-sd_notify
-  ref: 99f4689c2c18570680329f822591f95f9341ca10
-  unpretrify-ref: master
-  build-depends:
-  - erlang
-  - rebar
diff --git a/strata/foundation.morph b/strata/foundation.morph
index e18f197a..e7776aa4 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -8,6 +8,7 @@ chunks:
   repo: upstream:bash-completion
   ref: 3085c7e12179817a02a611016606391295c69942
   unpetrify-ref: 2.1
+  build-system: autotools
 - name: groff
   morph: strata/foundation/groff.morph
   repo: upstream:groff-git
@@ -31,8 +32,8 @@ chunks:
 - name: dbus-pre
   morph: strata/foundation/dbus-pre.morph
   repo: upstream:dbus
-  ref: 3c055572ced8f63eb9756caa4b1a19225f22e6ff
-  unpetrify-ref: baserock/dbus-1.8.16-1-g3c05557/genivi/J-1.0
+  ref: 92a2d95a6c4457783dbd663bab27260c328f2248
+  unpetrify-ref: baserock/genivi/dbus-1.9.16-1-g92a2d95
 - name: libgpg-error
   morph: strata/foundation/libgpg-error.morph
   repo: upstream:libgpg-error
@@ -43,6 +44,7 @@ chunks:
   ref: 412eed473b557ed2172d81d76fa1e1f53c973a67
   build-depends:
   - libgpg-error
+  build-system: autotools
 - name: systemd
   morph: strata/foundation/systemd.morph
   repo: upstream:systemd
@@ -58,12 +60,14 @@ chunks:
   unpetrify-ref: v1.0.19
   build-depends:
   - systemd
+  build-system: autotools
 - name: usbutils
   repo: upstream:usbutils
   ref: c37f146eb2c6642c600f1b025a6d56996b0697ff
   unpetrify-ref: baserock/v008
   build-depends:
   - libusb
+  build-system: autotools
 - name: lzo
   morph: strata/foundation/lzo.morph
   repo: upstream:lzo
@@ -74,24 +78,18 @@ chunks:
   repo: upstream:fuse
   ref: d69e627e79862e2df4ff9ff1ddb0363c4520d8a8
   unpetrify-ref: baserock/morph
-- name: e2fsprogs
-  morph: strata/foundation/e2fsprogs.morph
-  repo: upstream:e2fsprogs
-  ref: 6a3741ad293031447b95b88431eafa77401a8987
-  unpetrify-ref: v1.42.12
 - name: btrfs-progs
   morph: strata/foundation/btrfs-progs.morph
   repo: upstream:btrfs-progs
-  ref: 563ff3b07d85517e3589a1f2e6f45a8265e3f071
-  unpetrify-ref: v3.18.2
+  ref: 19a806f575cd010734fa5793c4b3bfb49926dc62
+  unpetrify-ref: v4.0
   build-depends:
   - lzo
-  - e2fsprogs
 - name: dbus
   morph: strata/foundation/dbus.morph
   repo: upstream:dbus
-  ref: 3c055572ced8f63eb9756caa4b1a19225f22e6ff
-  unpetrify-ref: baserock/dbus-1.8.16-1-g3c05557/genivi/J-1.0
+  ref: 92a2d95a6c4457783dbd663bab27260c328f2248
+  unpetrify-ref: baserock/genivi/dbus-1.9.16-1-g92a2d95
   build-depends:
   - systemd
 - name: openssh
@@ -104,14 +102,8 @@ chunks:
 - name: tbdiff
   morph: strata/foundation/tbdiff.morph
   repo: baserock:baserock/tbdiff
-  ref: 47fb728f2432929868666afc915dbc5a64836c08
+  ref: 235e95c3479f96b04d33edecc684f985bda50e53
   unpetrify-ref: master
-- name: dbus-glib
-  repo: upstream:dbus-glib
-  ref: 397e8297d433547c9bf4150ddd2b9e0b4c39628c
-  unpetrify-ref: dbus-glib_0.102
-  build-depends:
-  - dbus
 - name: rsync
   morph: strata/foundation/rsync.morph
   repo: upstream:rsync
diff --git a/strata/foundation/btrfs-progs.morph b/strata/foundation/btrfs-progs.morph
index d5cb83f0..807a115f 100644
--- a/strata/foundation/btrfs-progs.morph
+++ b/strata/foundation/btrfs-progs.morph
@@ -1,6 +1,8 @@
 name: btrfs-progs
 kind: chunk
-build-commands:
-- make DISABLE_DOCUMENTATION=1
-install-commands:
-- make DESTDIR="$DESTDIR" prefix="$PREFIX" DISABLE_DOCUMENTATION=1 install
+build-system: autotools
+pre-configure-commands:
+- ./autogen.sh
+configure-commands:
+# The change in the CFLAGS is needed to make the compilation succeed in armv5l
+- export CFLAGS="-O2 $CFLAGS"; ./configure --prefix="$PREFIX" --disable-documentation
diff --git a/strata/foundation/dbus.morph b/strata/foundation/dbus.morph
index 255d2915..23840ce1 100644
--- a/strata/foundation/dbus.morph
+++ b/strata/foundation/dbus.morph
@@ -3,7 +3,7 @@ kind: chunk
 build-system: autotools
 configure-commands:
 - sh autogen.sh --no-configure
-- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc
+- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --enable-user-session
 build-commands:
 - make XMLTO_OUTPUT=
 install-commands:
diff --git a/strata/foundation/fuse.morph b/strata/foundation/fuse.morph
index 6f7fc170..5d431307 100644
--- a/strata/foundation/fuse.morph
+++ b/strata/foundation/fuse.morph
@@ -1,6 +1,5 @@
 name: fuse
 kind: chunk
 build-system: autotools
-configure-commands:
+pre-configure-commands:
 - ./makeconf.sh
-- ./configure --prefix="$PREFIX"
diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph
index efca734f..26c226fb 100644
--- a/strata/foundation/systemd.morph
+++ b/strata/foundation/systemd.morph
@@ -15,6 +15,7 @@ configure-commands:
 # all systems
 - |
   KILL=/bin/kill ./configure --prefix="$PREFIX" --enable-xz --disable-manpages \
+      --disable-gudev \
       --disable-tests --sysconfdir=/etc --localstatedir=/var \
       --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" \
       --with-rootprefix= --with-rootlibdir=/lib
@@ -39,3 +40,8 @@ post-install-commands:
   EOF
 # Use the pam config systemd provides
 - cp -a "$DESTDIR/$PREFIX"/share/factory/etc/pam.d/* "$DESTDIR/etc/pam.d"
+
+# Add pam_deny.so to the default systemd-auth pam.d config file. Without
+# it, if shadow is configured to use PAM, it would be possible to login
+# to a system with the wrong password.
+- echo 'auth     requisite  pam_deny.so' >> "$DESTDIR"/etc/pam.d/system-auth
diff --git a/strata/foundation/time-zone-database.morph b/strata/foundation/time-zone-database.morph
index c3c89bcf..701d781a 100644
--- a/strata/foundation/time-zone-database.morph
+++ b/strata/foundation/time-zone-database.morph
@@ -7,4 +7,5 @@ install-commands:
 # ETCDIR is actually where the 'tzselect', 'zdump' and 'zic' commands get
 # installed. Note that tzselect from this chunk will overlap with and override
 # the tzselect binary from GLIBC.
-- make TOPDIR="$PREFIX" ETCDIR="$PREFIX/bin" TZDIR="$PREFIX/share/zoneinfo" DESTDIR="$DESTDIR" install
+- make TOPDIR="$PREFIX" ETCDIR="$PREFIX/bin" TZDIR="$PREFIX/share/zoneinfo" DESTDIR="$DESTDIR"
+  install
diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph
deleted file mode 100644
index 0773ffdf..00000000
--- a/strata/genivi-demo-platform.morph
+++ /dev/null
@@ -1,96 +0,0 @@
-name: genivi-demo-platform
-kind: stratum
-description: Components which make up the GENIVI demo platform.
-build-depends:
-- morph: strata/gtk2.morph
-- morph: strata/qt5-tools.morph
-- morph: strata/qt5-tools-qtmultimedia.morph
-- morph: strata/qt5-tools-qtwebkit.morph
-- morph: strata/genivi.morph
-- morph: strata/wayland-generic.morph
-- morph: strata/weston-genivi.morph
-- morph: strata/python-pygobject.morph
-chunks:
-- name: mm-common
-  morph: strata/genivi-demo-platform/mm-common.morph
-  repo: upstream:mm-common
-  ref: baserock/genivi-demo-platform
-  unpetrify-ref: master
-  build-depends: []
-- name: sigc++
-  morph: strata/genivi-demo-platform/sigc++.morph
-  repo: upstream:sigc++
-  ref: d3f8647ee43f875915ddedbaaf719cc2a3d98c52
-  unpetrify-ref: master
-  build-depends:
-  - mm-common
-- name: glibmm
-  morph: strata/genivi-demo-platform/glibmm.morph
-  repo: upstream:glibmm
-  ref: e289d513b1565d7f829d62d54bff6b629d760379
-  unpetrify-ref: glibmm-2-40
-  build-depends:
-  - mm-common
-  - sigc++
-- name: boost
-  morph: strata/genivi-demo-platform/boost.morph
-  repo: upstream:boost-tarball
-  ref: ed232fdd34968697a68783b3195b1da4226915b5
-  unpetrify-ref: boost_1_57_0
-  build-depends: []
-- name: dbus-c++
-  morph: strata/genivi-demo-platform/dbus-c++.morph
-  repo: upstream:dbus-c++
-  ref: 8d351eec25430651acbac014e44ec011fac32d57
-  unpetrify-ref: baserock/genivi-demo-platform
-  build-depends: []
-- name: libxslt
-  repo: upstream:libxslt
-  ref: master
-  build-depends: []
-- name: browser-poc
-  morph: strata/genivi-demo-platform/browser-poc.morph
-  repo: upstream:genivi/browser-poc
-  ref: baserock/jonathanmaw/sensible-build
-  unpetrify-ref: baserock/genivi-demo-platform
-  build-depends: []
-- name: dbus-python
-  repo: upstream:dbus-python
-  ref: d0d5b5be685dc4c16b21c54335becc87ca4d6f58
-  unpetrify-ref: dbus-python-1.2.0
-- name: automotive-message-broker
-  morph: strata/genivi-demo-platform/automotive-message-broker.morph
-  repo: upstream:automotive-message-broker
-  ref: 5cac4bd2958ea24ac6913be5baa0dfcda6466089
-  unpetrify-ref: '0.14'
-  build-depends:
-  - dbus-python
-  - boost
-- name: audiomanager-poc
-  morph: strata/genivi-demo-platform/audiomanager-poc.morph
-  repo: upstream:audiomanager
-  ref: baserock/jonathanmaw/genivi-demo-jetson
-- name: navit
-  morph: strata/genivi-demo-platform/navit.morph
-  repo: upstream:navit-svn
-  ref: 358812af2c27c4abe324beb205e6d156b96fb1ea
-  unpetrify-ref: master
-- name: positioning
-  morph: strata/genivi-demo-platform/positioning.morph
-  repo: upstream:genivi/positioning
-  ref: baserock/jonathanmaw/genivi-demo-jetson-test
-  unpetrify-ref: master
-  build-depends:
-  - dbus-c++
-- name: poi-service
-  morph: strata/genivi-demo-platform/poi-service.morph
-  repo: upstream:genivi/poi-service
-  ref: aa65e80c3bd4f69fe0344db7beec9c2af64be9e7
-  unpetrify-ref: master
-- name: genivi-demo-platform-hmi
-  morph: strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
-  repo: upstream:genivi/genivi-demo-platform-hmi
-  ref: baserock/jonathanmaw/genivi-demo-jetson
-  unpetrify-ref: 3955d0dd4a544577f812854ef333ddb80dbc177f
-  build-depends:
-  - dbus-c++
diff --git a/strata/genivi-demo-platform/audiomanager-poc.morph b/strata/genivi-demo-platform/audiomanager-poc.morph
deleted file mode 100644
index 6974705b..00000000
--- a/strata/genivi-demo-platform/audiomanager-poc.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: audiomanager-poc
-kind: chunk
-pre-configure-commands:
-- sed 's:/opt/:/usr/lib/:g' $(git grep -l "/opt/")
-configure-commands:
-- cd AudioManagerPoC && qmake -makefile
-build-commands:
-- cd AudioManagerPoC && make
-install-commands:
-- cd AudioManagerPoC && make install INSTALL_ROOT="$DESTDIR"
diff --git a/strata/genivi-demo-platform/automotive-message-broker.morph b/strata/genivi-demo-platform/automotive-message-broker.morph
deleted file mode 100644
index 22ea0eff..00000000
--- a/strata/genivi-demo-platform/automotive-message-broker.morph
+++ /dev/null
@@ -1,21 +0,0 @@
-name: automotive-message-broker
-kind: chunk
-description: The GENIVI Automotive Message Broker
-build-system: cmake
-pre-configure-commands:
-post-install-commands:
-- mkdir -p "$DESTDIR/usr/lib/systemd/system"
-- |
-  cat >"$DESTDIR/usr/lib/systemd/system/ambd.service" <<EOF
-  [Unit]
-  Description=Automotive Message Broker
-  After=syslog.target
-  
-  [Service]
-  Type=dbus
-  BusName=org.automotive.message.broker
-  ExecStart=/usr/bin/ambd
-  
-  [Install]
-  WantedBy=multi-user.target
-  EOF
diff --git a/strata/genivi-demo-platform/boost.morph b/strata/genivi-demo-platform/boost.morph
deleted file mode 100644
index cc954076..00000000
--- a/strata/genivi-demo-platform/boost.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: boost
-kind: chunk
-configure-commands:
-- ./bootstrap.sh
-build-commands:
-- ./b2 
-install-commands:
-- ./b2 install --prefix="$DESTDIR$PREFIX"
diff --git a/strata/genivi-demo-platform/browser-poc.morph b/strata/genivi-demo-platform/browser-poc.morph
deleted file mode 100644
index 1ca23d40..00000000
--- a/strata/genivi-demo-platform/browser-poc.morph
+++ /dev/null
@@ -1,29 +0,0 @@
-name: browser-poc
-kind: chunk
-description: The GENIVI browser proof-of-concept for the GENIVI Demo Platform.
-configure-commands:
-- qmake -d -r browser-poc.pro
-build-commands:
-- make all
-install-commands:
-- make INSTALL_ROOT="$DESTDIR" install
-- mkdir -p "$DESTDIR/usr/lib/systemd/user"
-- |
-  cat >"$DESTDIR/usr/lib/systemd/user/browser.service" <<EOF
-  [Unit]
-  Description=Genivi Browser PoC service
-  Requires=dbus.service
-  
-  [Service]
-  ExecStart=/usr/lib/browser-poc/browser/browser
-  EOF
-- |
-  cat >"$DESTDIR/usr/lib/systemd/user/demoui.service" <<EOF
-  [Unit]
-  Description=Genivi Browser PoC demoui
-  Requires=browser.service
-  
-  [Service]
-  Environment=LD_PRELOAD=/usr/lib/libEGL.so
-  ExecStart=/usr/lib/browser-poc/demoui/demoui
-  EOF
diff --git a/strata/genivi-demo-platform/dbus-c++.morph b/strata/genivi-demo-platform/dbus-c++.morph
deleted file mode 100644
index ec8beef3..00000000
--- a/strata/genivi-demo-platform/dbus-c++.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: dbus-c++
-kind: chunk
-description: libdbus-c++ and dbusxx-xml2cpp tool
-build-system: autotools
-configure-commands:
-- autoreconf -ivf
-- ./configure --prefix=$PREFIX --disable-ecore
-post-install-commands:
-- install tools/dbusxx-xml2cpp "$DESTDIR/$PREFIX"/bin/dbusxx-xml2cpp
diff --git a/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph b/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
deleted file mode 100644
index 9e319372..00000000
--- a/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
+++ /dev/null
@@ -1,102 +0,0 @@
-name: genivi-demo-platform-hmi
-kind: chunk
-pre-configure-commands:
-- |
-  sed -i 's/sd_journal_print(LOG_DEBUG,/printf("DEBUG: "/' $(find . -name '*.cpp' -o -name '*.h')
-- |
-  sed -i 's/sd_journal_print(LOG_INFO,/printf("INFO: "/' $(find . -name '*.cpp' -o -name '*.h')
-- |
-  sed -i 's/sd_journal_print(LOG_ERR,/printf("ERR: "/' $(find . -name '*.cpp' -o -name '*.h')
-- |
-  git apply - << "EOF"
-  diff --git a/configure.ac b/configure.ac
-  index f0c7ba2..4ff1462 100644
-  --- a/configure.ac
-  +++ b/configure.ac
-  @@ -61,10 +61,10 @@ PKG_CHECK_MODULES([CLIENT], [
-   AC_CHECK_HEADERS([ilm/ilm_types.h])
-   AC_CHECK_LIB(ilmClient, ilm_UpdateInputEventAcceptanceOn,
-   	[ILM_LIBS="-lilmCommon -lilmClient"],
-  -	[AC_MSG_ERROR([Can't find correct ilmClient library.])])
-  +	[AC_MSG_ERROR([Can't find correct ilmClient library.])], -lilmControl)
-   AC_CHECK_LIB(ilmControl, ilm_SetKeyboardFocusOn,
-   	[ILM_LIBS="$ILM_LIBS -lilmControl"],
-  -	[AC_MSG_ERROR([Can't find correct ilmControl library.])])
-  +	[AC_MSG_ERROR([Can't find correct ilmControl library.])], -lilmClient)
-   AC_SUBST(ILM_LIBS)
-   
-   WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client`
-  EOF
-configure-commands:
-- autoreconf -vfi && ./configure --prefix=$PREFIX
-- cd app/gdp-hmi-background && qmake -r gdp-hmi-background.pro
-- cd app/gdp-hmi-launcher && qmake -r gdp-hmi-launcher.pro
-- cd app/gdp-hmi-panel && qmake -r gdp-hmi-panel.pro
-build-commands:
-- make
-- cd app/gdp-hmi-background && make
-- cd app/gdp-hmi-launcher && make
-- cd app/gdp-hmi-panel && make
-install-commands:
-- make DESTDIR=$DESTDIR install
-- cd app/gdp-hmi-background && make INSTALL_ROOT=$DESTDIR install
-- cd app/gdp-hmi-launcher && make INSTALL_ROOT=$DESTDIR install
-- cd app/gdp-hmi-panel && make INSTALL_ROOT=$DESTDIR install
-- mkdir -p $DESTDIR/usr/share/gdp
-- cp -a app/gdp-hmi-background/assets/* $DESTDIR/usr/share/gdp/
-- cp -a app/gdp-hmi-launcher/assets/* $DESTDIR/usr/share/gdp/
-- cp -a app/gdp-hmi-panel/assets/* $DESTDIR/usr/share/gdp/
-- mkdir -p "$DESTDIR/usr/lib/systemd/user"
-- |
-  cat >"$DESTDIR/usr/lib/systemd/user/gdp-hmi-launcher.service" <<EOF
-  [Unit]
-  Description=GENIVI Demo Platform HMI - Launcher
-  Requires=gdp-hmi-controller.service gdp-hmi-background.service gdp-hmi-panel.service
-  
-  [Service]
-  Environment=LD_PRELOAD=/usr/lib/libEGL.so
-  ExecStart=/usr/bin/gdp-hmi-launcher
-  EOF
-- |
-  cat >"$DESTDIR/usr/lib/systemd/user/gdp-hmi-background.service" <<EOF
-  [Unit]
-  Description=GENIVI Demo Platform HMI - Background
-  
-  [Service]
-  Environment=LD_PRELOAD=/usr/lib/libEGL.so
-  ExecStart=/usr/bin/gdp-hmi-background
-  EOF
-- |
-  cat >"$DESTDIR/usr/lib/systemd/user/gdp-hmi-controller.service" <<EOF
-  [Unit]
-  Description=GENIVI Demo Platform HMI - Controller
-  Requires=dbus.service
-  
-  [Service]
-  ExecStart=/usr/bin/gdp-hmi-controller
-  EOF
-- |
-  cat >"$DESTDIR/usr/lib/systemd/user/gdp-hmi-panel.service" <<EOF
-  [Unit]
-  Description=GENIVI Demo Platform HMI - Panel
-  
-  [Service]
-  Environment=LD_PRELOAD=/usr/lib/libEGL.so
-  ExecStart=/usr/bin/gdp-hmi-panel
-  EOF
-- |
-  cat >"$DESTDIR/usr/lib/systemd/user/EGLWLMockNavigation.service" <<EOF
-  [Unit]
-  Description=EGL Wayland Mock Navigation
-  
-  [Service]
-  ExecStart=/usr/bin/EGLWLMockNavigation -surface 10
-  EOF
-- |
-  cat > "$DESTDIR/usr/lib/systemd/user/EGLWLInputEventExample.service" <<EOF
-  [Unit]
-  Description=EGL Wayland Input Event Example
-  
-  [Service]
-  ExecStart=/usr/bin/EGLWLInputEventExample --surface=5100
-  EOF
diff --git a/strata/genivi-demo-platform/glibmm.morph b/strata/genivi-demo-platform/glibmm.morph
deleted file mode 100644
index 2ebb7fb1..00000000
--- a/strata/genivi-demo-platform/glibmm.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: glibmm
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh
-- ./configure --prefix="$PREFIX" --disable-documentation --enable-maintainer-mode
diff --git a/strata/genivi-demo-platform/mm-common.morph b/strata/genivi-demo-platform/mm-common.morph
deleted file mode 100644
index 4f416e7c..00000000
--- a/strata/genivi-demo-platform/mm-common.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: mm-common
-kind: chunk
-description: Common build files of the GNOME C++ bindings.
-build-system: autotools
-configure-commands:
-- ./autogen.sh
-- ./configure --prefix="$PREFIX"
diff --git a/strata/genivi-demo-platform/navit.morph b/strata/genivi-demo-platform/navit.morph
deleted file mode 100644
index 4a72e8b5..00000000
--- a/strata/genivi-demo-platform/navit.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: navit
-kind: chunk
-build-system: cmake
-configure-commands:
-- cmake . -DSAMPLE_MAP=n -DCMAKE_INSTALL_PREFIX="$PREFIX" -DLIBDIR="lib"
diff --git a/strata/genivi-demo-platform/poi-service.morph b/strata/genivi-demo-platform/poi-service.morph
deleted file mode 100644
index be45290c..00000000
--- a/strata/genivi-demo-platform/poi-service.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: poi-service
-kind: chunk
-configure-commands:
-- mkdir build
-- cd build && cmake .. -DCMAKE_INSTALL_PREFIX="$PREFIX"
-build-commands:
--  cd build && make
-install-commands:
-- cd build && make DESTDIR="$DESTDIR" install
diff --git a/strata/genivi-demo-platform/positioning.morph b/strata/genivi-demo-platform/positioning.morph
deleted file mode 100644
index a710634b..00000000
--- a/strata/genivi-demo-platform/positioning.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: positioning
-kind: chunk
-configure-commands:
-- mkdir build
-- cd build && cmake .. -DCMAKE_INSTALL_PREFIX="$PREFIX" -DWITH_TESTS=ON
-build-commands:
--  cd build && make
-install-commands:
-- cd build && make DESTDIR="$DESTDIR" install
diff --git a/strata/genivi-demo-platform/sigc++.morph b/strata/genivi-demo-platform/sigc++.morph
deleted file mode 100644
index da575fb8..00000000
--- a/strata/genivi-demo-platform/sigc++.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: sigc++
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh
-- ./configure --disable-documentation --prefix="$PREFIX"
diff --git a/strata/genivi.morph b/strata/genivi.morph
index f827437d..1d8889fe 100644
--- a/strata/genivi.morph
+++ b/strata/genivi.morph
@@ -37,19 +37,20 @@ chunks:
 - name: genivi-common-api-runtime
   morph: strata/genivi/genivi-common-api-runtime.morph
   repo: upstream:genivi-common-api-runtime
-  ref: 188abb5e24d6a2a7fdd7e5d150439a162621292c
-  unpetrify-ref: 2.1.6
+  ref: 56d1059459c24971bcbf45adef60f6dfd0b44667
+  unpetrify-ref: 3.1.2p1
 - name: genivi-common-api-dbus-runtime
   morph: strata/genivi/genivi-common-api-dbus-runtime.morph
   repo: upstream:genivi-common-api-dbus-runtime
-  ref: 3372155b32a2cf3b05e1a2a13f6f8413069de33f
-  unpetrify-ref: 2.1.6-p1
+  ref: 49d0b428ca19852d49965f35328a314f22d88807
+  unpetrify-ref: 3.1.2
   build-depends:
   - genivi-common-api-runtime
 - name: audiomanager
   repo: upstream:audiomanager
-  ref: 00caae1e41e8891d9a1bafa76028e8119f06fd8a
-  unpetrify-ref: baserock/6.0
+  ref: 8725157e248c6706de59a02996f869b6ccdccb13
+  unpetrify-ref: '7.0'
+  build-system: cmake
   build-depends:
   - DLT-daemon
   - googletest
@@ -72,8 +73,8 @@ chunks:
 - name: persistence-client-library
   morph: strata/genivi/persistence-client-library.morph
   repo: upstream:genivi/persistence-client-library
-  ref: 8e27db0200ae7c01155780329f2b62d53e18c3cc
-  unpetrify-ref: master
+  ref: 39c68df2a9ee0b089212855f64a61fbd671b1a80
+  unpetrify-ref: baserock/v1.0.0
   build-depends:
   - persistence-common-object
   - DLT-daemon
@@ -82,6 +83,7 @@ chunks:
   repo: upstream:node-state-manager
   ref: 30add4659e002f1df205cc36f71ef3141c10c1fb
   unpetrify-ref: baserock/systemd_v216
+  build-system: autotools
   build-depends:
   - DLT-daemon
   - persistence-client-library
@@ -102,8 +104,9 @@ chunks:
   - node-state-manager
 - name: node-health-monitor
   repo: upstream:genivi/node-health-monitor
-  ref: 2af264563ef1b60ba2636cbf5e8cd6a7ed07b0c0
-  unpetrify-ref: baserock/1.3.3
+  ref: 61f88bc9fc03c278664e05431ffb5933ff6007f1
+  unpetrify-ref: baserock/1.3.5
+  build-system: autotools
   build-depends:
   - node-state-manager
   - persistence-client-library
diff --git a/strata/genivi/DLT-daemon.morph b/strata/genivi/DLT-daemon.morph
index e22e31e3..d16c42ea 100644
--- a/strata/genivi/DLT-daemon.morph
+++ b/strata/genivi/DLT-daemon.morph
@@ -1,4 +1,4 @@
-name: DLT-deamon
+name: DLT-daemon
 kind: chunk
 build-system: cmake
 configure-commands:
diff --git a/strata/genivi/genivi-common-api-dbus-runtime.morph b/strata/genivi/genivi-common-api-dbus-runtime.morph
index 8d6cb134..fa8742a0 100644
--- a/strata/genivi/genivi-common-api-dbus-runtime.morph
+++ b/strata/genivi/genivi-common-api-dbus-runtime.morph
@@ -1,5 +1,3 @@
 name: genivi-common-api-dbus-runtime
 kind: chunk
-build-system: autotools
-pre-configure-commands:
-- ln -s . build-aux
+build-system: cmake
diff --git a/strata/genivi/genivi-common-api-runtime.morph b/strata/genivi/genivi-common-api-runtime.morph
index 7439331a..1c4a66c2 100644
--- a/strata/genivi/genivi-common-api-runtime.morph
+++ b/strata/genivi/genivi-common-api-runtime.morph
@@ -1,5 +1,3 @@
 name: genivi-common-api-runtime
 kind: chunk
-build-system: autotools
-pre-configure-commands:
-- ln -s . build-aux
+build-system: cmake
diff --git a/strata/glib-common.morph b/strata/glib-common.morph
new file mode 100644
index 00000000..09c88dfe
--- /dev/null
+++ b/strata/glib-common.morph
@@ -0,0 +1,28 @@
+name: glib-common
+kind: stratum
+description: GLib and dependencies
+build-depends:
+- morph: strata/core.morph
+chunks:
+- name: gtk-doc-stub
+  repo: upstream:gtk-doc-stub
+  ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0
+  unpetrify-ref: baserock/morph
+  build-system: autotools
+- name: gnome-common
+  repo: upstream:gnome-common
+  ref: 5d61b55e8bea32fe2b52e21682ee4b3719b290c5
+  unpetrify-ref: 3.14.0
+  build-system: autotools
+- name: glib
+  repo: upstream:glib
+  ref: 966ffb16f6bd54cb3d928a55d00d0eda73592094
+  unpetrify-ref: 2.44.0
+  build-system: autotools
+- name: gobject-introspection
+  repo: upstream:gobject-introspection
+  ref: c0243e116c5e261c262dded9f4d7726a770c5a19
+  unpetrify-ref: GOBJECT_INTROSPECTION_1_44_0
+  build-system: autotools
+  build-depends:
+  - glib
diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph
index c23ec829..3c35bb8c 100644
--- a/strata/graphics-common.morph
+++ b/strata/graphics-common.morph
@@ -1,6 +1,7 @@
 name: graphics-common
 kind: stratum
 build-depends:
+- morph: strata/glib-common.morph
 - morph: strata/mesa-common.morph
 - morph: strata/x-common.morph
 chunks:
@@ -13,10 +14,12 @@ chunks:
   repo: upstream:freetype2
   ref: ec8853cd18e1a0c275372769bdad37a79550ed66
   unpetrify-ref: VER-2-5-3
+  build-system: autotools
 - name: fontconfig
   repo: upstream:fontconfig
   ref: 9260b7ec39c34ce68d74e16d47917290a8c3f35a
   unpetrify-ref: 2.11.1
+  build-system: autotools
   build-depends:
   - freetype2
 - name: freefont-otf
@@ -28,14 +31,17 @@ chunks:
   repo: upstream:libpng
   ref: 88dd30b232362b65cca374dda39096888163dd6b
   unpetrify-ref: libpng-1.6.16-signed
+  build-system: autotools
 - name: libjpeg
   repo: upstream:libjpeg
   ref: f57ac58ac664ede6bc6e8cd9d88e0edaa366e21a
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: libtiff
   repo: upstream:libtiff
   ref: 2f83c385ff3d5493602308b62ca6d7707725b4fd
   unpetrify-ref: Release-v4-0-3
+  build-system: autotools
 - name: cairo
   morph: strata/graphics-common/cairo.morph
   repo: upstream:cairo
@@ -50,5 +56,6 @@ chunks:
   repo: upstream:harfbuzz
   ref: 09b5393874e56fcfd63a92d28e6c1c2ddeee0942
   unpetrify-ref: baserock/0.9.12
+  build-system: autotools
   build-depends:
   - freetype2
diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph
index 750ad8c2..b400b30b 100644
--- a/strata/gtk-deps.morph
+++ b/strata/gtk-deps.morph
@@ -2,7 +2,7 @@ name: gtk-deps
 kind: stratum
 description: the GTK+ dependencies stratum
 build-depends:
-- morph: strata/foundation.morph
+- morph: strata/core.morph
 - morph: strata/graphics-common.morph
 - morph: strata/x-common.morph
 chunks:
@@ -25,14 +25,31 @@ chunks:
   repo: upstream:atk
   ref: 3f9e43b94364053fd16eb53391667d161d0dae12
   unpetrify-ref: ATK_2_16_0
+  build-system: autotools
 - name: at-spi2-core
   repo: upstream:at-spi2-core
   ref: 96c2842088008670e72739ea7921d654487a57fb
   unpetrify-ref: AT_SPI2_CORE_2_14_1
+  build-system: autotools
 - name: at-spi2-atk
   repo: upstream:at-spi2-atk
   ref: 2c220ff6565c4f02428a0c80267616a677e81ac9
   unpetrify-ref: AT_SPI2_ATK_2_14_1
+  build-system: autotools
   build-depends:
   - at-spi2-core
   - atk
+- name: libcroco
+  repo: upstream:libcroco
+  ref: 9207f349d1c97618ab38e6b095207bbd8184d844
+  unpetrify-ref: 0.6.8-30-g9207f34
+  build-system: autotools
+- name: librsvg
+  repo: upstream:librsvg
+  ref: 25d5f8b7076535fecb972d6454807ba56452991a
+  unpetrify-ref: 2.40.10
+  build-system: autotools
+  build-depends:
+  - gdk-pixbuf
+  - libcroco
+  - pango
diff --git a/strata/gtk2.morph b/strata/gtk2.morph
index dd2f30fa..4c8db88a 100644
--- a/strata/gtk2.morph
+++ b/strata/gtk2.morph
@@ -3,10 +3,10 @@ kind: stratum
 description: the gtk2 stratum
 build-depends:
 - morph: strata/gtk-deps.morph
-- morph: strata/x-generic.morph
+- morph: strata/x-common.morph
 chunks:
 - name: gtk+
   morph: strata/gtk2/gtk+.morph
   repo: upstream:gtk+
-  ref: e6333a1a374591fef456f7fe73942226b5b8b388
-  unpetrify-ref: 2.24.27
+  ref: b5b055721378ffe0269613e49ab5741a315eeb00
+  unpetrify-ref: 2.24.28
diff --git a/strata/gtk3.morph b/strata/gtk3.morph
index f03417a2..9d3dde6f 100644
--- a/strata/gtk3.morph
+++ b/strata/gtk3.morph
@@ -9,6 +9,7 @@ chunks:
   repo: upstream:libepoxy
   ref: 7422de5b4be7b19d789136b3bb5f932de42db27c
   unpetrify-ref: v1.2
+  build-system: autotools
 - name: gtk3
   morph: strata/gtk3/gtk3.morph
   repo: upstream:gtk+
diff --git a/strata/initramfs-utils.morph b/strata/initramfs-utils.morph
index 6df77c96..ac094004 100644
--- a/strata/initramfs-utils.morph
+++ b/strata/initramfs-utils.morph
@@ -7,5 +7,5 @@ chunks:
 - name: initramfs-scripts
   morph: strata/initramfs-utils/initramfs-scripts.morph
   repo: baserock:baserock/initramfs-scripts
-  ref: 062c5d3aece2e308aa7fc03acab1b3b6dd4270b2
+  ref: e5c71f0ca075bd29ffd55ec0c25804585bc21046
   unpetrify-ref: master
diff --git a/strata/initramfs-utils/initramfs-scripts.morph b/strata/initramfs-utils/initramfs-scripts.morph
index 68ed4a7b..c046ca9e 100644
--- a/strata/initramfs-utils/initramfs-scripts.morph
+++ b/strata/initramfs-utils/initramfs-scripts.morph
@@ -1,4 +1,3 @@
 name: initramfs-scripts
 kind: chunk
-install-commands:
-- install -m 755 init "$DESTDIR/init"
+build-system: autotools
diff --git a/strata/input-common.morph b/strata/input-common.morph
index e6ebad9a..ee866f43 100644
--- a/strata/input-common.morph
+++ b/strata/input-common.morph
@@ -8,19 +8,22 @@ chunks:
   repo: upstream:mtdev-git
   ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d
   unpetrify-ref: v1.1.5
+  build-system: autotools
 - name: xkeyboard-config
   morph: strata/input-common/xkeyboard-config.morph
   repo: upstream:xkeyboard-config
-  ref: 73aa90ce32967747c84a1b5fe32cee329bc3bbcf
-  unpetrify-ref: xkeyboard-config-2.13
+  ref: 26f344c93f8c6141e9233eb68088ba4fd56bc9ef
+  unpetrify-ref: xkeyboard-config-2.14
 - name: libevdev
   repo: upstream:libevdev
-  ref: 7ac00d7e920c56bb8617403699030a5300bfae1c
-  unpetrify-ref: libevdev-1.3.2
+  ref: 6f03fd49fb949e46ebccb5dfb54489584896c791
+  unpetrify-ref: libevdev-1.4.2
+  build-system: autotools
 - name: libinput
   repo: upstream:libinput
-  ref: ca4e03fb11429b6a3704206124fbff2f57d121f9
-  unpetrify-ref: 0.10.0
+  ref: 12df380698531472d495534ed356722478563707
+  unpetrify-ref: 0.15.0
+  build-system: autotools
   build-depends:
   - mtdev
   - libevdev
diff --git a/strata/input-genivi.morph b/strata/input-genivi.morph
deleted file mode 100644
index a4525932..00000000
--- a/strata/input-genivi.morph
+++ /dev/null
@@ -1,26 +0,0 @@
-name: input-genivi
-kind: stratum
-build-depends:
-- morph: strata/foundation.morph
-- morph: strata/xorg-util-macros-common.morph
-chunks:
-- name: mtdev
-  repo: upstream:mtdev-git
-  ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d
-  unpetrify-ref: v1.1.5
-- name: xkeyboard-config
-  morph: strata/input-common/xkeyboard-config.morph
-  repo: upstream:xkeyboard-config
-  ref: 73aa90ce32967747c84a1b5fe32cee329bc3bbcf
-  unpetrify-ref: xkeyboard-config-2.13
-- name: libevdev
-  repo: upstream:libevdev
-  ref: 7ac00d7e920c56bb8617403699030a5300bfae1c
-  unpetrify-ref: libevdev-1.3.2
-- name: libinput
-  repo: upstream:libinput
-  ref: 06e2f522a4ab5ea0a1de68cce1b5f9fff568ed4f
-  unpetrify-ref: 0.7.0
-  build-depends:
-  - mtdev
-  - libevdev
diff --git a/strata/java.morph b/strata/java.morph
new file mode 100644
index 00000000..f10bb8a1
--- /dev/null
+++ b/strata/java.morph
@@ -0,0 +1,22 @@
+name: java
+kind: stratum
+description: |
+  This stratum contains everything necessary to compile and run Java applications
+  and build OpenJDK from source.
+build-depends:
+- morph: strata/core.morph
+- morph: strata/x-common.morph
+- morph: strata/graphics-common.morph
+chunks:
+- name: java-binary
+  morph: strata/java/java-binary.morph
+  repo: github:jmacarthur/openjdk-binary
+  ref: 6f53762e2632c4b9f9afdfa6995a2c696bb9fd43
+  unpetrify-ref: master
+- name: java-ant
+  morph: strata/java/java-ant.morph
+  repo: upstream:java/ant
+  ref: b3509fc3250b0f868076c846d29da80cbdc20681
+  unpetrify-ref: ANT_194
+  build-depends:
+  - java-binary
diff --git a/strata/zookeeper/java-ant.morph b/strata/java/java-ant.morph
index 37d402b0..13c490d4 100644
--- a/strata/zookeeper/java-ant.morph
+++ b/strata/java/java-ant.morph
@@ -1,8 +1,8 @@
-name: ant
+name: java-ant
 kind: chunk
 build-commands:
 - |
-  export JAVA_HOME=/usr/lib/jdk1.8.0_20
+  export JAVA_HOME=/usr/lib/java-8-openjdk
   sh build.sh -Ddist.dir="$DESTDIR/usr/lib/ant" dist
 - mkdir -p "${DESTDIR}${PREFIX}/bin"
 - ln -sf "${PREFIX}/lib/ant/bin/ant" "${DESTDIR}${PREFIX}/bin/ant"
diff --git a/strata/java/java-binary.morph b/strata/java/java-binary.morph
new file mode 100644
index 00000000..c75f39b7
--- /dev/null
+++ b/strata/java/java-binary.morph
@@ -0,0 +1,16 @@
+name: java-binary
+description: |
+  This is a temporary solution to the OpenJDK build problem. In the future
+  we expect to be able to build fully from scratch using IcedTea, but for now
+  we need an existing OpenJDK binary to build OpenJDK.
+kind: chunk
+configure-commands: []
+build-commands:
+- cat j2sdk-image-jdk8build.tar.gz_* > jdk-8u20-linux-x64.tar.gz
+install-commands:
+- mkdir -p "$DESTDIR$PREFIX"/bin
+- mkdir -p "$DESTDIR$PREFIX"/lib
+- tar zxf jdk-8u20-linux-x64.tar.gz -C "$DESTDIR$PREFIX"/lib --no-same-owner
+- ln -sfn "$PREFIX"/lib/j2sdk-image "$DESTDIR$PREFIX"/lib/java-8-openjdk
+- ln -sfn "$PREFIX"/lib/j2sdk-image/jre/bin/java "$DESTDIR$PREFIX"/bin/
+- ln -sfn "$PREFIX"/lib/j2sdk-image/jre/bin/javac "$DESTDIR$PREFIX"/bin/
diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph
index 16ef2375..affa2dae 100644
--- a/strata/libdrm-common.morph
+++ b/strata/libdrm-common.morph
@@ -7,6 +7,7 @@ chunks:
   repo: upstream:xorg-lib-libpciaccess
   ref: f99c2e4199ce37f6f94428df504427f67c3ec543
   unpetrify-ref: libpciaccess-0.13.3
+  build-system: autotools
 - name: drm
   repo: upstream:drm
   morph: strata/libdrm-common/drm.morph
diff --git a/strata/libdrm-common/drm.morph b/strata/libdrm-common/drm.morph
index a614a831..4b0bdcc1 100644
--- a/strata/libdrm-common/drm.morph
+++ b/strata/libdrm-common/drm.morph
@@ -4,12 +4,14 @@ build-system: autotools
 pre-configure-commands:
   # Tegra requires a new coherent BO attribute, not currently upstream, so
   # patch it here
-  - sed -i '/NOUVEAU_GEM_DOMAIN_MAPPABLE  (1 << 3)/a#define NOUVEAU_GEM_DOMAIN_COHERENT  (1 << 4)' include/drm/nouveau_drm.h
+  - sed -i '/NOUVEAU_GEM_DOMAIN_MAPPABLE  (1 << 3)/a#define NOUVEAU_GEM_DOMAIN_COHERENT  (1
+    << 4)' include/drm/nouveau_drm.h
   - |
     sed -i '/info->domain |= NOUVEAU_GEM_DOMAIN_MAPPABLE;/a\
         if (bo->flags & NOUVEAU_BO_COHERENT)\
             info->domain |= NOUVEAU_GEM_DOMAIN_COHERENT;' nouveau/abi16.c
-  - sed -i '/NOUVEAU_BO_NOSNOOP 0x20000000/a#define NOUVEAU_BO_COHERENT 0x10000000' nouveau/nouveau.h
+  - sed -i '/NOUVEAU_BO_NOSNOOP 0x20000000/a#define NOUVEAU_BO_COHERENT 0x10000000'
+    nouveau/nouveau.h
 configure-commands:
-  - NOCONFIGURE=1 ./autogen.sh
-  - ./configure --prefix="$PREFIX" --enable-tegra-experimental-api --enable-freedreno-experimental-api
+- NOCONFIGURE=1 ./autogen.sh
+- ./configure --prefix="$PREFIX" --enable-tegra-experimental-api --enable-freedreno-experimental-api
diff --git a/strata/libsoup-common.morph b/strata/libsoup-common.morph
index ca81b6e0..759a842c 100644
--- a/strata/libsoup-common.morph
+++ b/strata/libsoup-common.morph
@@ -2,9 +2,10 @@ name: libsoup-common
 kind: stratum
 build-depends:
 - morph: strata/core.morph
+- morph: strata/glib-common.morph
 chunks:
 - name: libsoup
   morph: strata/libsoup-common/libsoup.morph
   repo: upstream:libsoup
-  ref: ce764489e358bad6b49418f5c8bc7b25a4b1815e
-  unpetrify-ref: baserock/morph
+  ref: c29630a8fdb4e6997ec27da4af545bddefab35ad
+  unpetrify-ref: 2.48.0
diff --git a/strata/llvm-common/llvm.morph b/strata/llvm-common/llvm.morph
index 9d280062..d47d1837 100644
--- a/strata/llvm-common/llvm.morph
+++ b/strata/llvm-common/llvm.morph
@@ -3,6 +3,7 @@ kind: chunk
 description: Low Level Virtual Machine
 build-system: autotools
 configure-commands:
-- ./configure --prefix="$PREFIX" --sysconfdir=/etc --enable-shared --enable-targets=host --enable-optimized --disable-assertions
+- ./configure --prefix="$PREFIX" --sysconfdir=/etc --enable-shared --enable-targets=host
+  --enable-optimized --disable-assertions
 build-commands:
 - make $MAKEFLAGS
diff --git a/strata/lorry.morph b/strata/lorry.morph
index b3a0c779..4bd7258a 100644
--- a/strata/lorry.morph
+++ b/strata/lorry.morph
@@ -12,19 +12,23 @@ description: |
 build-depends:
 - morph: strata/foundation.morph
 - morph: strata/python-cliapp.morph
+- morph: strata/pcre-utils.morph # for swig
 chunks:
 - name: bzr-tarball
   repo: upstream:bzr-tarball
   ref: e61c7edb4789abcd0f73c30fe719fa6fea478a52
   unpetrify-ref: baserock/morph
+  build-system: python-distutils
 - name: python-fastimport
   repo: upstream:python-fastimport
   ref: 6500a5e7d82651ade9002d44e3ecc71a50302616
   unpetrify-ref: baserock/morph
+  build-system: python-distutils
 - name: bzr-fastimport
   repo: upstream:bzr-fastimport
   ref: b3cda9967f857127bd4dab5eb72223a95916f5ea
   unpetrify-ref: baserock/morph
+  build-system: python-distutils
   build-depends:
   - bzr-tarball
   - python-fastimport
@@ -54,9 +58,10 @@ chunks:
   repo: upstream:perl-dbd-sqlite-tarball
   ref: 485b97be9f2f2abf5a40923b5fd85f75714a8c02
   unpetrify-ref: baserock/morph
+  build-system: cpan
   build-depends:
   - perl-dbi-tarball
-- name: libserf-tarball
+- name: libserf
   morph: strata/lorry/libserf.morph
   repo: upstream:libserf-tarball
   ref: 6f61a1acd01dc2ad1d2f5c1f7458702c77c69f9c
@@ -64,11 +69,11 @@ chunks:
   build-depends:
   - libapr
   - libapr-util
-- name: swig-tarball
-  morph: strata/lorry/swig-tarball.morph
-  repo: upstream:swig-tarball
-  ref: 1f6cb46b6a4b3ebf9352fa10198b0b286f84138b
-  unpetrify-ref: baserock/morph
+- name: swig
+  morph: strata/lorry/swig.morph
+  repo: upstream:swig
+  ref: 4e23595704d6ddffe4e50ca41bbc90e4b8893f4d
+  unpetrify-ref: rel-3.0.6
 - name: neon
   morph: strata/lorry/neon.morph
   repo: upstream:neon
@@ -77,13 +82,13 @@ chunks:
 - name: subversion-tarball
   morph: strata/lorry/subversion-tarball.morph
   repo: upstream:subversion-tarball
-  ref: 2d02ea6f31311bf1b72f28c48d784b8d851ff2e0
-  unpetrify-ref: baserock/morph
+  ref: bb0ef45f7c46b0ae221b26265ef98a768c33f820
+  unpetrify-ref: subversion-1.8.13
   build-depends:
-  - swig-tarball
+  - swig
   - libapr
   - libapr-util
-  - libserf-tarball
+  - libserf
   - neon
 - name: mercurial-tarball
   morph: strata/lorry/mercurial-tarball.morph
@@ -105,7 +110,7 @@ chunks:
 - name: lorry
   morph: strata/lorry/lorry.morph
   repo: baserock:baserock/lorry
-  ref: 4fcff82742ce3325a860c060b597ff281872c594
+  ref: 3455c3c77ca778527efbd4541d3be1fb09f37bcf
   unpetrify-ref: master
   build-depends:
   - bzr-tarball
diff --git a/strata/lorry/cvs-tarball.morph b/strata/lorry/cvs-tarball.morph
index 5f34bc57..e03250e2 100644
--- a/strata/lorry/cvs-tarball.morph
+++ b/strata/lorry/cvs-tarball.morph
@@ -7,3 +7,4 @@ pre-configure-commands:
 configure-commands:
 - YACC='bison -y' ./configure --prefix "$PREFIX" --with-external-zlib --without-gssapi
   --without-krb4 --disable-dependency-tracking --disable-nls --disable-rpath
+  --enable-rootcommit
diff --git a/strata/lorry/swig-tarball.morph b/strata/lorry/swig.morph
index 7d16d85b..8a7d51b6 100644
--- a/strata/lorry/swig-tarball.morph
+++ b/strata/lorry/swig.morph
@@ -1,4 +1,4 @@
-name: swig-tarball
+name: swig
 kind: chunk
 build-system: autotools
 pre-configure-commands:
diff --git a/strata/lvm/lvm2.morph b/strata/lvm/lvm2.morph
index 9b4a68bf..49b5f0fc 100644
--- a/strata/lvm/lvm2.morph
+++ b/strata/lvm/lvm2.morph
@@ -8,7 +8,7 @@ configure-commands:
 # '${exec_prefix}/sbin' in the generated .service files.
 #
 # udev rules *must* go in /lib, they'll be ignored if they go in /usr/lib.
-- >
+- |
   ./configure --prefix="$PREFIX" \
     --sbindir="$PREFIX"/sbin \
     --with-udev-prefix=/ \
diff --git a/strata/mesa-common-vm.morph b/strata/mesa-common-vm.morph
deleted file mode 100644
index 47394dea..00000000
--- a/strata/mesa-common-vm.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: mesa-common-vm
-kind: stratum
-build-depends:
-- morph: strata/llvm-common.morph
-- morph: strata/libdrm-common.morph
-- morph: strata/wayland-generic.morph
-chunks:
-- name: mesa@vm
-  morph: strata/mesa-common/mesa@vm.morph
-  repo: upstream:mesa
-  ref: f7d157a4f011fd5ace94f55c8674be4b12d86f95
-  unpetrify-ref: baserock/mesa-10.3.7-2-gf7d157a/fstat_fix
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
index ae6567d8..29d2a746 100644
--- a/strata/mesa-common.morph
+++ b/strata/mesa-common.morph
@@ -1,6 +1,7 @@
 name: mesa-common
 kind: stratum
 build-depends:
+- morph: strata/foundation.morph
 - morph: strata/llvm-common.morph
 - morph: strata/libdrm-common.morph
 - morph: strata/wayland-generic.morph
@@ -9,5 +10,5 @@ chunks:
 - name: mesa
   morph: strata/mesa-common/mesa.morph
   repo: upstream:mesa
-  ref: d4407a29d0c64134999fed83dbbd8707ca449ce7
-  unpetrify-ref: baserock/mesa-10.5.4-jetson
+  ref: 635ad274470a064100ff6aa38ede83d748ae07cf
+  unpetrify-ref: baserock/mesa-10.6.0-rc1-jetson
diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph
index 4194acc2..2a3fe96a 100644
--- a/strata/mesa-common/mesa.morph
+++ b/strata/mesa-common/mesa.morph
@@ -19,5 +19,4 @@ configure-commands:
       --disable-glx \
       --with-egl-platforms=drm,wayland \
       --with-gallium-drivers="$GALLIUMDRIVERS" \
-      --with-dri-drivers="$DRIDRIVERS" \
-      --enable-gallium-egl
+      --with-dri-drivers="$DRIDRIVERS"
diff --git a/strata/mesa-common/mesa@vm.morph b/strata/mesa-common/mesa@vm.morph
deleted file mode 100644
index 517b6ba4..00000000
--- a/strata/mesa-common/mesa@vm.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: mesa@vm
-kind: chunk
-build-system: autotools
-configure-commands:
-- |
-  ./autogen.sh --prefix="$PREFIX" \
-      --enable-gles2 \
-      --disable-glx \
-      --with-egl-platforms=drm,wayland \
-      --with-gallium-drivers="yes" \
-      --with-dri-drivers="yes" \
-      --enable-gallium-egl
diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph
index 3d682729..0905194c 100644
--- a/strata/morph-utils.morph
+++ b/strata/morph-utils.morph
@@ -13,10 +13,6 @@ chunks:
   repo: upstream:python-ttystatus
   ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0
   unpetrify-ref: baserock/morph
-- name: python-markdown
-  repo: upstream:python-markdown
-  ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6
-  unpetrify-ref: baserock/morph
 - name: git-fat
   morph: strata/tools/git-fat.morph
   repo: upstream:git-fat
@@ -34,16 +30,25 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends:
   - python-ttystatus
-  - python-markdown
 - name: pylru
   repo: upstream:python-packages/pylru
   ref: 221dd259f5c34562c835611d1cf62384b9019da4
   unpetrify-ref: master
+  build-system: python-distutils
 - name: morph
   repo: baserock:baserock/morph
-  ref: e9f13c83996ab2affe237ff800cf872dc229102e
+  ref: 60c378c55d5d0ef89184b49ae95e445f8de422e3
   unpetrify-ref: master
+  build-system: python-distutils
   build-depends:
   - cmdtest
   - pyfilesystem
   - pylru
+
+# This chunk isn't required to use Morph, but is required to do automated
+# migrations within the definitions.git repo.
+- name: ruamel.yaml
+  repo: upstream:python-packages/ruamel.yaml
+  ref: f3de88b82bf5e3902c44f6c30aed065e56626ee6
+  unpetrify-ref: 0.10.5
+  build-system: python-distutils
diff --git a/strata/mtd-utilities.morph b/strata/mtd-utilities.morph
new file mode 100644
index 00000000..67ff09a8
--- /dev/null
+++ b/strata/mtd-utilities.morph
@@ -0,0 +1,11 @@
+name: mtd-utilities
+kind: stratum
+build-depends:
+- morph: strata/foundation.morph
+- morph: strata/core.morph
+chunks:
+- name: mtd-utils
+  morph: strata/mtd-utilities/mtd-utils.morph
+  repo: upstream:mtd-utils
+  ref: 9f107132a6a073cce37434ca9cda6917dd8d866b
+  unpetrify-ref: v1.5.1
diff --git a/strata/mtd-utilities/mtd-utils.morph b/strata/mtd-utilities/mtd-utils.morph
new file mode 100644
index 00000000..59dfcc68
--- /dev/null
+++ b/strata/mtd-utilities/mtd-utils.morph
@@ -0,0 +1,6 @@
+name: mtd-utils
+kind: chunk
+build-commands:
+- make
+install-commands:
+- make install
diff --git a/strata/multimedia-common.morph b/strata/multimedia-common.morph
index 69f3ccad..94278bc8 100644
--- a/strata/multimedia-common.morph
+++ b/strata/multimedia-common.morph
@@ -5,12 +5,33 @@ build-depends:
 - morph: strata/core.morph
 chunks:
 - name: ogg
-  repo: upstream:ogg
-  ref: 0deb6226917e32a71f15d5279d0bc76d8b97c13f
+  repo: upstream:ogg-git
+  ref: 9b2ba419aecb4a1c97114545d57174593dc13111
   unpetrify-ref: master
+  build-system: autotools
 - name: libvorbis
-  repo: upstream:libvorbis
-  ref: 2ae58009cbc655a6031280f92fb1e7b324318ae8
-  unpetrify-ref: libvorbis-1.3.3
+  repo: upstream:libvorbis-git
+  ref: 7187e7a48f0c3ba32cc080f6bc3d921fe4ec6cc2
+  unpetrify-ref: master
+  build-system: autotools
+  build-depends:
+  - ogg
+- name: tremor
+  repo: upstream:tremor
+  ref: b56ffce0c0773ec5ca04c466bc00b1bbcaf65aef
+  unpetrify-ref: master
+  build-system: autotools
+  build-depends:
+  - ogg
+- name: flac
+  repo: upstream:flac
+  ref: 6ced857c253d5da286bf31adfd74a627aaa43c77
+  unpetrify-ref: master
+  build-system: autotools
   build-depends:
   - ogg
+- name: libmad
+  morph: strata/multimedia-common/libmad.morph
+  repo: upstream:libmad-tarball
+  ref: f2b21c41aef22e81b605afe96e1e6ef1bea0cfdc
+  unpetrify-ref: baserock/0.15.1b-gstreamer-sdk-fork
diff --git a/strata/multimedia-common/libmad.morph b/strata/multimedia-common/libmad.morph
new file mode 100644
index 00000000..839adc15
--- /dev/null
+++ b/strata/multimedia-common/libmad.morph
@@ -0,0 +1,10 @@
+name: libmad
+kind: chunk
+build-system: autotools
+configure-commands:
+- |
+  OPTS=
+  case $MORPH_ARCH in
+      mips64*)  ARCH_FLAGS="--enable-fpm=64bit" ;;
+  esac
+  ./configure --prefix="$PREFIX" $ARCH_FLAGS
diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph
index 51230de2..a9c84ca4 100644
--- a/strata/multimedia-gstreamer-0.10.morph
+++ b/strata/multimedia-gstreamer-0.10.morph
@@ -11,22 +11,26 @@ chunks:
   repo: upstream:orc
   ref: b4f7fcaf99a4d952e59f2a9fa9286d24cc4b3a5a
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: gstreamer@0.10
   repo: upstream:gstreamer
   ref: 1bb950008f4656f6a6153fa88a8ebb5a39fbe84f
   unpetrify-ref: baserock/morph/0.10
+  build-system: autotools
   build-depends:
   - orc
 - name: gstreamer-plugins-base@0.10
   repo: upstream:gstreamer-plugins-base
   ref: 960c596309dbb983a1d733259adccc45c47006a2
   unpetrify-ref: baserock/morph/0.10
+  build-system: autotools
   build-depends:
   - gstreamer@0.10
 - name: gstreamer-plugins-good@0.10
   repo: upstream:gstreamer-plugins-good
   ref: 725e80e0c6b7f8e66d9b3fcaffd283ecbd8498d3
   unpetrify-ref: baserock/morph/0.10
+  build-system: autotools
   build-depends:
   - gstreamer@0.10
   - gstreamer-plugins-base@0.10
diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph
index f91e5173..98cc212e 100644
--- a/strata/multimedia-gstreamer.morph
+++ b/strata/multimedia-gstreamer.morph
@@ -10,22 +10,26 @@ chunks:
   repo: upstream:orc
   ref: 16e053b8f2359196fd50b111f1c10b93590f5cb9
   unpetrify-ref: orc-0.4.22
+  build-system: autotools
 - name: gstreamer
   repo: upstream:gstreamer
   ref: c61dea148ca3f14586d8eddf0b7e6ca47c164c86
   unpetrify-ref: baserock/1.4.4+bison_fix
+  build-system: autotools
   build-depends:
   - orc
 - name: gstreamer-plugins-base
   repo: upstream:gstreamer-plugins-base
   ref: 3b38ad94a2d58c07c24e4647e08afa1fe4dd7d46
   unpetrify-ref: baserock/1.4
+  build-system: autotools
   build-depends:
   - gstreamer
 - name: gstreamer-plugins-good
   repo: upstream:gstreamer-plugins-good
   ref: 9d48c2f7a7b63fd967de7eec72434bc876c02667
   unpetrify-ref: baserock/1.4
+  build-system: autotools
   build-depends:
   - gstreamer
   - gstreamer-plugins-base
@@ -34,6 +38,7 @@ chunks:
   repo: upstream:gstreamer-plugins-bad
   ref: bb2a4669ff57af90c8101c54744d3228aa060475
   unpetrify-ref: baserock/1.4
+  build-system: autotools
   build-depends:
   - gstreamer
   - gstreamer-plugins-base
diff --git a/strata/networking-utils.morph b/strata/networking-utils.morph
index 689bec87..d452b72b 100644
--- a/strata/networking-utils.morph
+++ b/strata/networking-utils.morph
@@ -1,14 +1,19 @@
 name: networking-utils
 kind: stratum
 description: |
-    Stratum which contains utils to works with networks: create, enable, filter...
+  Stratum which contains utils to works with networks: create, enable, filter...
 
-    This stratum requires kernel config flags which are not enabled in the default
-    Baserock kernel found in the BSP strata. See the Openstack BSP stratum to get
-    an idea of what is needed.
+  This stratum requires kernel config flags which are not enabled in the default
+  Baserock kernel found in the BSP strata. See the Openstack BSP stratum to get
+  an idea of what is needed.
 build-depends:
 - morph: strata/foundation.morph
 chunks:
+- name: ebtables
+  morph: strata/networking-utils/ebtables.morph
+  repo: upstream:ebtables
+  ref: f4bdc80ae8c1a79b4ab5dcb8431ad85aea618d66
+  unpetrify-ref: master
 - name: iproute2
   morph: strata/networking-utils/iproute2.morph
   repo: upstream:iproute2
@@ -18,6 +23,7 @@ chunks:
   repo: upstream:libmnl
   ref: c9f19b98cd8e108617e825e071091df14f78c53a
   unpetrify-ref: master
+  build-system: autotools
 - name: ipset
   morph: strata/networking-utils/ipset.morph
   repo: upstream:ipset
@@ -25,3 +31,75 @@ chunks:
   unpetrify-ref: v6.24
   build-depends:
   - libmnl
+- name: libpcap
+  morph: strata/networking-utils/libpcap.morph
+  repo: upstream:libpcap
+  ref: 098a643f817e8a9929c70dfba157e4d399398375
+  unpetrify-ref: libpcap-1.7
+- name: tcpdump
+  morph: strata/networking-utils/tcpdump.morph
+  repo: upstream:tcpdump
+  ref: 8aa5edea1b8846740514dee4158b6c707d38fc13
+  unpetrify-ref: tcpdump-4.7
+  build-depends:
+  - libpcap
+- name: libnet
+  morph: strata/networking-utils/libnet.morph
+  repo: upstream:libnet
+  ref: 05df365769597e1d64d02af931d6127762ff2658
+  unpetrify-ref: libnet-1.2
+- name: iputils
+  morph: strata/networking-utils/iputils.morph
+  repo: upstream:iputils
+  ref: d25e54e25107bc7c5d14737ed65f5f52b54f1472
+  unpetrify-ref: s20140519
+  build-depends:
+  - libpcap
+  - libnet
+- name: libnfnetlink
+  morph: strata/networking-utils/libnfnetlink.morph
+  repo: upstream:libnfnetlink
+  ref: 1166116e34af868bc814aea338c246e49a7a8748
+  unpetrify-ref: libnfnetlink-1.0.1
+- name: libnetfilter_conntrack
+  morph: strata/networking-utils/libnetfilter_conntrack.morph
+  repo: upstream:libnetfilter_conntrack
+  ref: 5ad6ecff6edffd925022372323e42264f61e850d
+  unpetrify-ref: libnetfilter_conntrack-1.0.4
+  build-depends:
+  - libnfnetlink
+  - libmnl
+- name: libnetfilter_cthelper
+  morph: strata/networking-utils/libnetfilter_cthelper.morph
+  repo: upstream:libnetfilter_cthelper
+  ref: b8df12f352db62d26e5116e960d24774d5c9f3b7
+  unpetrify-ref: libnetfilter_cthelper-1.0.0
+  build-depends:
+  - libmnl
+- name: libnetfilter_cttimeout
+  morph: strata/networking-utils/libnetfilter_cttimeout.morph
+  repo: upstream:libnetfilter_cttimeout
+  ref: 329652bef21c831dae1a9a79084b999d40b4eb5b
+  unpetrify-ref: libnetfilter_cttimeout-1.0.0
+  build-depends:
+  - libmnl
+- name: libnetfilter_queue
+  morph: strata/networking-utils/libnetfilter_queue.morph
+  repo: upstream:libnetfilter_queue
+  ref: f5d092dd3145d427c7c2ed668e3ac899875c9612
+  unpetrify-ref: libnetfilter_queue-1.0.2
+  build-depends:
+  - libnfnetlink
+  - libmnl
+- name: conntrack-tools
+  morph: strata/networking-utils/conntrack-tools.morph
+  repo: upstream:conntrack-tools
+  ref: fbe3181be4f2e33509b1c20b95fd55eb3e7075d7
+  unpetrify-ref: conntrack-tools-1.4.2
+  build-depends:
+  - libnfnetlink
+  - libmnl
+  - libnetfilter_conntrack
+  - libnetfilter_cttimeout
+  - libnetfilter_cthelper
+  - libnetfilter_queue
diff --git a/strata/networking-utils/conntrack-tools.morph b/strata/networking-utils/conntrack-tools.morph
new file mode 100644
index 00000000..e0ef7234
--- /dev/null
+++ b/strata/networking-utils/conntrack-tools.morph
@@ -0,0 +1,4 @@
+name: conntrack-tools
+kind: chunk
+build-system: autotools
+max-jobs: 1
diff --git a/strata/virtualization/ebtables.morph b/strata/networking-utils/ebtables.morph
index a4d9fc76..a4d9fc76 100644
--- a/strata/virtualization/ebtables.morph
+++ b/strata/networking-utils/ebtables.morph
diff --git a/strata/networking-utils/iputils.morph b/strata/networking-utils/iputils.morph
new file mode 100644
index 00000000..c9736cc8
--- /dev/null
+++ b/strata/networking-utils/iputils.morph
@@ -0,0 +1,24 @@
+name: iputils
+kind: chunk
+build-system: manual
+pre-configure-commands:
+# gnutls is not currently integrated in definitions so, disabling this
+# is required in order to build ping6. If this is not disabled, it will try
+# to find gnutls/openssl.h header failing to compile ping6.
+- sed -i "s/USE_GNUTLS=yes/USE_GNUTLS=no/" Makefile
+build-commands:
+- make
+- make ninfod
+install-commands:
+- install -D -m 755 clockdiff "$DESTDIR$PREFIX"/bin/clockdiff
+- install -D -m 755 rdisc "$DESTDIR$PREFIX"/bin/rdisc
+- install -D -m 755 tracepath "$DESTDIR$PREFIX"/bin/tracepath
+- install -D -m 755 tracepath6 "$DESTDIR$PREFIX"/bin/tracepath6
+- install -D -m 755 ninfod/ninfod "$DESTDIR$PREFIX"/bin/ninfod
+- install -D -m 755 rarpd "$DESTDIR$PREFIX"/bin/rarpd
+# The following binaries are installed to overwrite busybox binaries.
+- install -D -m 755 traceroute6 "$DESTDIR$PREFIX"/bin/traceroute6
+- install -D -m 755 arping "$DESTDIR$PREFIX"/sbin/arping
+- install -D -m 755 tftpd "$DESTDIR$PREFIX"/sbin/tftpd
+- install -D -m 755 ping "$DESTDIR"/bin/ping
+- install -D -m 755 ping6 "$DESTDIR"/bin/ping6
diff --git a/strata/networking-utils/libnet.morph b/strata/networking-utils/libnet.morph
new file mode 100644
index 00000000..ddb2cf3e
--- /dev/null
+++ b/strata/networking-utils/libnet.morph
@@ -0,0 +1,16 @@
+name: libnet
+kind: chunk
+build-system: manual
+pre-configure-commands:
+# Avoid building the docs as they require doxygen
+- sed -i 's@doc @@' libnet/Makefile.am
+- sed -i 's@doc/.*Makefile@@' libnet/configure.ac
+
+- cd libnet && ./autogen.sh
+configure-commands:
+- cd libnet && ./configure --prefix="$PREFIX" --disable-samples --enable-shared=yes
+  --with-pic
+build-commands:
+- cd libnet && make
+install-commands:
+- cd libnet && make DESTDIR="$DESTDIR" install
diff --git a/strata/networking-utils/libnetfilter_conntrack.morph b/strata/networking-utils/libnetfilter_conntrack.morph
new file mode 100644
index 00000000..ef6ebb48
--- /dev/null
+++ b/strata/networking-utils/libnetfilter_conntrack.morph
@@ -0,0 +1,3 @@
+name: libnetfilter_conntrack
+kind: chunk
+build-system: autotools
diff --git a/strata/networking-utils/libnetfilter_cthelper.morph b/strata/networking-utils/libnetfilter_cthelper.morph
new file mode 100644
index 00000000..7f410a4a
--- /dev/null
+++ b/strata/networking-utils/libnetfilter_cthelper.morph
@@ -0,0 +1,3 @@
+name: libnetfilter_cthelper
+kind: chunk
+build-system: autotools
diff --git a/strata/networking-utils/libnetfilter_cttimeout.morph b/strata/networking-utils/libnetfilter_cttimeout.morph
new file mode 100644
index 00000000..b2281a5b
--- /dev/null
+++ b/strata/networking-utils/libnetfilter_cttimeout.morph
@@ -0,0 +1,3 @@
+name: libnetfilter_cttimeout
+kind: chunk
+build-system: autotools
diff --git a/strata/networking-utils/libnetfilter_queue.morph b/strata/networking-utils/libnetfilter_queue.morph
new file mode 100644
index 00000000..d2b80d38
--- /dev/null
+++ b/strata/networking-utils/libnetfilter_queue.morph
@@ -0,0 +1,3 @@
+name: libnetfilter_queue
+kind: chunk
+build-system: autotools
diff --git a/strata/networking-utils/libnfnetlink.morph b/strata/networking-utils/libnfnetlink.morph
new file mode 100644
index 00000000..f4fe79ab
--- /dev/null
+++ b/strata/networking-utils/libnfnetlink.morph
@@ -0,0 +1,3 @@
+name: libnfnetlink
+kind: chunk
+build-system: autotools
diff --git a/strata/tools/libpcap.morph b/strata/networking-utils/libpcap.morph
index 7c5ee932..7c5ee932 100644
--- a/strata/tools/libpcap.morph
+++ b/strata/networking-utils/libpcap.morph
diff --git a/strata/tools/tcpdump.morph b/strata/networking-utils/tcpdump.morph
index 7a974dab..7a974dab 100644
--- a/strata/tools/tcpdump.morph
+++ b/strata/networking-utils/tcpdump.morph
diff --git a/strata/nfs.morph b/strata/nfs.morph
index 9b9aa248..e05d585c 100644
--- a/strata/nfs.morph
+++ b/strata/nfs.morph
@@ -8,6 +8,7 @@ chunks:
   repo: upstream:libevent
   ref: 0b49ae34594533daa82c06a506078de9e336a013
   unpetrify-ref: release-2.1.5-beta
+  build-system: autotools
 - name: ti-rpc
   morph: strata/nfs/ti-rpc.morph
   repo: upstream:ti-rpc
diff --git a/strata/nfs/nfs-utils.morph b/strata/nfs/nfs-utils.morph
index c412e1d0..8116a9f4 100644
--- a/strata/nfs/nfs-utils.morph
+++ b/strata/nfs/nfs-utils.morph
@@ -3,7 +3,8 @@ kind: chunk
 build-system: autotools
 configure-commands:
 - NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --disable-nfsv4 --disable-nfsv41 --disable-gss --with-rpcgen=internal --without-tcp-wrappers
+- ./configure --prefix="$PREFIX" --disable-nfsv4 --disable-nfsv41 --disable-gss --with-rpcgen=internal
+  --without-tcp-wrappers
 install-commands:
 - make DESTDIR="$DESTDIR" install
 - mkdir -p "$DESTDIR"/lib/systemd/system
diff --git a/strata/nodejs.morph b/strata/nodejs.morph
index 58dbdd0b..bf1f9d3a 100644
--- a/strata/nodejs.morph
+++ b/strata/nodejs.morph
@@ -8,3 +8,4 @@ chunks:
   repo: upstream:node
   ref: cc56c62ed879ad4f93b1fdab3235c43e60f48b7e
   unpetrify-ref: v0.10.26
+  build-system: autotools
diff --git a/strata/ntpd/ntpd.morph b/strata/ntpd/ntpd.morph
index 49316c14..762762c7 100644
--- a/strata/ntpd/ntpd.morph
+++ b/strata/ntpd/ntpd.morph
@@ -2,7 +2,7 @@ name: ntpd
 kind: chunk
 build-system: autotools
 configure-commands:
-  - ./configure --prefix="$PREFIX" --enable-linuxcaps
+- ./configure --prefix="$PREFIX" --enable-linuxcaps
 post-install-commands:
 - |
   cat > ntpd.service << EOF
@@ -13,7 +13,7 @@ post-install-commands:
 
   [Service]
   Type=forking
-  ExecStart=/usr/bin/ntpd -u ntp:ntp
+  ExecStart=/usr/bin/ntpd -u ntp:ntp -Ng
   PrivateTmp=True
   Restart=on-failure
 
@@ -40,8 +40,8 @@ post-install-commands:
   # matching hosts
   #
   # see ntp.conf(5) for more details
-  restrict -4 default kod notrap nomodify
-  restrict -6 default kod notrap nomodify
+  restrict -4 default limit kod notrap nomodify
+  restrict -6 default limit kod notrap nomodify
   EOF
 - install -D -m 644 ntp.conf "$DESTDIR"/etc/ntp.conf
 system-integration:
diff --git a/strata/openbmc.morph b/strata/openbmc.morph
new file mode 100644
index 00000000..b1309a2a
--- /dev/null
+++ b/strata/openbmc.morph
@@ -0,0 +1,22 @@
+name: openbmc
+kind: stratum
+description: OpenBMC components
+build-depends:
+- morph: strata/build-essential.morph
+- morph: strata/core.morph
+chunks:
+- name: i2c-tools
+  morph: strata/openbmc/i2c-tools.morph
+  repo: upstream:i2c-tools
+  ref: 187dd637f7789c4cb12dfe2ba13f6e01d2a3c698
+  unpetrify-ref: V3-1-1
+- name: lm_sensors
+  morph: strata/openbmc/lm_sensors.morph
+  repo: upstream:lm-sensors
+  ref: d9983967a89382f64c65db67026f85f073ef9b74
+  unpetrify-ref: master
+- name: isc-dhcp
+  repo: upstream:isc-dhcp-tarball
+  morph: strata/openbmc/isc-dhcp.morph
+  ref: f800382616186a5d30e28d8b2c51e97a9a8360f2
+  unpetrify-ref: master
diff --git a/strata/openbmc/i2c-tools.morph b/strata/openbmc/i2c-tools.morph
new file mode 100644
index 00000000..5fba3b0a
--- /dev/null
+++ b/strata/openbmc/i2c-tools.morph
@@ -0,0 +1,16 @@
+name: i2c-tools
+kind: chunk
+build-commands:
+- make -C eepromer && make
+install-commands:
+- mkdir -p "$DESTDIR$PREFIX"/bin
+- |
+  i2ctools="i2cdetect i2cdump i2cget i2cset"
+  for f in ${i2ctools}; do
+    install -m 755 tools/${f} "$DESTDIR$PREFIX"/bin/${f}
+  done
+- |
+  eepromtools="eepromer eeprom eeprog"
+  for f in ${eepromtools}; do
+    install -m 755 eepromer/${f} "$DESTDIR$PREFIX"/bin/${f}
+  done
diff --git a/strata/openbmc/isc-dhcp.morph b/strata/openbmc/isc-dhcp.morph
new file mode 100644
index 00000000..5ee2e66b
--- /dev/null
+++ b/strata/openbmc/isc-dhcp.morph
@@ -0,0 +1,3 @@
+name: isc-dhcp
+kind: chunk
+build-system: autotools
diff --git a/strata/openbmc/lm_sensors.morph b/strata/openbmc/lm_sensors.morph
new file mode 100644
index 00000000..27ee10d5
--- /dev/null
+++ b/strata/openbmc/lm_sensors.morph
@@ -0,0 +1,7 @@
+name: lm_sensors
+kind: chunk
+build-commands:
+- make user PROG_EXTRA="sensors"
+install-commands:
+- make DESTDIR="$DESTDIR" PREFIX="$PREFIX" install
+# TODO: If we need sensord too, we'll need rrdtool as a dependency and install instructions for sensord components
diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph
index 32e0f356..ae0662e1 100644
--- a/strata/openstack-clients.morph
+++ b/strata/openstack-clients.morph
@@ -8,35 +8,42 @@ chunks:
   repo: upstream:warlock
   ref: 408ccb82347aabf3dc7cf6eccbd2ed2475cb0d60
   unpetrify-ref: 1.1.0
+  build-system: python-distutils
 - name: python-keystoneclient
   repo: upstream:openstack/python-keystoneclient
-  ref: 79d1eec35aad874a7c08ff22c39260884a5524ba
-  unpetrify-ref: 0.11.1
+  ref: 8fa6b6f0b5e95493342ce71489d04f73db2418b8
+  unpetrify-ref: 1.3.1
+  build-system: python-distutils
 - name: python-glanceclient
   repo: upstream:openstack/python-glanceclient
-  ref: 8a877b2752162d6a2db43d7d61d6311c4f42285b
-  unpetrify-ref: 0.14.1
+  ref: b176c28bbdae3eb5b3280c1981ad2b3b255e234e
+  unpetrify-ref: 0.17.1
+  build-system: python-distutils
   build-depends:
   - python-keystoneclient
   - warlock
 - name: python-novaclient
   repo: upstream:openstack/python-novaclient
-  ref: 5ecfdac6b34769e200ff5c4c7429c20518c5b24f
-  unpetrify-ref: 2.20.0
+  ref: e0f5072907a00d48a183dd8fc91a6cf6038ca279
+  unpetrify-ref: 2.23.0
+  build-system: python-distutils
   build-depends:
   - python-keystoneclient
 - name: python-swiftclient
   repo: upstream:openstack/python-swiftclient
   ref: bb4d2ab59c4de9389667eeed255642f51e276f1e
   unpetrify-ref: 2.3.1
+  build-system: python-distutils
 - name: python-troveclient
   repo: upstream:openstack/python-troveclient
   ref: e010a919750f07493afd42a4db867853b925bcbf
   unpetrify-ref: 1.0.7
+  build-system: python-distutils
 - name: python-cinderclient
   repo: upstream:openstack/python-cinderclient
   ref: ac9b0913904c43f4bf12c8164324d6e6a55dc1ab
   unpetrify-ref: 1.1.1
+  build-system: python-distutils
   build-depends:
   - python-keystoneclient
 - name: pyparsing
@@ -45,55 +52,73 @@ chunks:
   ref: 8062c76ab3958a570052124f17e71f3dd3ec2257
   unpetrify-ref: pyparsing_2.0.3
 - name: cmd2
-  repo: upstream:python-packages/cmd2.git
-  ref: 07b4dc3d6991cbdc420c246e807371c97a467d1a
-  unpetrify-ref: master
+  repo: upstream:python-packages/cmd2-hg
+  ref: c0d606bdeb88717ad92ba198bc9232615b83c4cd
+  unpetrify-ref: 0.6.7
+  build-system: python-distutils
   build-depends:
   - pyparsing
 - name: cliff
   repo: upstream:openstack/cliff
-  ref: 42675b2d7ad93f4bba9c4216874c68b8e5834147
-  unpetrify-ref: 1.7.0
+  ref: b703ad32743026d253f872caa1ff2cd727803d14
+  unpetrify-ref: 1.10.1
+  build-system: python-distutils
   build-depends:
   - cmd2
   - pyparsing
+- name: tablib
+  morph: strata/openstack-clients/tablib.morph
+  repo: upstream:python-packages/tablib
+  ref: 1cc051f3e881289a8b51133c0c1ee73683b2d6fc
+  unpetrify-ref: v0.10.0
+- name: cliff-tablib
+  morph: strata/openstack-clients/cliff-tablib.morph
+  repo: upstream:python-packages/cliff-tablib
+  ref: a83bf47d7dfbb690dd53e189c532f0859898db04
+  unpetrify-ref: 1.1
 - name: python-neutronclient
   repo: upstream:openstack/python-neutronclient
-  ref: fa5642f1550bc8f818c1686c40edbaf3672d356a
-  unpetrify-ref: 2.3.9
+  ref: aa1215a5ad063b299d32ef319eb63d5210249a9b
+  unpetrify-ref: 2.4.0
+  build-system: python-distutils
   build-depends:
   - cliff
   - python-keystoneclient
 - name: python-ceilometerclient
   repo: upstream:openstack/python-ceilometerclient
-  ref: 7316dd16b8850270db27c1298dcf5a2223f2f1e1
-  unpetrify-ref: 1.0.12
+  ref: 127aadfd2b2daf9884ad7003e23440048e2efbd8
+  unpetrify-ref: 1.0.14
+  build-system: python-distutils
   build-depends:
   - python-keystoneclient
 - name: python-heatclient
   repo: upstream:openstack/python-heatclient
-  ref: 6089d31e302d80910cc15132f99a1bf358bbb64f
-  unpetrify-ref: 0.2.12
+  ref: 6d528f005742263837d05250662bf6214a703da8
+  unpetrify-ref: 0.4.0
+  build-system: python-distutils
   build-depends:
   - python-keystoneclient
 - name: python-designateclient
   repo: upstream:openstack/python-designateclient
   ref: a900b41e4d8a9eb40e1812295ba16d773e2b9618
   unpetrify-ref: 1.1.0
+  build-system: python-distutils
   build-depends:
   - cliff
   - python-keystoneclient
 - name: python-barbicanclient
-  repo: upstream:openstack/python-barbicanclient.git
-  ref: ac30643631b6bc1c40116061f8eb280a7881e422
-  unpetrify-ref: 2.2.1
+  repo: upstream:openstack/python-barbicanclient
+  ref: 2919366867af335d59913764a55ca8e95569947d
+  unpetrify-ref: 3.0.3
+  build-system: python-distutils
   build-depends:
   - python-keystoneclient
   - cliff
 - name: python-saharaclient
   repo: upstream:openstack/python-saharaclient
-  ref: eadb40ccb62566f02cb93ec03aa232e48835dec3
-  unpetrify-ref: 0.7.6
+  ref: 319ceb6acf55382218dcd971367613aecb3e4afc
+  unpetrify-ref: 0.8.0
+  build-system: python-distutils
   build-depends:
   - python-keystoneclient
 - name: python-ironicclient
@@ -101,3 +126,29 @@ chunks:
   repo: upstream:openstack/python-ironicclient
   ref: 4390a21663de3123fac306e9860624ba7deda0e6
   unpetrify-ref: 0.4.1
+# Despite argparse being part of the Python 2.7's standard library, the
+# pkg_resources module used by python-openstackclient doesn't look into
+# the standard library, resulting in a 'DistributionNotFound: argparse'
+# error.  Hence, install argparse separately.
+- name: argparse
+  morph: strata/openstack-clients/argparse.morph
+  repo: upstream:argparse
+  ref: ec94cd429c56487e89425f226284009f78a596c6
+  unpetrify-ref: r130
+# The latest release of python-openstackclient is not being used as it
+# requires newer versions of glance, neutron, keystone and nova.
+- name: python-openstackclient
+  morph: strata/openstack-clients/python-openstackclient.morph
+  repo: upstream:openstack/python-openstackclient
+  ref: 28f65e665045c1c6d0697f856f06020c7c8e656a
+  unpetrify-ref: 1.2.0
+- name: os-client-config
+  morph: strata/openstack-clients/os-client-config.morph
+  repo: upstream:openstack/os-client-config
+  ref: a0df67704ace186b18fd1ecdc220a7e56409bc6f
+  unpetrify-ref: 1.3.0
+- name: appdirs
+  morph: strata/openstack-clients/appdirs.morph
+  repo: upstream:python-packages/appdirs
+  ref: 57f2bc44a8bca99bac6c57496c8b3fdea26f94d5
+  unpetrify-ref: 1.4.0
diff --git a/strata/openstack-clients/appdirs.morph b/strata/openstack-clients/appdirs.morph
new file mode 100644
index 00000000..53d0e476
--- /dev/null
+++ b/strata/openstack-clients/appdirs.morph
@@ -0,0 +1,3 @@
+name: appdirs
+kind: chunk
+build-system: python-distutils
diff --git a/strata/openstack-clients/argparse.morph b/strata/openstack-clients/argparse.morph
new file mode 100644
index 00000000..499df5f5
--- /dev/null
+++ b/strata/openstack-clients/argparse.morph
@@ -0,0 +1,3 @@
+name: argparse
+kind: chunk
+build-system: python-distutils
diff --git a/strata/openstack-clients/cliff-tablib.morph b/strata/openstack-clients/cliff-tablib.morph
new file mode 100644
index 00000000..4b48ba14
--- /dev/null
+++ b/strata/openstack-clients/cliff-tablib.morph
@@ -0,0 +1,3 @@
+name: cliff-tablib
+kind: chunk
+build-system: python-distutils
diff --git a/strata/openstack-clients/os-client-config.morph b/strata/openstack-clients/os-client-config.morph
new file mode 100644
index 00000000..13c473d2
--- /dev/null
+++ b/strata/openstack-clients/os-client-config.morph
@@ -0,0 +1,3 @@
+name: os-client-config
+kind: chunk
+build-system: python-distutils
diff --git a/strata/openstack-clients/python-openstackclient.morph b/strata/openstack-clients/python-openstackclient.morph
new file mode 100644
index 00000000..a4c9fae7
--- /dev/null
+++ b/strata/openstack-clients/python-openstackclient.morph
@@ -0,0 +1,3 @@
+name: python-openstackclient
+kind: chunk
+build-system: python-distutils
diff --git a/strata/openstack-clients/tablib.morph b/strata/openstack-clients/tablib.morph
new file mode 100644
index 00000000..821ceb95
--- /dev/null
+++ b/strata/openstack-clients/tablib.morph
@@ -0,0 +1,3 @@
+name: tablib
+kind: chunk
+build-system: python-distutils
diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph
index f59f6705..59fb752f 100644
--- a/strata/openstack-common.morph
+++ b/strata/openstack-common.morph
@@ -1,8 +1,8 @@
 name: openstack-common
 kind: stratum
 description: |
-             Stratum with the python packages needed to compile openstack
-             clients and services.
+  Stratum with the python packages needed to compile openstack
+  clients and services.
 build-depends:
 - morph: strata/python-common.morph
 - morph: strata/foundation.morph
@@ -11,34 +11,45 @@ chunks:
   repo: upstream:python-packages/pycparser
   ref: c926670643ebb5f88a2bf56579fc9934c82be6d2
   unpetrify-ref: master
+  build-system: python-distutils
 - name: cffi
   repo: upstream:python-packages/cffi
   ref: fc53b53095d61a1ec5814c09c3bf2c7e18627fb5
-  unpretrify-ref: master
+  unpetrify-ref: master
+  build-system: python-distutils
   build-depends:
   - pycparser
 - name: pytz
   repo: upstream:pytz-tarball
   ref: c414cb801776e11c769fb36c0d37b8d7a7c8712c
   unpetrify-ref: pytz-2014.10
+  build-system: python-distutils
 - name: babel
+  morph: strata/openstack-common/babel.morph
   repo: upstream:babel
-  ref: 246996b0ee51e49ebcd504e234d3bcdcb178996c
-  unpetrify-ref: master
+# Babel requires core-23.1.zip to be present when compiles
+# from source, the following branch adds this file to the
+# repository, and stops the date being added to the version
+# number when running `python setup.py install`.
+  ref: 1891d93b10e6c11ab08099b95001b17e88315c2a
+  unpetrify-ref: baserock/1.3-50-g246996b
   build-depends:
   - pytz
 - name: enum34
   repo: upstream:python-packages/enum34.git
   ref: f1fa1787ceaac72b9934f318ea2135d28c05dd55
   unpetrify-ref: enum34-1.0
+  build-system: python-distutils
 - name: pyasn1
   repo: upstream:python-packages/pyasn1
   ref: fa8e66c5f4367a1e39b53dcddc133d084b10400f
   unpetrify-ref: release_0_1_7_tag
+  build-system: python-distutils
 - name: cryptography
   repo: upstream:python-packages/cryptography
   ref: 9ac7d55150c8410a08ee3b00b89bfeac3dbd8e8f
   unpetrify-ref: 0.7.2
+  build-system: python-distutils
   build-depends:
   - pyasn1
   - enum34
@@ -47,18 +58,22 @@ chunks:
   repo: upstream:pyiso8601
   ref: 9eb87a9bab114e9cc9a8d3dceb04362644d89cab
   unpetrify-ref: 0.1.10
+  build-system: python-distutils
 - name: netaddr
   repo: upstream:netaddr
   ref: bbb31ed50a5338a7d1c0011fc4429d09954f9f0b
   unpetrify-ref: release-0.7.12
+  build-system: python-distutils
 - name: stevedore
-  ref: 860bd8f8ecba38fdfda5b41a3a1dbe854d6528e2
-  unpetrify-ref: 1.0.0.0a2
   repo: upstream:openstack/stevedore
+  ref: 218e95d5f09563bd14c50ee0441855f3389af7e7
+  unpetrify-ref: 1.3.0
+  build-system: python-distutils
 - name: oslo-config
   repo: upstream:openstack/oslo-config
-  ref: 059579ac2189b94bc9e9555b2e9acfb31a83ef53
-  unpetrify-ref: 1.4.0.0a5
+  ref: 3c51838cdffe7a5057ff4823a8ab523bfacc3164
+  unpetrify-ref: 1.9.3
+  build-system: python-distutils
   build-depends:
   - netaddr
   - stevedore
@@ -66,33 +81,64 @@ chunks:
   repo: upstream:python-packages/pyopenssl
   ref: 0146d447e63a737b4f05a1164d5950eff68543e7
   unpetrify-ref: 0.14
+  build-system: python-distutils
 - name: oslo-i18n
   repo: upstream:openstack/oslo-i18n
-  ref: 040f1d6afa733527385d2309e485bf37e9843b0e
-  unpetrify-ref: 0.4.0
+  ref: b0faab7b3d3ea3b14053ab92dd6086956f643e15
+  unpetrify-ref: 1.5.0
+  build-system: python-distutils
   build-depends:
   - babel
+- name: netifaces
+  repo: upstream:python-packages/netifaces
+  ref: 885b200ba717df87f6e8044ec8c66c677c949bcb
+  unpetrify-ref: release_0_10_4
+  build-system: python-distutils
 - name: oslo-utils
   repo: upstream:openstack/oslo-utils
-  ref: 6a123fce93895e92004ce9d5bd8dee3c3642cf41
-  unpetrify-ref: 0.3.0
+  ref: 91dc782c2f11fb76425effd7a331d63111adf1ce
+  unpetrify-ref: 1.4.0
+  build-system: python-distutils
   build-depends:
   - babel
   - pyiso8601
   - oslo-i18n
+  - netifaces
+  - netaddr
 - name: futures
   repo: upstream:python-packages/futures
   ref: 4f7ceedb8a7742e52b0436a4160c7c44665a2597
   unpetrify-ref: 2.2.0
+  build-system: python-distutils
 - name: oslo-serialization
   repo: upstream:openstack/oslo-serialization.git
-  ref: 80fec894a54253d9b4c80dd8a563957966ca0b88
-  unpetrify-ref: 0.3.0
+  ref: 7bfd5dece0f22dbdea1c3e524dbc0eca1f70f1b7
+  unpetrify-ref: 1.4.0
+  build-system: python-distutils
 - name: jsonschema
   repo: upstream:jsonschema
   ref: 35b60f390098d3306c03eee27ceec8cf8a493579
   unpetrify-ref: v2.3.0
+  build-system: python-distutils
 - name: simplejson
   repo: upstream:simplejson
   ref: 54d5ff15d508c51366986cc4f77f2f287f036582
   unpetrify-ref: v3.6.4
+  build-system: python-distutils
+- name: greenlet
+  ref: 42b65a7b67dfabd180625155cd4fcd8e51917fe2
+  unpetrify-ref: 0.4.5
+  repo: upstream:python-packages/greenlet
+  build-system: python-distutils
+- name: eventlet
+  ref: bc0a59f8efdb6d436dd41bcf1b2194b8967bfe7f
+  unpetrify-ref: v0.17.3
+  repo: upstream:python-packages/eventlet
+  build-system: python-distutils
+  build-depends:
+  - greenlet
+- name: pastedeploy
+  repo: upstream:python-packages/pastedeploy
+  ref: 5ad87be617c2cc1dd31625688172e964db2756dc
+  unpetrify-ref: 1.5.2
+  build-system: python-distutils
diff --git a/strata/openstack-common/babel.morph b/strata/openstack-common/babel.morph
new file mode 100644
index 00000000..b9dc475c
--- /dev/null
+++ b/strata/openstack-common/babel.morph
@@ -0,0 +1,8 @@
+name: babel
+kind: chunk
+build-system: python-distutils
+# NOTE: remember that Babel requires core-23.1.zip to be
+# present when compiles from source see baserock/1.3.50-g246996b
+# branch in babel repository in gbo for more information.
+pre-build-commands:
+- python setup.py import_cldr
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index aa73fa33..518e8d60 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -6,7 +6,14 @@ build-depends:
 - morph: strata/django.morph
 - morph: strata/xstatic.morph
 - morph: strata/openstack-clients.morph
+- morph: strata/test-tools.morph
+- morph: strata/python-tools.morph
 chunks:
+- name: erlang-sd_notify
+  morph: strata/openstack-services/erlang-sd_notify.morph
+  repo: upstream:erlang-modules/erlang-sd_notify
+  ref: 99f4689c2c18570680329f822591f95f9341ca10
+  unpretrify-ref: 0.1
 - name: rabbitmq-codegen
   morph: strata/openstack-services/rabbitmq-codegen.morph
   ref: 4dc5ccde2a0b3d638e5754b00abf94196fe9ca32
@@ -21,38 +28,18 @@ chunks:
   - rabbitmq-codegen
 - name: oslo-rootwrap
   repo: upstream:openstack/oslo-rootwrap
-  ref: 62d732277de5cf663172eafe6d3a6c149a9cf814
-  unpetrify-ref: master
-- name: check
-  repo: upstream:check
-  ref: 8c872aca6675e95fa47e7514e28fbdf25fce6170
-  unpetrify-ref: 0.9.8
-- name: cppunit
-  repo: upstream:cppunit
-  ref: 8133cf2b977f013216f0a41b6fcb740410d83926
-  unpetrify-ref: 1.13.2
-- name: webob
-  repo: upstream:python-packages/webob
-  ref: ae0ac90f22f9e1ff351e445f92330efd89195f51
-  unpetrify-ref: 1.4
-- name: greenlet
-  ref: 42b65a7b67dfabd180625155cd4fcd8e51917fe2
-  unpetrify-ref: 0.4.5
-  repo: upstream:python-packages/greenlet
-- name: eventlet
-  ref: 8d2474197de4827a7bca9c33e71a82573b6fc721
-  unpetrify-ref: v0.15.2
-  repo: upstream:python-packages/eventlet
-  build-depends:
-  - greenlet
+  ref: f485b93f475b119e3b8fa6c9cf740207e2d2d7ac
+  unpetrify-ref: 1.6.0
+  build-system: python-distutils
 - name: py-amqp
   repo: upstream:python-packages/py-amqp
   ref: 875b10d1715def640042c7ff2f42c00a6c07eed1
   unpetrify-ref: 1.4.6
+  build-system: python-distutils
 - name: librabbitmq
   morph: strata/openstack-services/librabbitmq.morph
   repo: upstream:python-packages/librabbitmq
-  ref: 0087f3c6fa81d4ec4c573319ee2149a5db7018e6
+  ref: ecccbd2c7d92f6e189e362b26def8d980fa50e3b
   unpetrify-ref: baserock/v1.6.1
   build-depends:
   - py-amqp
@@ -60,10 +47,12 @@ chunks:
   repo: upstream:python-packages/anyjson
   ref: 016506078e94718e1fe750eb5083ab5ba07498c8
   unpetrify-ref: 0.3.3
+  build-system: python-distutils
 - name: kombu
   repo: upstream:python-packages/kombu
-  ref: 6e68e54b3a846faa6f8b7e14a4a7ca51d1967bc2
-  unpetrify-ref: v3.0.23
+  ref: 0287b11ab0698d9c52ef1b1683ced23123d43ba4
+  unpetrify-ref: v3.0.26
+  build-system: python-distutils
   build-depends:
   - anyjson
   - py-amqp
@@ -72,99 +61,85 @@ chunks:
   repo: upstream:python-packages/sqlalchemy
   ref: ff34c480dfd2b8b7c72339d196f5477980a5124c
   unpetrify-ref: rel_0_9_8
+  build-system: python-distutils
 - name: alembic
   repo: upstream:python-packages/alembic
-  ref: 5f952f25caa688d89204d134ee867de7dbad917c
-  unpetrify-ref: rel_0_7_1
+  ref: 6ae4196acc0170ebef29f617b49376b371a8923c
+  unpetrify-ref: rel_0_7_6
+  build-system: python-distutils
   build-depends:
   - sqlalchemy
 - name: lockfile
   repo: upstream:python-packages/lockfile
   ref: 777758cdf4520271370b3338b86b5c66f9b104f0
   unpetrify-ref: master
+  build-system: python-distutils
 - name: dogpile-core
   repo: upstream:python-packages/dogpile-core
   ref: 3e6f0f86b4161b48898e656039154092426e5cc8
   unpetrify-ref: rel_0_4_1
+  build-system: python-distutils
 - name: dogpile-cache
   repo: upstream:python-packages/dogpile-cache
   ref: 1c753914b335b4391bc5847a87b7c52ca81c2bc6
   unpetrify-ref: rel_0_5_4
+  build-system: python-distutils
   build-depends:
   - dogpile-core
 - name: pyjwt
   repo: upstream:python-packages/pyjwt
   ref: 739efeff4c6c1fc30ab5cf5eb0ac337e8ee107d7
   unpetrify-ref: 0.2.3
+  build-system: python-distutils
 - name: creole
   repo: upstream:python-packages/creole
   ref: 6390231688adb5d8678a71cd33204e9bca555d4a
   unpetrify-ref: v1.2.1
-- name: mock
-  repo: upstream:python-packages/mock
-  ref: 35b35f7ad239005a950f870af57b44dbdc99d66b
-  unpetrify-ref: master
-- name: nose
-  repo: upstream:python-packages/nose
-  ref: 08d134270b035dac3310cd877bb0fe9ab678303a
-  unpetrify-ref: release_1.3.4
+  build-system: python-distutils
 - name: pygments
   repo: upstream:python-packages/pygments
   ref: f41e8c594e76855611b3b3dfca300894bd29f1c4
   unpetrify-ref: 2.0rc1
+  build-system: python-distutils
 - name: docutils
   repo: upstream:python-packages/docutils
   ref: 1976ba91eff979abc3e13e5d8cb68324833af6a0
   unpetrify-ref: docutils-0.12
+  build-system: python-distutils
 - name: snowballstemmer
   repo: upstream:python-packages/snowballstemmer.git
   ref: f0d81ce1606d685029302ea073b59d9437d12569
   unpetrify-ref: master
+  build-system: python-distutils
 - name: sphinx
   repo: upstream:python-packages/sphinx
   ref: e76c9771bad16e68cdb7deb18b4d13de0a718c68
   unpetrify-ref: 1.3b1
+  build-system: python-distutils
   build-depends:
   - pygments
   - docutils
   - snowballstemmer
-- name: logilab-common
-  repo: upstream:python-packages/logilab-common.git
-  ref: d1d8f793af6d015d885b9ea67b5741d5a093e2f4
-  unpetrify-ref: logilab-common-version-0.62.0
-- name: astroid
-  repo: upstream:python-packages/astroid.git
-  ref: 7657331baa162122890aa4327f4f441cde9f5188
-  unpetrify-ref: astroid-1.2.1
-  build-depends:
-  - logilab-common
-- name: pylint
-  repo: upstream:python-packages/pylint
-  ref: 541466c31aae21c7cfbf30470f0f6a2dc0a948c3
-  unpetrify-ref: pylint-1.3.1
-  build-depends:
-  - logilab-common
-  - astroid
-- name: python-markdown
-  repo: upstream:python-markdown
-  ref: f0c5b71acbc02af60a33d67c59558bb513b25e74
-  unpetrify-ref: 2.5.1-final
 - name: pystache
   repo: upstream:python-packages/pystache.git
-  ref: 0c5e61a4ccc05bde7f6c6132b4fb6c49a3c093fd
+  ref: cce3ebd658f28aeb7dd54561554dedf5259303dc
   unpetrify-ref: baserock/v0.5.4
+  build-system: python-distutils
 - name: pies
   repo: upstream:python-packages/pies.git
   ref: 593dcce07fdb3e8d0053a863a7aba7f2ce8a6c9c
   unpetrify-ref: 2.6.1
+  build-system: python-distutils
 - name: natsort
   repo: upstream:python-packages/natsort.git
   ref: ce94d418c3849e891f0508b41f5bccc4ae1d4e4d
   unpetrify-ref: 3.5.1
+  build-system: python-distutils
 - name: isort
   repo: upstream:python-packages/isort.git
   ref: 9d1b03b6e1fd2f87be1c635d6159a76a131f8155
   unpetrify-ref: 3.9.0
+  build-system: python-distutils
   build-depends:
   - pies
   - natsort
@@ -172,218 +147,152 @@ chunks:
   repo: upstream:python-packages/pep8.git
   ref: 164066c4d85f212f5f4a11699b848942c678b947
   unpetrify-ref: 1.5.7
+  build-system: python-distutils
 - name: pyflakes
   repo: upstream:python-packages/pyflakes.git
   ref: 71b7b6776856912d50a0b9a85a8ea2a1dc7eb75c
   unpetrify-ref: 0.8.1
+  build-system: python-distutils
 - name: smartypants
   repo: upstream:python-packages/smartypants.git
   ref: e89b6e7e119694edcd414a556c634d5ca85bff76
   unpetrify-ref: v1.8.6
+  build-system: python-distutils
   build-depends:
   - isort
   - pep8
   - pyflakes
-  - pylint
 - name: pycco
   repo: upstream:python-packages/pycco
   ref: 22e157e525760e843dba391ca85fbe9bd35fdc5b
   unpetrify-ref: master
+  build-system: python-distutils
   build-depends:
-  - python-markdown
   - pygments
   - pystache
   - smartypants
-- name: python-decorator
-  repo: upstream:python-packages/python-decorator
-  ref: b02f7a254c3679dfac57a824e08dd02ced850636
-  unpetrify-ref: decorator-3.4.0
 - name: dateutil
   repo: upstream:python-packages/dateutil
   ref: 8c6026ba09716a4e164f5420120bfe2ebb2d9d82
   unpetrify-ref: trunk
+  build-system: python-distutils
 - name: posix-ipc-tarball
   repo: upstream:python-packages/posix-ipc-tarball
   ref: f3765db04b903b3671733e07cf1541a51966dd14
   unpetrify-ref: posix_ipc-0.9.8
-- name: pastedeploy
-  repo: upstream:python-packages/pastedeploy
-  ref: 5ad87be617c2cc1dd31625688172e964db2756dc
-  unpetrify-ref: 1.5.2
+  build-system: python-distutils
 - name: paste
   repo: upstream:python-packages/paste
   ref: 4c177fce89fee925f0f4fbfde00ce2e1252562c0
   unpetrify-ref: master
+  build-system: python-distutils
 - name: repoze-lru
   repo: upstream:python-packages/repoze-lru
   ref: 29c8281dee7fe8dae8c66c7c40ce7c058ec2ab0f
   unpetrify-ref: 0.6
+  build-system: python-distutils
 - name: routes
   repo: upstream:python-packages/routes
-  ref: 8b165a52ab568f6fcaaa11cbbc7402e0360f60a3
-  unpetrify-ref: v2.0
+  ref: 745a9207d9e48e309e292172543bc21075e65e09
+  unpetrify-ref: v2.1
+  build-system: python-distutils
   build-depends:
   - repoze-lru
 - name: passlib
   repo: upstream:python-packages/passlib
   ref: f407312597727a08440e41bc8e31d3b3b334c66f
   unpetrify-ref: 1.6.2
+  build-system: python-distutils
 - name: tempita
   repo: upstream:python-packages/tempita
   ref: b2b67795a009e9f825cbd855d766b78a00273f10
   unpetrify-ref: 0.5
+  build-system: python-distutils
 - name: numpy
   repo: upstream:python-packages/numpy.git
-  ref: ac07f6d3e45090b224a7da81708e60a762a65f76
+  ref: 65293874fb101907e1648e6b4fafd30d0aa1172a
   unpetrify-ref: baserock/v1.9.0
+  build-system: python-distutils
   build-depends:
   - sphinx
 - name: websockify
   repo: upstream:python-packages/websockify
-  ref: e0863aa0c2103069961bc24e618615a0f2bb1487
-  unpetrify-ref: baserock/v0.6.0
+  ref: 2f025741f86419d4ad5702dabf5903db3dbfe77c
+  unpetrify-ref: baserock/v0.6.1-1-g2f02574
+  build-system: python-distutils
   build-depends:
   - numpy
-- name: python-mimeparse
-  repo: upstream:python-packages/python-mimeparse.git
-  ref: 2d600d3fc4a386af69d20fba433843b4df2b3c92
-  unpetrify-ref: master
 - name: httplib2
-  ref: 058a1f9448d5c27c23772796f83a596caf9188e6
-  unpetrify-ref: v0.9
   repo: upstream:python-packages/httplib2
-- name: extras
-  repo: upstream:python-packages/python-test-extras.git
-  ref: cdeb596f01241e9c779332e86f6edcd0c2e8e9f0
-  unpetrify-ref: master
-- name: testtools
-  repo: upstream:python-packages/testtools
-  ref: ee9946228ce5a03a84cf146027de0a8a9a46c4fe
-  unpetrify-ref: testools-1.1.0
-  build-depends:
-  - extras
-  - python-mimeparse
-- name: fixtures
-  repo: upstream:python-packages/fixtures
-  ref: 9f9d89ce718463b24cd3910b9a99efb60b3c9e1b
-  unpetrify-ref: 0.3.16
-  build-depends:
-  - testtools
-- name: subunit
-  morph: strata/openstack-services/subunit.morph
-  repo: upstream:python-packages/subunit
-  ref: e18ffe65a3229d5c1d91be988405d40219db0887
-  unpetrify-ref: 0.0.21
-  build-depends:
-  - extras
-  - testtools
-  - check
-  - cppunit
-- name: testrepository
-  repo: upstream:python-packages/testrepository
-  ref: 6419a3dcaabaf09eaf438c6d8d85c90eba7a2b91
-  unpetrify-ref: 0.0.19
-  build-depends:
-  - fixtures
-  - subunit
-  - testtools
+  ref: f9f797223d075874b0031aea832152688ec23fef
+  unpetrify-ref: v0.9.1
+  build-system: python-distutils
 - name: suds
   repo: upstream:python-packages/suds
-  ref: badd30a87f676d632d7386b05401e6029a5df83c
-  unpetrify-ref: release-0.3.2
-- name: testscenarios
-  repo: upstream:python-packages/testscenarios
-  ref: 475857af19a8190c9c0c7f8241b9907b942e19fd
-  unpetrify-ref: trunk
-- name: mox
-  repo: upstream:python-packages/mox
-  ref: 160491d0384285698d726b1af21277f336107f51
-  unpetrify-ref: master
+  ref: e7a317f1a20a4d3c86ac85785bb32d24c3d1078f
+  unpetrify-ref: baserock/release-0.4
+  build-system: python-distutils
 - name: jsonrpclib
   repo: upstream:python-packages/jsonrpclib
   ref: 53c8ffcfe4dd1718086cc551dce8ac459e8abc67
   unpetrify-ref: master
+  build-system: python-distutils
 - name: rtslib-fb
   repo: upstream:python-packages/rtslib-fb
   ref: 8ffb4739d596fb1aac5d62d173d1e6f80270af9d
   unpetrify-ref: v2.1.fb52
   morph: strata/openstack-services/rtslib-fb.morph
-- name: netifaces
-  repo: upstream:python-packages/netifaces
-  ref: 885b200ba717df87f6e8044ec8c66c677c949bcb
-  unpetrify-ref: release_0_10_4
-- name: networkx
-  repo: upstream:python-packages/networkx
-  ref: 8ac796aba866ade1a56b83e30f25ed392ca3512c
-  unpetrify-ref: v1.9.1
-  build-depends:
-  - python-decorator
-- name: dnspython
-  repo: upstream:python-packages/dnspython
-  ref: e1369c62d14f82b80ef11197a490ace5d43bb3f3
-  unpetrify-ref: v1.12.0
-- name: pexpect
+- name: python-pexpect
   repo: upstream:python-packages/pexpect
   ref: 671417beb41c21f772687c565196fdde444b053b
   unpetrify-ref: 3.3
+  build-system: python-distutils
 - name: ply
   repo: upstream:python-packages/ply.git
   ref: 6513f3537d80f483ec9c7e36d52e87f107a57f23
   unpetrify-ref: master
+  build-system: python-distutils
 - name: jsonpath-rw
   repo: upstream:python-packages/jsonpath-rw
   ref: f4cfe56b8e8370116c5275ddcea970e9a68fd75d
   unpetrify-ref: 1.2.3
+  build-system: python-distutils
   build-depends:
   - ply
-  - python-decorator
-- name: waitress
-  repo: upstream:python-packages/waitress.git
-  ref: b795d573a5a9e6e39b46a6e82da367a6a5db8dbd
-  unpetrify-ref: 0.8.9
-- name: beautifulsoup4
-  repo: upstream:python-packages/beautifulsoup4.git
-  ref: bcd7af0e9159d97aa511fb2d879424d1c1c5aadf
-  unpetrify-ref: trunk
-- name: webtest
-  repo: upstream:python-packages/webtest.git
-  ref: 6a24fba456d1c4ac2609b90f1fdc377c595608a4
-  unpetrify-ref: 2.0.16
-  build-depends:
-  - webob
-  - waitress
-  - beautifulsoup4
 - name: logutils
   repo: upstream:python-packages/logutils.git
   ref: 095f14efbaaf838b7772bffd36a466abb9668efe
   unpetrify-ref: 0.3.3
+  build-system: python-distutils
 - name: pecan
   repo: upstream:python-packages/pecan
   ref: c7f241fd6bb8a0b10e02b8b43aaf1810c312cfbf
   unpetrify-ref: 0.8.0
+  build-system: python-distutils
   build-depends:
-  - webob
-  - webtest
   - logutils
 - name: croniter
   repo: upstream:python-packages/croniter
   ref: 0c3aeac05791cb4ece9e30da29442e9cd5b22f36
   unpetrify-ref: 0.3.5
+  build-system: python-distutils
   build-depends:
   - dateutil
 - name: msgpack-python
   repo: upstream:python-packages/msgpack-python
   ref: 61bac2f586e82313a0e618093bfed2435cd18983
   unpetrify-ref: 0.4.2
+  build-system: python-distutils
 - name: qpid-python
   morph: strata/openstack-services/qpid-python.morph
   repo: upstream:python-packages/qpid-python
   ref: 587b0febaf1996db1e483137ed6addb45580ee9e
-  unpetrify-ref: 0.30
+  unpetrify-ref: '0.30'
 - name: simplegeneric-tarball
   repo: upstream:python-packages/simplegeneric-tarball
   ref: 601fab9b154c557dfd848d531a8969f4697d1aa2
   unpetrify-ref: simplegeneric_0.8.1.orig
+  build-system: python-distutils
 - name: ipaddr-py
   morph: strata/openstack-services/ipaddr-py.morph
   ref: c813f4790d1092b1515ee18fe8270180ed3cc5cb
@@ -393,14 +302,15 @@ chunks:
   repo: upstream:python-packages/wsme
   ref: 99d7668789cc6252398222549599d1363cddb081
   unpetrify-ref: 0.6.1
+  build-system: python-distutils
   build-depends:
   - ipaddr-py
   - simplegeneric-tarball
-  - webob
 - name: pysnmp
   repo: upstream:python-packages/pysnmp
   ref: 1b377afeaf9ee96ab1d48aeebb2b7a6d65a4ac9d
   unpetrify-ref: release_4_2_5_tag
+  build-system: python-distutils
 - name: thrift
   morph: strata/openstack-services/thrift.morph
   repo: upstream:thrift
@@ -410,210 +320,263 @@ chunks:
   repo: upstream:python-packages/retrying
   ref: cab083eb5791615fadbc0c98ad77a70d64b77d0d
   unpetrify-ref: v1.3.1
-- name: boto
-  repo: upstream:boto
-  ref: 2517f660f8ef9012708d46da3a36ab967993d2f6
-  unpetrify-ref: 2.33.0
+  build-system: python-distutils
+- name: oslo-context
+  repo: upstream:openstack/oslo-context
+  ref: 1c4757a9fb41e47867bd9b8d390057ad7636b76f
+  unpetrify-ref: 0.2.0
+  build-system: python-distutils
+- name: oslo-middleware
+  repo: upstream:openstack/oslo-middleware
+  ref: bff184a2b5b1a0d3d22508a7544075378aca9e13
+  unpetrify-ref: 1.2.0
+  build-system: python-distutils
+  build-depends:
+  - oslo-context
 - name: oslo-messaging
   repo: upstream:openstack/oslo-messaging
-  ref: 6ea3b12492e86f9e8d109fc3490cc4d3a0edd8b6
-  unpetrify-ref: 1.4.0.0a5
+  ref: 562c41bb78f578ff9c27633c04ac6dd914c55f5a
+  unpetrify-ref: 1.8.2
+  build-system: python-distutils
   build-depends:
-  - eventlet
   - kombu
+- name: ordereddict
+  repo: upstream:python-packages/ordereddict-tarball
+  ref: 332cd0213829089dd827a32e7c5e64c41ce79cbc
+  unpetrify-ref: ordereddict-1.1
+  build-system: python-distutils
+- name: trollius
+  repo: upstream:python-packages/trollius
+  ref: fe6f8d61b1257bc01cdf4f789aaf4a8ec3d6f8ec
+  unpetrify-ref: trollius-1.0.4
+  build-system: python-distutils
+  build-depends:
+  - ordereddict
+- name: aioeventlet
+  repo: upstream:python-packages/aioeventlet
+  ref: 3cac0d7740592a380a7dadb2ddcdda000cae2bda
+  unpetrify-ref: 0.4
+  build-system: python-distutils
+  build-depends:
+  - trollius
+- name: urllib3
+  repo: upstream:python-packages/urllib3
+  ref: 8434c77d845255c4002b505c6c2d79c3b35def0d
+  unpetrify-ref: 1.10.4
+  build-system: python-distutils
+- name: oslo-concurrency
+  repo: upstream:openstack/oslo-concurrency
+  ref: a2473ed0a59e4553766ffcb1ee8f06cb98b14a48
+  unpetrify-ref: 1.8.0
+  build-system: python-distutils
+  build-depends:
+  - posix-ipc-tarball
+  - retrying
 - name: oslo-vmware
   repo: upstream:openstack/oslo-vmware
-  ref: 047d62c4bbd01a951f77a1a4a75fb2b3d8ce23ee
-  unpetrify-ref: 0.6.0
+  ref: 5de2c31e9d24f40fc7d33ddb1ce407ffdc6f366c
+  unpetrify-ref: 0.11.1
+  build-system: python-distutils
   build-depends:
+  - oslo-concurrency
   - suds
-  - eventlet
+  - urllib3
+  - httplib2
 - name: taskflow
   repo: upstream:openstack/taskflow
-  ref: 1caaecc5d6b2aa4cde4a50e31d1d993fce7a66c4
-  unpetrify-ref: 0.5.0
-  build-depends:
-  - networkx
+  ref: 28bece7c7c97199b8d941b16865c3670c323589a
+  unpetrify-ref: 0.7.1
+  build-system: python-distutils
 - name: sqlalchemy-migrate
   repo: upstream:python-packages/sqlalchemy-migrate
-  ref: 089663761cc15f8b3cdb874b6a76270ccdd0a412
-  unpetrify-ref: 0.9.1
+  ref: e57ee4c3a4247c634980cbeba74d04a01253967d
+  unpetrify-ref: 0.9.6
+  build-system: python-distutils
   build-depends:
   - sqlalchemy
-  - python-decorator
   - tempita
 - name: oauthlib
   repo: upstream:python-packages/oauthlib
-  ref: de773eefcb3c1afe54a0c12d5bf9bd214ceaf404
-  unpetrify-ref: 0.6.3
+  ref: fd239fca84644896b1971cf24bc6213d065adb86
+  unpetrify-ref: 0.7.2
+  build-system: python-distutils
   build-depends:
   - docutils
   - creole
   - pycco
-  - mock
-  - nose
   - sphinx
   - pyjwt
 - name: happybase
   repo: upstream:python-packages/happybase
   ref: 90a4b7ef741f0ecfe5145693f64c6f7180b9ba3d
   unpetrify-ref: 0.8
+  build-system: python-distutils
   build-depends:
   - thrift
 - name: osprofiler
   repo: upstream:python-packages/osprofiler
   ref: bbe39b517263017c9db56ae1d904d08846eacff7
   unpetrify-ref: 0.3.0
-  build-depends:
-  - webob
-- name: oslotest
-  repo: upstream:openstack/oslotest
-  ref: cfdb562a6e07728570ca624a8c4faf3f5b61423b
-  unpetrify-ref: 1.2.0
-  build-depends:
-  - fixtures
-  - subunit
-  - testrepository
-  - testscenarios
-  - testtools
-  - mock
-  - mox
+  build-system: python-distutils
 - name: pycadf
   repo: upstream:python-packages/pycadf
-  ref: 52727bcea3a98e72331e748ce5f9e3a111a64cd1
-  unpetrify-ref: 0.6.0
+  ref: 9501f4f74c5d800ae43edbe52680e285cf98c710
+  unpetrify-ref: 0.9.0
+  build-system: python-distutils
   build-depends:
+  - oslo-context
   - oslo-messaging
   - posix-ipc-tarball
-  - webob
-- name: python-xattr
-  morph: strata/openstack-services/python-xattr.morph
-  repo: upstream:python-packages/xattr
-  ref: dd10d44e3eb9a1d2303c1f7d5126c099d56e97fc
-  unpetrify-ref: v0.7.6
 - name: keystonemiddleware
   repo: upstream:openstack/keystonemiddleware
-  ref: a7beb50b38be5c3dd4c44d68ad79d1bb206dab6b
-  unpetrify-ref: 1.2.0
+  ref: 0e63b0e13d0a7919fddd7576c99bc15a45d31a9f
+  unpetrify-ref: 1.5.1
+  build-system: python-distutils
   build-depends:
-  - webob
+  - pycadf
+  - oslo-context
 - name: oslo-db
   repo: upstream:openstack/oslo-db
-  ref: 0bb1e236daae53a3f5b4b88761d7b19f7961ed6c
-  unpetrify-ref: 1.0.2
+  ref: 3e6a30c396aa42ef0eccb5b3625af728d8d3f437
+  unpetrify-ref: 1.7.1
+  build-system: python-distutils
   build-depends:
   - alembic
   - sqlalchemy
   - sqlalchemy-migrate
 - name: glance_store
   repo: upstream:openstack/glance_store.git
-  ref: 54f673d4133c1244e2555e7ceb3344c104a74154
-  unpetrify-ref: 0.1.8
-  build-depends:
-  - eventlet
+  ref: ea88e503b617a7ac9a0ae7e537d6517e9992a104
+  unpetrify-ref: 0.4.0
+  build-system: python-distutils
+  build-depends:
+  - ordereddict
+  - oslo-concurrency
+- name: oslo-log
+  repo: upstream:openstack/oslo-log
+  ref: 54e3d0e705accfaa4c73a01fc2ea1480fcc0024e
+  unpetrify-ref: 1.0.0
+  build-system: python-distutils
+  build-depends:
+  - oslo-context
+- name: oslo-policy
+  repo: upstream:openstack/oslo-policy
+  ref: 4c8f38cd1d088c46be314b47f6774e721813c6d9
+  unpetrify-ref: 0.3.2
+  build-system: python-distutils
+- name: semantic-version
+  repo: upstream:python-packages/semantic-version
+  ref: 2174bdcae6e46f5f68f5b8ea984a695db9f41bcf
+  unpetrify-ref: v2.4.1
+  build-system: python-distutils
 - name: glance
+  morph: strata/openstack-services/glance.morph
   repo: upstream:openstack/glance
-  ref: 055adff1d95dca72074da898b541cb4a6b62406d
-  unpetrify-ref: 2014.2.1
+  ref: 93b0d5fce3a41e4a3a549f98f78b6681cbc3ea95
+  unpetrify-ref: 2015.1.0
   build-depends:
-  - greenlet
   - sqlalchemy
   - anyjson
-  - eventlet
-  - pastedeploy
   - routes
-  - webob
-  - boto
   - sqlalchemy-migrate
   - httplib2
   - kombu
   - keystonemiddleware
   - wsme
   - oslo-vmware
+  - oslo-concurrency
+  - oslo-context
+  - oslo-log
+  - oslo-policy
   - paste
   - oslo-db
   - oslo-messaging
   - retrying
   - osprofiler
+  - ordereddict
   - glance_store
+  - semantic-version
+  - taskflow
+  - posix-ipc-tarball
 - name: sqlparse
   repo: upstream:python-packages/sqlparse
   ref: 991e7348075accae6d08025212251af21e92e664
   unpetrify-ref: 0.1.13
+  build-system: python-distutils
+- name: pysaml2
+  repo: upstream:python-packages/pysaml2.git
+  ref: 13ff5e8899300c9b359fa1bdfdb3d412be0d7356
+  unpetrify-ref: 2.4.0
+  build-system: python-distutils
 - name: keystone
+  morph: strata/openstack-services/keystone.morph
   repo: upstream:openstack/keystone
-  ref: 615f79bb97883eee76923527cea13c2f72baa7ff
-  unpetrify-ref: 2014.2.1
+  ref: 5d3b31f9c3d34599ff8a83eeb7530fc6e0b1b67b
+  unpetrify-ref: 2015.1.0
   build-depends:
-  - webob
-  - eventlet
-  - greenlet
-  - pastedeploy
   - paste
   - routes
   - sqlalchemy
   - sqlalchemy-migrate
   - passlib
   - keystonemiddleware
+  - oslo-concurrency
   - oslo-messaging
   - oslo-db
+  - oslo-log
+  - oslo-middleware
+  - oslo-policy
   - oauthlib
   - dogpile-cache
   - pycadf
   - posix-ipc-tarball
-  - sqlparse
+  - pysaml2
 - name: neutron
   morph: strata/openstack-services/neutron.morph
   repo: upstream:openstack/neutron
-  ref: dfa4b4b9b6b19a627cfb5eb5c6ab9db4961a06ea
-  unpetrify-ref: 2014.2.1
+  ref: 7260e0e3fc2ea479e80e0962624aca7fd38a1f60
+  unpetrify-ref: 2015.1.0
   build-depends:
   - paste
-  - pastedeploy
   - routes
-  - anyjson
-  - eventlet
-  - greenlet
   - httplib2
   - jsonrpclib
   - keystonemiddleware
   - sqlalchemy
-  - webob
   - alembic
+  - retrying
   - oslo-db
   - oslo-messaging
   - oslo-rootwrap
-- name: swift
-  repo: upstream:openstack/swift
-  ref: 2e8261a4dc0d0af0c4a46478b81e167bcf02220b
-  unpetrify-ref: 2.2.0
-  build-depends:
-  - dnspython
-  - eventlet
-  - greenlet
-  - netifaces
-  - pastedeploy
-  - python-xattr
+  - oslo-concurrency
+  - oslo-context
+  - oslo-log
+  - oslo-middleware
 - name: wsgiref
   repo: upstream:python-packages/wsgiref.git
   ref: e8360785eef259394e13b2062407edc3c2cbc1e0
   unpetrify-ref: baserock/master
+  build-system: python-distutils
 - name: rfc3986
   repo: upstream:python-packages/python-rfc3986.git
   ref: 9817ec3e47bca8fba9a7cac56d785e9d644f7473
   unpetrify-ref: rfc3986-0.2.0
+  build-system: python-distutils
 - name: urwid
   repo: upstream:python-packages/urwid
   ref: 838839f7a300a774240d52f943aafd6ff44b2413
   unpetrify-ref: release-1.3.0
+  build-system: python-distutils
 - name: configshell-fb
   repo: upstream:python-packages/configshell-fb
   ref: 8c151ccdd75956da60b2304417c41a60a2c28231
   unpetrify-ref: v1.1.fb17
+  build-system: python-distutils
 - name: targetcli-fb
   repo: upstream:python-packages/targetcli
   ref: c62610f3c2da6b4d364028c18bcc7f0d3da54477
   unpetrify-ref: v2.1.fb39
+  build-system: python-distutils
   build-depends:
   - configshell-fb
   - rtslib-fb
@@ -621,6 +584,7 @@ chunks:
   repo: upstream:sysfsutils
   ref: 237bf36e664db92f95b75067bf0f246726993254
   unpetrify-ref: sysfsutils-2_1_0
+  build-system: autotools
 - name: open-iscsi
   morph: strata/openstack-services/open-iscsi.morph
   repo: upstream:open-iscsi
@@ -629,165 +593,160 @@ chunks:
 - name: nova
   morph: strata/openstack-services/nova.morph
   repo: upstream:openstack/nova
-  ref: ba25e9ea6d0d42dd3b78cc6440710fd9362ae1b5
-  unpetrify-ref: 2014.2.1
+  ref: 8397b6464af520903f546ce4c6d51a2eb5b4c8a8
+  unpetrify-ref: 2015.1.0
   build-depends:
   - sqlalchemy
-  - anyjson
-  - boto
-  - python-decorator
-  - eventlet
   - keystonemiddleware
-  - kombu
   - routes
-  - webob
-  - greenlet
-  - pastedeploy
   - paste
   - sqlalchemy-migrate
-  - suds
-  - posix-ipc-tarball
   - websockify
-  - wsgiref
   - oslo-db
   - oslo-rootwrap
-  - pycadf
   - oslo-messaging
-  - lockfile
   - rfc3986
-  - oslo-vmware
+  - oslo-concurrency
+  - oslo-context
+  - oslo-log
+  - oslo-messaging
 - name: cinder
   morph: strata/openstack-services/cinder.morph
   repo: upstream:openstack/cinder
-  ref: b48aee211ad9b2571c8554dd162b37b8a8d80a42
-  unpetrify-ref: 2014.2.1
+  ref: 5987bb2290f629e59b0bcced2f8fe22cdeb9cc6d
+  unpetrify-ref: 2015.1.0
   build-depends:
   - anyjson
-  - eventlet
-  - greenlet
   - keystonemiddleware
   - kombu
+  - oslo-concurrency
+  - oslo-context
   - oslo-db
+  - oslo-log
   - oslo-messaging
+  - oslo-middleware
   - oslo-rootwrap
   - osprofiler
   - paste
-  - pastedeploy
+  - retrying
   - routes
   - taskflow
   - rtslib-fb
   - sqlalchemy
   - sqlalchemy-migrate
   - suds
-  - webob
-  - wsgiref
-- name: kazoo
-  repo: upstream:python-packages/kazoo.git
-  ref: 93a718ea4c20df797766742c3d74de281613c651
-  unpretrify-ref: 2.0
+  - oslo-vmware
 - name: pymemcache
-  repo: upstream:python-packages/pymemcache.git
-  ref: 3824d3b0bcdea3e8d0c08598bedfce10fd3c79e0
-  unpetrify-ref: master
-  build-depends:
-  - nose
-- name: zake
-  repo: upstream:python-packages/zake.git
-  ref: 13b92d9db4ad37d9550ef5c5abd323a2530a1e72
-  unpetrify-ref: master
-  build-depends:
-  - kazoo
-  - testtools
+  repo: upstream:python-packages/pymemcache
+  ref: 0646937c2bfebdb557ec2c01f0e42a9af79ad49d
+  unpetrify-ref: v1.2.9
+  build-system: python-distutils
 - name: sysv_ipc-tarball
   repo: upstream:python-packages/sysv-ipc-tarball.git
   ref: a77e3a63f004e6ee789fa05e4a5bbc333b1529f1
   unpetrify-ref: sysv_ipc-0.6.8
+  build-system: python-distutils
+- name: redis-py
+  repo: upstream:python-packages/redis-py
+  ref: 4d0b0afe9c9a431ed50c3e9fb95a0aa88b1f1038
+  unpetrify-ref: 2.10.3
+  build-system: python-distutils
 - name: tooz
-  repo: upstream:python-packages/tooz.git
-  ref: a90940a506b7c1bf52ef7d2f2ff52204fdcc6221
-  unpetrify-ref: 0.7
+  repo: upstream:python-packages/tooz
+  ref: 8086661f404e61c22f0dd1d07b57a864862a0869
+  unpetrify-ref: 0.13.2
+  build-system: python-distutils
   build-depends:
-  - kazoo
   - pymemcache
-  - zake
-  - sysv_ipc-tarball
   - msgpack-python
   - retrying
+  - redis-py
+- name: kafka-python
+  repo: upstream:python-packages/kafka-python
+  ref: 8675c3e3e620df5ba9fd7e570c554b773429bd78
+  unpetrify-ref: v0.9.3
+  build-system: python-distutils
+- name: werkzeug
+  repo: upstream:python-packages/werkzeug
+  ref: 96e49709d627a7766077cff4c98ebf3cad868ceb
+  unpetrify-ref: v0.10.4
+  build-system: python-distutils
+- name: requests-aws
+  repo: upstream:python-packages/python-requests-aws
+  ref: 48fe401c78eb1b1048cd20e2d26015585a7986cb
+  unpetrify-ref: master
+  build-system: python-distutils
 - name: ceilometer
   repo: upstream:openstack/ceilometer
   morph: strata/openstack-services/ceilometer.morph
-  ref: 1129b7013359bf242a2ea53be9d4faeccfbfac5a
-  unpetrify-ref: 2014.2.1
+  ref: b0447ed8e7bee371bf7095c86e47d717abe89edc
+  unpetrify-ref: 2014.1.0
   build-depends:
+  - retrying
   - alembic
-  - anyjson
   - croniter
-  - eventlet
-  - happybase
   - jsonpath-rw
+  - kafka-python
   - keystonemiddleware
-  - lockfile
   - msgpack-python
+  - oslo-context
   - oslo-db
+  - oslo-concurrency
+  - oslo-policy
   - oslo-rootwrap
-  - oslo-vmware
-  - pastedeploy
   - pecan
   - posix-ipc-tarball
   - oslo-messaging
+  - oslo-middleware
   - pysnmp
   - sqlalchemy
   - sqlalchemy-migrate
   - tooz
-  - webob
+  - werkzeug
   - wsme
+  - requests-aws
 - name: django-openstack-auth
   repo: upstream:openstack/django_openstack_auth
-  ref: e676c88a329af57d6c4f13df54f6e1e06c1f8360
-  unpetrify-ref: 1.1.8
+  ref: 0e1f7b78277850634992a594132921efb83256e0
+  unpetrify-ref: 1.2.0
+  build-system: python-distutils
+- name: pint
+  repo: upstream:python-packages/pint
+  ref: e7e7de5ca2e1c19963be8a918369fb19186f9a73
+  unpetrify-ref: 0.6
+  build-system: python-distutils
 - name: horizon
   morph: strata/openstack-services/horizon.morph
   repo: upstream:openstack/horizon
-  ref: 3d9a31e2a05288e9a48a51eb4fe693c42e92aac7
-  unpetrify-ref: 2014.2.1
+  ref: b99cf48ff346494198fb9740495eacc14fa406bf
+  unpetrify-ref: 2015.1.0
   build-depends:
+  - pint
   - django-openstack-auth
-  - lockfile
+  - kombu
+  - oslo-concurrency
 - name: novnc
   morph: strata/openstack-services/novnc.morph
   repo: upstream:novnc
-  ref: fc00821eba469641c6c94706726c3d78e46460a2
-  unpetrify-ref: v0.5.1
-- name: oauth
-  repo: upstream:python-packages/oauthlib
-  ref: fd239fca84644896b1971cf24bc6213d065adb86
-  unpetrify-ref: 0.072
+  ref: 97be997f62d59c028fc45323b00e3b93fafe4eb4
+  unpetrify-ref: baserock/v0.5.1
 - name: pyserial
   repo: upstream:python-packages/pyserial
   ref: bcfc1ec2fdb9a8c9c867481d7673e85fe512e667
   unpetrify-ref: release2_7
-- name: testresources
-  repo: upstream:python-packages/testresources
-  ref: ef938bcce0e436f9e9ffef932a898dc248a1d6ea
-  unpetrify-ref: 0.2.7
-  build-depends:
-  - testtools
-  - fixtures
-  - check
-  - cppunit
-- name: mox3
-  repo: upstream:python-packages/pymox
-  ref: 444fa40f4edb529efbffa2da8dbd97e9b8564b5c
-  unpetrify-ref: master
-- name: mocker
-  repo: upstream:python-packages/mocker
-  ref: f7f87e4ac1c52342162cf2035f5fe3d273f8b07f
-  unpetrify-ref: master
+  build-system: python-distutils
+- name: tempest-lib
+  repo: upstream:openstack/tempest-lib
+  ref: c307ffc525d896e2071319c8067aec805804f92b
+  unpetrify-ref: 0.5.0
+  build-system: python-distutils
 - name: tempest
   morph: strata/openstack-services/tempest.morph
-  repo: upstream:openstack/tempest.git
-  ref: acba5510785258949679304f3e1a55e53b851962
-  unpetrify-ref: "2"
+  repo: upstream:openstack/tempest
+  ref: 26149b612d01ad605e4d0f41a2d67280c8088cda
+  unpetrify-ref: '4'
+  build-depends:
+  - tempest-lib
 - name: tftp-hpa
   morph: strata/openstack-services/tftp-hpa.morph
   repo: upstream:tftp-hpa
@@ -798,7 +757,7 @@ chunks:
   repo: upstream:python-packages/singledispatch
   ref: 92175ba65602a03086d2b1f770f45d88af93fc3e
   unpetrify-ref: 3.4.0.3
-- name: pysinglefile
+- name: pysendfile
   morph: strata/openstack-services/pysendfile.morph
   repo: upstream:python-packages/pysendfile
   ref: 6775b2938ef74255239c8e08458369921297b311
@@ -806,5 +765,22 @@ chunks:
 - name: ironic
   morph: strata/openstack-services/ironic.morph
   repo: upstream:openstack/ironic
-  ref: 0f4d454bf2093d3d62460f88aa9288bee3286b38
-  unpetrify-ref: stable/juno
+  ref: dee609cb7976e9b3cc07c3d342a271c4a347f69f
+  unpetrify-ref: 2015.1.0
+  build-depends:
+  - sqlalchemy
+  - alembic
+  - sqlalchemy-migrate
+  - pysendfile
+  - websockify
+  - oslo-concurrency
+  - oslo-context
+  - oslo-db
+  - oslo-rootwrap
+  - oslo-policy
+  - pecan
+  - wsme
+  - keystonemiddleware
+  - oslo-messaging
+  - retrying
+  - posix-ipc-tarball
diff --git a/strata/openstack-services/cinder.morph b/strata/openstack-services/cinder.morph
index cd680b09..a0fc879f 100644
--- a/strata/openstack-services/cinder.morph
+++ b/strata/openstack-services/cinder.morph
@@ -2,7 +2,10 @@ name: cinder
 kind: chunk
 build-system: python-distutils
 post-install-commands:
-# Install rootwrap.conf
+# Install some default configuration files
+- install -D -m 644 etc/cinder/logging_sample.conf "$DESTDIR"/etc/cinder/logging.conf
+- install -D -m 644 etc/cinder/api-paste.ini "$DESTDIR"/etc/cinder/api-paste.ini
+- install -D -m 644 etc/cinder/policy.json "$DESTDIR"/etc/cinder/policy.json
 - install -D -m 640 etc/cinder/rootwrap.conf "$DESTDIR"/etc/cinder/rootwrap.conf
 # Move rootwrap files to a proper location
 - mkdir -p "$DESTDIR"/etc/cinder/rootwrap.d
diff --git a/strata/erlang/erlang-sd_notify.morph b/strata/openstack-services/erlang-sd_notify.morph
index dd3f66ca..dd3f66ca 100644
--- a/strata/erlang/erlang-sd_notify.morph
+++ b/strata/openstack-services/erlang-sd_notify.morph
diff --git a/strata/openstack-services/glance.morph b/strata/openstack-services/glance.morph
new file mode 100644
index 00000000..3f81a505
--- /dev/null
+++ b/strata/openstack-services/glance.morph
@@ -0,0 +1,29 @@
+name: glance
+kind: chunk
+build-system: python-distutils
+post-install-commands:
+# Install some default configuration files
+- mkdir -p "$DESTDIR"/etc/glance
+- install -m 644 etc/glance-api-paste.ini "$DESTDIR"/etc/glance/
+- install -m 644 etc/glance-registry-paste.ini "$DESTDIR"/etc/glance/
+- install -m 644 etc/glance-search-paste.ini "$DESTDIR"/etc/glance/
+- install -m 644 etc/policy.json "$DESTDIR"/etc/glance/
+- install -m 644 etc/schema-image.json "$DESTDIR"/etc/glance/
+- install -m 644 etc/search-policy.json "$DESTDIR"/etc/glance/
+# Install predefined namespaces for Glance Metadata Definitions
+# Catalog (see more info in its README)
+- cp -r etc/metadefs "$DESTDIR"/etc/glance/
+# Install conf files which are not modified by
+- install -m 644 etc/glance-scrubber.conf "$DESTDIR"/etc/glance/
+- install -m 644 etc/glance-cache.conf "$DESTDIR"/etc/glance/
+- install -m 644 etc/glance-search.conf "$DESTDIR"/etc/glance/
+- |
+  install -m 644 etc/glance-swift.conf.sample \
+                 "$DESTDIR"/etc/glance/glance-swift.conf
+- install -m 644 etc/glance-manage.conf "$DESTDIR"/etc/glance/
+- |
+  install -m 644 etc/property-protections-policies.conf.sample \
+                 "$DESTDIR"/etc/glance/property-protections-policies.conf
+- |
+  install -m 644 etc/property-protections-roles.conf.sample \
+                 "$DESTDIR"/etc/glance/property-protections-roles.conf
diff --git a/strata/openstack-services/horizon.morph b/strata/openstack-services/horizon.morph
index ae6399b1..74930a1e 100644
--- a/strata/openstack-services/horizon.morph
+++ b/strata/openstack-services/horizon.morph
@@ -4,16 +4,12 @@ configure-commands:
 # Remove unnecessary .mo files they will be generated
 # later during package build.
 - find . -name "django*.mo" -exec rm -f '{}' \;
-# Set COMPRESS_OFFLINE=True
-- |
-  sed -i 's:COMPRESS_OFFLINE.=.False:COMPRESS_OFFLINE = True:' \
-         openstack_dashboard/settings.py
 build-commands:
 # Compile message strings
-- cd horizon && django-admin.py compilemessages && cd ..
-- cd openstack_dashboard && django-admin.py compilemessages && cd ..
+- cd horizon && django-admin.py compilemessages
+- cd openstack_dashboard && django-admin.py compilemessages
 - python setup.py build
-post-build-commands:
+
 # Use the local_settings.py example to compile and compress the css, js, etc files.
 # This is a hack to make SECRET_KEY work.
 - |
@@ -23,37 +19,45 @@ post-build-commands:
 - python manage.py collectstatic --noinput
 - python manage.py compress --force
 install-commands:
-# Undo hack
+# Install horizon in a temporary folder first, and then move things to the
+# right place in $DESTDIR
+- mkdir temproot
+- python setup.py install -O1 --skip-build --prefix "$PREFIX" --root temproot
+# Remove unnecessary .po files
+- find temproot -name django.po -exec rm '{}' \;
+- find temproot -name djangojs.po -exec rm '{}' \;
+
+# Move openstack_dashboard to /var/lib/horizon
+- mkdir -p "$DESTDIR"/var/lib/horizon/
+- |
+  mv temproot/"$PREFIX"/lib/python*/site-packages/openstack_dashboard \
+      "$DESTDIR"/var/lib/horizon/
+- cp manage.py "$DESTDIR"/var/lib/horizon/openstack_dashboard/
+
+# Copy the rest to $DESTDIR
+- cp -a temproot/* "$DESTDIR"
+
+# Copy local_settings to /etc/horizon/openstack_dashboard, so that they
+# can be modified, and link them where openstack_dashboard is installed.
+- mkdir -p "$DESTDIR"/etc/horizon/openstack_dashboard/
 - |
   cp openstack_dashboard/local/local_settings.py.example \
-     openstack_dashboard/local/local_settings.py
-# Install horizon
-- python setup.py install -O1 --skip-build --prefix "$PREFIX" --root "$DESTDIR"
-post-install-commands:
-# Remove unnecessary .po files
-- find "$DESTDIR" -name django.po -exec rm '{}' \;
-- find "$DESTDIR" -name djangojs.po -exec rm '{}' \;
-# Link Openstack local_settings where openstack_dashboard is installed.
+      "$DESTDIR"/etc/horizon/openstack_dashboard/local_settings.py
+# Set COMPRESS_OFFLINE=True
+- |
+  echo "COMPRESS_OFFLINE=True" >> \
+    "$DESTDIR"/etc/horizon/openstack_dashboard/local_settings.py
+
 - mkdir -p "$DESTDIR"/var/lib/horizon/openstack_dashboard/local
 - |
   ln -sf /etc/horizon/openstack_dashboard/local_settings.py \
-         "$DESTDIR$PREFIX"/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py
+         "$DESTDIR"/var/lib/horizon/openstack_dashboard/local/local_settings.py
+
 # Create the static directory (STATIC_ROOT) used in local_settings.py to keep
 # the static objects like css files.
-- mkdir -p "$DESTDIR"/var/lib/horizon/openstack_dashboard/static
+- mkdir -p "$DESTDIR"/var/lib/horizon/static
 # Copy the compressed static files to horizon.
-- cp -a openstack_dashboard/static/* "$DESTDIR"/var/lib/horizon/openstack_dashboard/static
-- cp -a horizon/static/* "$DESTDIR"/var/lib/horizon/openstack_dashboard/static
-- cp -a static/* "$DESTDIR"/var/lib/horizon/openstack_dashboard/static
-# Work around to make django.wsgi working with horizon
-# See: https://bugs.launchpad.net/osprofiler/+bug/1361235
-# and: https://git.openstack.org/cgit/openstack/tripleo-image-elements/commit/?id=41c9a1dfad23f8aee366afb6a0b20a6c57ec8f79
-- |
-  sed -i "s|'../..'|os.path.realpath('../..')|" \
-      "$DESTDIR$PREFIX"/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi
-# And link this django.wsgi file to the horizon home directory
-- |
-  ln -sf "$PREFIX"/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi \
-         "$DESTDIR"/var/lib/horizon/openstack_dashboard/django.wsgi
+- cp -a static/* "$DESTDIR"/var/lib/horizon/static
+
 # Create the horizon document root for apache configuration
 - mkdir -p "$DESTDIR"/var/lib/horizon/.blackhole
diff --git a/strata/openstack-services/ironic.morph b/strata/openstack-services/ironic.morph
index 850399b4..8003dd17 100644
--- a/strata/openstack-services/ironic.morph
+++ b/strata/openstack-services/ironic.morph
@@ -2,14 +2,15 @@ name: ironic
 kind: chunk
 build-system: python-distutils
 post-install-commands:
-# Install rootwrap.conf
-- install -D -m 640 etc/ironic/rootwrap.conf "$DESTDIR"/etc/ironic/rootwrap.conf
-# Move rootwrap files to a proper location
-- mkdir -p "$DESTDIR"/etc/ironic/rootwrap.d
-- install -m 644 etc/ironic/rootwrap.d/* "$DESTDIR"/etc/ironic/rootwrap.d/
-# Add ironic to sudoers controlling which commands will run as a root
-# using the openstack rootwrap.
 - |
+  mkdir -p "$DESTDIR"/etc/ironic
+  install -m 644 etc/ironic/policy.json "$DESTDIR"/etc/ironic
+  install -m 644 etc/ironic/rootwrap.conf "$DESTDIR"/etc/ironic
+  mkdir -p "$DESTDIR"/etc/ironic/rootwrap.d
+  install -m 644 etc/ironic/rootwrap.d/* "$DESTDIR"/etc/ironic/rootwrap.d/
+
+  # Add ironic to sudoers controlling which commands will run as a root
+  # using the openstack rootwrap.
   install -D -m 0440 /proc/self/fd/0 <<'EOF' "$DESTDIR"/etc/sudoers.d/ironic-rootwrap
   Defaults:ironic !requiretty
 
diff --git a/strata/openstack-services/keystone.morph b/strata/openstack-services/keystone.morph
new file mode 100644
index 00000000..836b5d47
--- /dev/null
+++ b/strata/openstack-services/keystone.morph
@@ -0,0 +1,9 @@
+name: keystone
+kind: chunk
+build-system: python-distutils
+post-install-commands:
+# Install some default configuration files
+- mkdir -p "$DESTDIR"/etc/keystone
+- install -m 644 etc/keystone-paste.ini "$DESTDIR"/etc/keystone/
+- install -m 644 etc/policy.json "$DESTDIR"/etc/keystone/
+- install -m 644 etc/logging.conf.sample "$DESTDIR"/etc/keystone/logging.conf
diff --git a/strata/openstack-services/neutron.morph b/strata/openstack-services/neutron.morph
index b79a089b..6e203922 100644
--- a/strata/openstack-services/neutron.morph
+++ b/strata/openstack-services/neutron.morph
@@ -2,14 +2,24 @@ name: neutron
 kind: chunk
 build-system: python-distutils
 post-install-commands:
-# Move rootwrap files to a proper location
-- mkdir -p "$DESTDIR"/etc/neutron
-- mv "$DESTDIR$PREFIX"/etc/neutron/rootwrap.d "$DESTDIR"/etc/neutron/
-- mv "$DESTDIR$PREFIX"/etc/neutron/rootwrap.conf "$DESTDIR"/etc/neutron/
-# Add neutron to sudoers controlling which commands is running as a root
-# using the openstack rootwrap.
-- mkdir -p "$DESTDIR"/etc/sudoers.d
 - |
+  # Move the configuration files to a proper location
+  mkdir "$DESTDIR"/etc
+  mv "$DESTDIR/$PREFIX"/etc/neutron "$DESTDIR"/etc
+
+  # Remove unused start/stop script
+  rm "$DESTDIR/$PREFIX"/etc/init.d/neutron-server
+
+  # Remove configuration files which will be added by Ansible
+  rm "$DESTDIR"/etc/neutron/neutron.conf
+  rm "$DESTDIR"/etc/neutron/metadata_agent.ini
+  rm "$DESTDIR"/etc/neutron/plugins/ml2/ml2_conf.ini
+  rm "$DESTDIR"/etc/neutron/dhcp_agent.ini
+  rm "$DESTDIR"/etc/neutron/l3_agent.ini
+
+  # Add neutron to sudoers controlling which commands is running as a
+  # root using the openstack rootwrap.
+  mkdir -p "$DESTDIR"/etc/sudoers.d
   install -D -m 0440 /proc/self/fd/0 <<'EOF' "$DESTDIR"/etc/sudoers.d/neutron-rootwrap
   Defaults:neutron !requiretty
 
diff --git a/strata/openstack-services/nova.morph b/strata/openstack-services/nova.morph
index bb6dd756..e5a87daf 100644
--- a/strata/openstack-services/nova.morph
+++ b/strata/openstack-services/nova.morph
@@ -2,11 +2,17 @@ name: nova
 kind: chunk
 build-system: python-distutils
 post-install-commands:
+# Install some default configuration files
+- mkdir -p "$DESTDIR"/etc/nova
+- install -m 644 etc/nova/api-paste.ini "$DESTDIR"/etc/nova/
+- install -m 644 etc/nova/cells.json "$DESTDIR"/etc/nova/
+- install -m 644 etc/nova/logging_sample.conf "$DESTDIR"/etc/nova/logging.conf
+- install -m 644 etc/nova/policy.json "$DESTDIR"/etc/nova/
 # Install rootwrap.conf
-- install -D -m 640 etc/nova/rootwrap.conf "$DESTDIR"/etc/nova/rootwrap.conf
+- install -m 640 etc/nova/rootwrap.conf "$DESTDIR"/etc/nova/rootwrap.conf
 # Move rootwrap files to a proper location
 - mkdir -p "$DESTDIR"/etc/nova/rootwrap.d
-- install -D -m 644 etc/nova/rootwrap.d/* "$DESTDIR"/etc/nova/rootwrap.d/
+- install -m 644 etc/nova/rootwrap.d/* "$DESTDIR"/etc/nova/rootwrap.d/
 # Add nova to sudoers controlling which commands will run as a root
 # using the openstack rootwrap.
 - mkdir -p "$DESTDIR"/etc/sudoers.d
diff --git a/strata/openstack-services/open-iscsi.morph b/strata/openstack-services/open-iscsi.morph
index 9d135ab2..6a0b73b3 100644
--- a/strata/openstack-services/open-iscsi.morph
+++ b/strata/openstack-services/open-iscsi.morph
@@ -6,7 +6,8 @@ install-commands:
 # Rewrite prefix and exec_prefix which are set to "/usr" and "/" respectively
 - make prefix="$PREFIX" exec_prefix="$PREFIX" DESTDIR="$DESTDIR" install
 # Install iscsistart app which is not listed by default in PROGRAMS
-- make prefix="$PREFIX" exec_prefix="$PREFIX" DESTDIR="$DESTDIR" PROGRAMS="usr/iscsistart" install
+- make prefix="$PREFIX" exec_prefix="$PREFIX" DESTDIR="$DESTDIR" PROGRAMS="usr/iscsistart"
+  install
 post-install-commands:
 # Configure iscsi daemon
 # Point the startup to the installed binary
diff --git a/strata/openstack-services/python-xattr.morph b/strata/openstack-services/python-xattr.morph
deleted file mode 100644
index 7916bbf2..00000000
--- a/strata/openstack-services/python-xattr.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: python-xattr
-kind: chunk
-configure-commands:
-- cp -r /usr/lib/python2.7/site-packages/cffi .
-build-commands:
-- python setup.py build
-install-commands:
-- python setup.py install --prefix "$PREFIX" --root "$DESTDIR"
diff --git a/strata/openstack-services/tempest.morph b/strata/openstack-services/tempest.morph
index da42c929..cffb7d33 100644
--- a/strata/openstack-services/tempest.morph
+++ b/strata/openstack-services/tempest.morph
@@ -2,10 +2,11 @@ name: tempest
 kind: chunk
 build-system: python-distutils
 post-install-commands:
+# Install files and folders required to run tempest
 - mkdir -p "$DESTDIR"/etc/tempest
-
-# Tempest is not supposed to be installed, just cloned and used from the clone,
-# that's why we copy all the contents of the repository here, given that we
-# don't know yet what things we can avoid copying.
-- cp -R * "$DESTDIR"/etc/tempest
-- cp .testr.conf "$DESTDIR"/etc/tempest
+- cp -r tempest "$DESTDIR"/etc/tempest/
+- cp -r tools "$DESTDIR"/etc/tempest/
+- cp setup.py tox.ini "$DESTDIR"/etc/tempest/
+- cp run_tests.sh run_tempest.sh "$DESTDIR"/etc/tempest/
+- cp .testr.conf "$DESTDIR"/etc/tempest/
+- cp etc/logging.conf.sample "$DESTDIR"/etc/tempest/logging.conf
diff --git a/strata/ostree-core.morph b/strata/ostree-core.morph
index 5052bf4b..fffcc203 100644
--- a/strata/ostree-core.morph
+++ b/strata/ostree-core.morph
@@ -1,7 +1,6 @@
 name: ostree-core
 kind: stratum
 build-depends:
-- morph: strata/foundation.morph
 - morph: strata/core.morph
 - morph: strata/libsoup-common.morph
 chunks:
@@ -9,9 +8,11 @@ chunks:
   repo: upstream:libgsystem
   ref: 8231b8ad4a4ee35e4b11fae5f6e7cddabf1c51ae
   unpetrify-ref: master
+  build-system: autotools
 - name: ostree
   repo: upstream:ostree
   ref: c9704e9802dfeda9b5a138535c59e98df3dd7196
   unpetrify-ref: baserock/morph
+  build-system: autotools
   build-depends:
   - libgsystem
diff --git a/strata/pcre-utils.morph b/strata/pcre-utils.morph
index 8d0c2489..6d2b4a0f 100644
--- a/strata/pcre-utils.morph
+++ b/strata/pcre-utils.morph
@@ -7,3 +7,4 @@ chunks:
   repo: upstream:pcre
   ref: 2720152c58e13e7cc7403642ec33127101b9971b
   unpetrify-ref: baserock/morph
+  build-system: autotools
diff --git a/strata/python-cliapp.morph b/strata/python-cliapp.morph
index 495a6a2e..fa5084e1 100644
--- a/strata/python-cliapp.morph
+++ b/strata/python-cliapp.morph
@@ -14,11 +14,13 @@ chunks:
   repo: upstream:python-coverage-test-runner
   ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7
   unpetrify-ref: baserock/morph
+  build-system: python-distutils
   build-depends:
   - python-coveragepy
 - name: cliapp
   repo: upstream:cliapp
   ref: cec20cedd062a3aef1b04f997e77b45090c07806
   unpetrify-ref: baserock/morph
+  build-system: python-distutils
   build-depends:
   - python-coverage-test-runner
diff --git a/strata/python-common.morph b/strata/python-common.morph
index 96d65330..961a0a19 100644
--- a/strata/python-common.morph
+++ b/strata/python-common.morph
@@ -13,10 +13,12 @@ chunks:
   repo: upstream:python-packages/ecdsa
   ref: 36e9cfa80fcf8b53119adc787e54a5892ec1eb2c
   unpetrify-ref: python-ecdsa-0.11
+  build-system: python-distutils
 - name: paramiko
   repo: upstream:paramiko
   ref: 424ba615c2a94d3b059e7f24db1a1093a92d8d22
   unpetrify-ref: v1.15.2
+  build-system: python-distutils
   build-depends:
   - pycrypto
   - ecdsa
@@ -24,27 +26,63 @@ chunks:
   repo: upstream:markupsafe
   ref: feb1d70c16df62f60dcb521d127fdad8819fc036
   unpetrify-ref: 0.23
+  build-system: python-distutils
 - name: jinja2
   repo: upstream:jinja2
   ref: 762c612e7276889aac265645da00e62e33d1573c
   unpetrify-ref: 2.7.3
+  build-system: python-distutils
   build-depends:
   - markupsafe
 - name: python-json-pointer
   repo: upstream:python-json-pointer
   ref: 34073e561261cb413b9bdff5beac31b070d98ea2
   unpetrify-ref: v1.4
+  build-system: python-distutils
 - name: python-json-patch
   repo: upstream:python-json-patch
   ref: e4da658a5dc9f68d3386017ffdcc8e07d22b51a3
   unpetrify-ref: v1.8
+  build-system: python-distutils
   build-depends:
   - python-json-pointer
 - name: python-prettytable
   repo: upstream:python-prettytable
-  ref: 7a48f1e84049577370cf28632a75d2fd01e4142d
-  unpetrify-ref: master
+  ref: bea6a50e4da00074b35b57232771cea58b89b3e0
+  unpetrify-ref: 0.7.2-RELEASE
+  build-system: python-distutils
 - name: configobj
   repo: upstream:configobj-git
   ref: 9d2aab01c77dce600b296ba9da1163cc0bbc14e0
   unpetrify-ref: v5.0.6
+  build-system: python-distutils
+- name: python-mimeparse
+  repo: upstream:python-packages/python-mimeparse.git
+  ref: 2d600d3fc4a386af69d20fba433843b4df2b3c92
+  unpetrify-ref: master
+  build-system: python-distutils
+- name: kazoo
+  repo: upstream:python-packages/kazoo.git
+  ref: 93a718ea4c20df797766742c3d74de281613c651
+  unpretrify-ref: 2.0
+  build-system: python-distutils
+- name: webob
+  repo: upstream:python-packages/webob
+  ref: ae0ac90f22f9e1ff351e445f92330efd89195f51
+  unpetrify-ref: 1.4
+  build-system: python-distutils
+- name: python-decorator
+  repo: upstream:python-packages/python-decorator
+  ref: b02f7a254c3679dfac57a824e08dd02ced850636
+  unpetrify-ref: decorator-3.4.0
+  build-system: python-distutils
+- name: networkx
+  repo: upstream:python-packages/networkx
+  ref: 8ac796aba866ade1a56b83e30f25ed392ca3512c
+  unpetrify-ref: networkx-1.9.1
+  build-system: python-distutils
+- name: boto
+  repo: upstream:boto
+  ref: 2517f660f8ef9012708d46da3a36ab967993d2f6
+  unpetrify-ref: 2.33.0
+  build-system: python-distutils
diff --git a/strata/python-core.morph b/strata/python-core.morph
index dbd0891d..b78e0835 100644
--- a/strata/python-core.morph
+++ b/strata/python-core.morph
@@ -13,28 +13,33 @@ chunks:
   repo: upstream:python-packages/mako.git
   ref: 285bc818a50ccc0f9549630f7c4f4c250585c3e7
   unpetrify-ref: rel_1_0_0
+  build-system: python-distutils
   build-depends:
   - python-setuptools
 - name: pip
   repo: upstream:pip
   ref: ea680f204fb0e48789710c22c8f597a9bf01bc16
   unpetrify-ref: baserock/master
+  build-system: python-distutils
   build-depends:
   - python-setuptools
 - name: pbr
   repo: upstream:pbr
   ref: aef4f7ef4faec987d553d1ca40b55951235af0b1
   unpetrify-ref: 0.10.7
+  build-system: python-distutils
   build-depends:
   - pip
 - name: python-requests
   repo: upstream:python-requests
   ref: b83131779c701720a9ae9efae78996277d416269
   unpetrify-ref: v2.5.1
+  build-system: python-distutils
 - name: six
   repo: upstream:six
   ref: 8cfbff6b764af86d825086fa1637aa009e90d75a
   unpetrify-ref: 1.9.0
+  build-system: python-distutils
 - name: pyyaml
   morph: strata/python-core/pyyaml.morph
   repo: upstream:pyyaml
@@ -46,3 +51,9 @@ chunks:
   repo: upstream:python-lxml
   ref: 14505bc62f5f1fc9fb0ff007955f3e67ab4562bb
   unpetrify-ref: lxml-3.4.0
+  build-system: python-distutils
+- name: python-markdown
+  repo: upstream:python-markdown
+  ref: f0c5b71acbc02af60a33d67c59558bb513b25e74
+  unpetrify-ref: 2.5.1-final
+  build-system: python-distutils
diff --git a/strata/python-pygobject.morph b/strata/python-pygobject.morph
index 39f74f6d..53e9fd72 100644
--- a/strata/python-pygobject.morph
+++ b/strata/python-pygobject.morph
@@ -4,6 +4,7 @@ description: |
   Python GObject bindings
 build-depends:
 - morph: strata/core.morph
+- morph: strata/glib-common.morph
 chunks:
 - name: pygobject
   morph: strata/python-pygobject/pygobject.morph
diff --git a/strata/python-tools.morph b/strata/python-tools.morph
index e84a0691..bc466755 100644
--- a/strata/python-tools.morph
+++ b/strata/python-tools.morph
@@ -1,7 +1,7 @@
 name: python-tools
 kind: stratum
-description: "A stratum for non-essential python tools:
-useful python tools that we don't want to include in core."
+description: |
+  A stratum for useful python tools that we don't want to include in core.
 build-depends:
 - morph: strata/python-core.morph
 chunks:
@@ -10,16 +10,20 @@ chunks:
   ref: 9205ff46a67130e8835f14bb4f802fd59e7dcf2c
   unpetrify-ref: 12.0.5
 
-## Pylint
+  build-system: python-distutils
+## Pylint - required in openstack-services.morph
 - name: astroid
   repo: upstream:python-packages/astroid
   ref: 194dc114a33b80b4bfbbeb73f36712848f696025
   unpetrify-ref: astroid-1.3.5
+  build-system: python-distutils
 - name: logilab-common
   repo: upstream:python-packages/logilab-common
   ref: d1d8f793af6d015d885b9ea67b5741d5a093e2f4
   unpetrify-ref: logilab-common-version-0.62.0
+  build-system: python-distutils
 - name: pylint
   repo: upstream:python-packages/pylint
   ref: ba998d7a4e5fce0ea3a3e701ff446bbe4ca406b5
   unpetrify-ref: pylint-1.4.2
+  build-system: python-distutils
diff --git a/strata/python-wsgi.morph b/strata/python-wsgi.morph
index 289d27ba..1472dc9b 100644
--- a/strata/python-wsgi.morph
+++ b/strata/python-wsgi.morph
@@ -9,7 +9,9 @@ chunks:
   repo: upstream:bottle
   ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f
   unpetrify-ref: baserock/morph
+  build-system: python-distutils
 - name: flup
   repo: upstream:flup
   ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70
   unpetrify-ref: baserock/morph
+  build-system: python-distutils
diff --git a/strata/python3-core.morph b/strata/python3-core.morph
index 192e9201..f0da65fc 100644
--- a/strata/python3-core.morph
+++ b/strata/python3-core.morph
@@ -7,5 +7,5 @@ chunks:
 - name: python3
   morph: strata/python3-core/python3.morph
   repo: upstream:cpython
-  ref: d1414cefaddc7b56caef75eea87226b1fce5ca7c
-  unpetrify-ref: v3.4.2
+  ref: 3f1e8a3de39ff8a807720d57f49a91d7449435ad
+  unpetrify-ref: v3.4.3
diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph
index 3c6c8812..20473ec2 100644
--- a/strata/qt5-tools-qtmultimedia.morph
+++ b/strata/qt5-tools-qtmultimedia.morph
@@ -9,4 +9,4 @@ chunks:
   morph: strata/qt5-tools/qtmultimedia.morph
   repo: upstream:qt5/qtmultimedia
   ref: a42a5ae6191ecbe317a00d8261bc53e842967052
-  unpetrify-ref: wip/gstreamer-1.0
+  unpetrify-ref: baserock/qt5.4-wip-gstreamer-1.0
diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph
index 53d5a682..bb86d6b5 100644
--- a/strata/qt5-tools-qtwebkit.morph
+++ b/strata/qt5-tools-qtwebkit.morph
@@ -10,7 +10,7 @@ chunks:
   morph: strata/qt5-tools/qtwebkit.morph
   repo: upstream:qt5/qtwebkit
   ref: 586bdc38324dfaeec65389bf7646c82cb35db017
-  unpetrify-ref: "5.4.2"
+  unpetrify-ref: 5.4.2
 - name: qtwebkit-examples
   morph: strata/qt5-tools/qtwebkit-examples.morph
   repo: upstream:qt5/qtwebkit-examples
diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph
index cb9c7c70..7fb8403e 100644
--- a/strata/qt5-tools.morph
+++ b/strata/qt5-tools.morph
@@ -135,8 +135,3 @@ chunks:
   unpetrify-ref: v5.4.0
   build-depends:
   - qtbase
-- name: qtwayland
-  repo: upstream:qt5/qtwayland
-  ref: baserock/genivi-5.4.0-wip
-  build-depends:
-  - qtbase
diff --git a/strata/ruby.morph b/strata/ruby.morph
index eba231be..10eb932e 100644
--- a/strata/ruby.morph
+++ b/strata/ruby.morph
@@ -19,6 +19,7 @@ chunks:
   repo: upstream:libyaml-hg
   ref: 0577078d6625a7bf06e6bc7fb26a43e27400b17e
   unpetrify-ref: master
+  build-system: autotools
 - name: ruby
   morph: strata/ruby/ruby.morph
   repo: upstream:ruby
diff --git a/strata/samba.morph b/strata/samba.morph
new file mode 100644
index 00000000..33dcd856
--- /dev/null
+++ b/strata/samba.morph
@@ -0,0 +1,12 @@
+name: samba
+kind: stratum
+description: Simple samba server
+build-depends:
+- morph: strata/core.morph
+- morph: strata/foundation.morph
+chunks:
+- name: samba
+  morph: strata/samba/samba.morph
+  repo: upstream:samba
+  ref: 704592c14dfedbe98e95d43860d062dc6338bca3
+  unpetrify-ref: master
diff --git a/strata/samba/samba.morph b/strata/samba/samba.morph
new file mode 100644
index 00000000..748ee886
--- /dev/null
+++ b/strata/samba/samba.morph
@@ -0,0 +1,127 @@
+name: samba
+kind: chunk
+configure-commands:
+- |
+  # Here are really really ugly hacks:
+  #
+  # This fixes a problem with ./configure and recent compilers
+  # which implement c9x by default.
+  sed -i "s/#define bool int//" source3/lib/util_sec.c
+  #
+  # This fixes the problem with Baserock build environments running
+  # as root but sandboxed, and preventing certain privileged operations
+  # from taking effect.  eg. seteuid()
+  # Instead, convince it that we're not running as root so that it
+  # doesn't run these tests.
+  sed -i "s/getuid() != 0/1/" source3/lib/util_sec.c
+  #
+  #
+  ./configure \
+    --without-ldap \
+    --disable-gnutls \
+    --without-ad-dc \
+    --without-acl-support \
+    --without-ads \
+    --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var --enable-fhs
+build-commands:
+- make
+install-commands:
+- make install DESTDIR="$DESTDIR"
+# systemd configuration
+- mkdir -p "$DESTDIR/etc/tmpfiles.d"
+- install -m 644 ./packaging/systemd/samba.conf.tmp "$DESTDIR/etc/tmpfiles.d/samba.conf"
+- mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants"
+- |
+  cat <<EOF >"$DESTDIR/lib/systemd/system/nmb.service"
+  [Unit]
+  Description=Samba NMB Daemon
+  After=syslog.target network-online.target
+
+  [Service]
+  Type=forking
+  PIDFile=/var/run/samba/nmbd.pid
+  EnvironmentFile=-/etc/sysconfig/samba
+  ExecStart=$PREFIX/sbin/nmbd \$NMBDOPTIONS
+  ExecReload=$PREFIX/bin/kill -HUP \$MAINPID
+
+  [Install]
+  WantedBy=multi-user.target
+  EOF
+- |
+  cat <<EOF >"$DESTDIR/lib/systemd/system/smb.service"
+  [Unit]
+  Description=Samba SMB Daemon
+  After=syslog.target network-online.target nmb.service winbind.service
+
+  [Service]
+  Type=forking
+  PIDFile=/var/run/samba/smbd.pid
+  EnvironmentFile=-/etc/sysconfig/samba
+  ExecStart=$PREFIX/sbin/smbd \$NMBDOPTIONS
+  ExecReload=$PREFIX/bin/kill -HUP \$MAINPID
+
+  [Install]
+  WantedBy=multi-user.target
+  EOF
+- |
+  cat <<EOF >"$DESTDIR/lib/systemd/system/winbind.service"
+  [Unit]
+  Description=Samba winbind Daemon
+  After=syslog.target network-online.target nmb.service
+
+  [Service]
+  Type=forking
+  PIDFile=/var/run/samba/winbindd.pid
+  EnvironmentFile=-/etc/sysconfig/samba
+  ExecStart=$PREFIX/sbin/winbindd \$NMBDOPTIONS
+  ExecReload=$PREFIX/bin/kill -HUP \$MAINPID
+
+  [Install]
+  WantedBy=multi-user.target
+  EOF
+- |
+  for i in nmb smb winbind
+  do
+    ln -s ../$i.service "$DESTDIR/lib/systemd/system/multi-user.target.wants/$i.service"
+  done
+- mkdir -p "$DESTDIR/var/log/samba"
+# Install a sample configuration
+- mkdir -p "$DESTDIR/etc/samba"
+- |
+  cat <<EOF >"$DESTDIR/etc/samba/smb.conf"
+  [global]
+  workgroup = WORKGROUP
+  dns proxy = no
+  local master = yes
+  preferred master = yes
+  os level = 2
+  log file = /var/log/samba/log.%m
+  max log size = 1000
+  syslog = 0
+  server role = standalone server
+  passdb backend = tdbsam
+  obey pam restrictions = yes
+  unix password sync = yes
+  pam password change = yes
+  map to guest = bad user
+  usershare allow guests = yes
+  [homes]
+  comment = Home Directories
+  browseable = no
+  read only = yes
+  create mask = 0700
+  valid users = %S
+  ;[printers]
+  ;comment = All Printers
+  ;browseable = no
+  ;path = /var/spool/samba
+  ;printable = yes
+  ;guest ok = no
+  ;read only = yes
+  ;create mask = 0700
+  ;[src]
+  ;comment = Source code
+  ;path = /src
+  ;read only = yes
+  ;guest ok = yes
+  EOF
diff --git a/strata/swift.morph b/strata/swift.morph
index 641485b3..41fd0c75 100644
--- a/strata/swift.morph
+++ b/strata/swift.morph
@@ -2,43 +2,52 @@ name: swift
 kind: stratum
 description: Distributed object storage
 build-depends:
-- morph: strata/openstack-common.morph    # for simplejson, cffi
+# openstack-common is required for simplejson, cffi, greenlet,
+# eventlet, pastedeploy, netifaces
+- morph: strata/openstack-common.morph
 chunks:
 - name: dnspython
   repo: upstream:python-packages/dnspython
   ref: e1369c62d14f82b80ef11197a490ace5d43bb3f3
   unpetrify-ref: v1.12.0
-- name: greenlet
-  ref: 42b65a7b67dfabd180625155cd4fcd8e51917fe2
-  unpetrify-ref: 0.4.5
-  repo: upstream:python-packages/greenlet
-- name: eventlet
-  ref: 8d2474197de4827a7bca9c33e71a82573b6fc721
-  unpetrify-ref: v0.15.2
-  repo: upstream:python-packages/eventlet
-  build-depends:
-  - greenlet
-- name: netifaces
-  repo: upstream:python-packages/netifaces
-  ref: 885b200ba717df87f6e8044ec8c66c677c949bcb
-  unpetrify-ref: release_0_10_4
-- name: pastedeploy
-  repo: upstream:python-packages/pastedeploy
-  ref: 5ad87be617c2cc1dd31625688172e964db2756dc
-  unpetrify-ref: 1.5.2
+  build-system: python-distutils
 - name: xattr
   morph: strata/swift/xattr.morph
   repo: upstream:python-packages/xattr
   ref: dd10d44e3eb9a1d2303c1f7d5126c099d56e97fc
   unpetrify-ref: v0.7.6
+- name: liberasurecode
+  morph: strata/swift/liberasurecode.morph
+  repo: upstream:liberasurecode
+  ref: a380246762c16ea8eb7dbfccd50d296c3743b39e
+  unpetrify-ref: v1.0.7
+- name: gf-complete
+  morph: strata/swift/gf-complete.morph
+  repo: upstream:gf-complete
+  ref: 715443661c00558fe32f004a4be5f93f341b6e59
+  unpetrify-ref: v2
+- name: jerasure
+  repo: upstream:jerasure
+  ref: ff7032153ea230fb59596f1f8a0e9ad8653addfb
+  unpetrify-ref: v2
+  build-system: autotools
+  build-depends:
+  - gf-complete
+- name: pyeclib
+  repo: upstream:python-packages/pyeclib
+  ref: aa58aa887c2327e1394d6f28b3b6b7ab8f190b2b
+  unpetrify-ref: v1.0.7
+  build-system: python-distutils
+  build-depends:
+  - liberasurecode
+  - gf-complete
+  - jerasure
 - name: swift
   repo: upstream:openstack/swift
-  ref: 2e8261a4dc0d0af0c4a46478b81e167bcf02220b
-  unpetrify-ref: 2.2.0
+  ref: f8dee761bd36f857aa1288c27e095907032fad68
+  unpetrify-ref: 2.3.0
+  build-system: python-distutils
   build-depends:
   - dnspython
-  - eventlet
-  - greenlet
-  - netifaces
-  - pastedeploy
   - xattr
+  - pyeclib
diff --git a/strata/swift/gf-complete.morph b/strata/swift/gf-complete.morph
new file mode 100644
index 00000000..e8965c76
--- /dev/null
+++ b/strata/swift/gf-complete.morph
@@ -0,0 +1,20 @@
+name: gf-complete
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- ./autogen.sh
+configure-commands:
+- |
+  cpu="$(echo $TARGET | cut -d '-' -f 1)"
+  case "$cpu" in
+  x86_64)
+    SSE=
+    ;;
+  *)
+    # Disable SSE4 for any architecture which are not x86_64 bits
+    # see more information about architecture which support SSE in
+    # https://en.wikipedia.org/wiki/SSE4#Supporting_CPUs.
+    SSE=--disable-sse
+    ;;
+  esac
+  ./configure --prefix="$PREFIX" "$SSE"
diff --git a/strata/swift/liberasurecode.morph b/strata/swift/liberasurecode.morph
new file mode 100644
index 00000000..68839403
--- /dev/null
+++ b/strata/swift/liberasurecode.morph
@@ -0,0 +1,5 @@
+name: liberasurecode
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- autoreconf -ivf
diff --git a/strata/test-tools.morph b/strata/test-tools.morph
new file mode 100644
index 00000000..49d53972
--- /dev/null
+++ b/strata/test-tools.morph
@@ -0,0 +1,133 @@
+name: test-tools
+kind: stratum
+description: Tools and frameworks used for testing
+build-depends:
+- morph: strata/python-common.morph
+chunks:
+- name: python-test-extras
+  repo: upstream:python-packages/python-test-extras.git
+  ref: cdeb596f01241e9c779332e86f6edcd0c2e8e9f0
+  unpetrify-ref: master
+  build-system: python-distutils
+- name: check
+  repo: upstream:check
+  ref: 8c872aca6675e95fa47e7514e28fbdf25fce6170
+  unpetrify-ref: 0.9.8
+  build-system: autotools
+- name: cppunit
+  repo: upstream:cppunit
+  ref: 8133cf2b977f013216f0a41b6fcb740410d83926
+  unpetrify-ref: 1.13.2
+  build-system: autotools
+- name: testtools
+  repo: upstream:python-packages/testtools
+  ref: ee9946228ce5a03a84cf146027de0a8a9a46c4fe
+  unpetrify-ref: testools-1.1.0
+  build-system: python-distutils
+  build-depends:
+  - python-test-extras
+- name: subunit
+  morph: strata/test-tools/subunit.morph
+  repo: upstream:python-packages/subunit
+  ref: e18ffe65a3229d5c1d91be988405d40219db0887
+  unpetrify-ref: 0.0.21
+  build-depends:
+  - python-test-extras
+  - testtools
+  - check
+  - cppunit
+- name: fixtures
+  repo: upstream:python-packages/fixtures
+  ref: 9f9d89ce718463b24cd3910b9a99efb60b3c9e1b
+  unpetrify-ref: 0.3.16
+  build-system: python-distutils
+  build-depends:
+  - testtools
+- name: testrepository
+  repo: upstream:python-packages/testrepository
+  ref: 6419a3dcaabaf09eaf438c6d8d85c90eba7a2b91
+  unpetrify-ref: 0.0.19
+  build-system: python-distutils
+  build-depends:
+  - fixtures
+  - subunit
+  - testtools
+- name: testscenarios
+  repo: upstream:python-packages/testscenarios
+  ref: bccfaa71a2def5590161b6d1a247cf23c45a8b4d
+  unpetrify-ref: trunk
+  build-system: python-distutils
+  build-depends:
+  - testtools
+- name: mox
+  repo: upstream:python-packages/mox
+  ref: 160491d0384285698d726b1af21277f336107f51
+  unpetrify-ref: master
+  build-system: python-distutils
+- name: mock
+  repo: upstream:python-packages/mock
+  ref: 35b35f7ad239005a950f870af57b44dbdc99d66b
+  unpetrify-ref: master
+  build-system: python-distutils
+- name: oslotest
+  repo: upstream:openstack/oslotest
+  ref: cfdb562a6e07728570ca624a8c4faf3f5b61423b
+  unpetrify-ref: 1.2.0
+  build-system: python-distutils
+  build-depends:
+  - fixtures
+  - subunit
+  - testrepository
+  - testscenarios
+  - testtools
+  - mock
+  - mox
+- name: mox3
+  repo: upstream:python-packages/pymox
+  ref: 444fa40f4edb529efbffa2da8dbd97e9b8564b5c
+  unpetrify-ref: master
+  build-system: python-distutils
+- name: mocker
+  repo: upstream:python-packages/mocker
+  ref: f7f87e4ac1c52342162cf2035f5fe3d273f8b07f
+  unpetrify-ref: master
+  build-system: python-distutils
+- name: zake
+  repo: upstream:python-packages/zake
+  ref: 436bab3306aeec420f1281f34bd5d26d7f81038c
+  unpetrify-ref: 0.2.1
+  build-system: python-distutils
+  build-depends:
+  - testtools
+- name: nose
+  repo: upstream:python-packages/nose
+  ref: 08d134270b035dac3310cd877bb0fe9ab678303a
+  unpetrify-ref: release_1.3.4
+  build-system: python-distutils
+- name: beautifulsoup4
+  repo: upstream:python-packages/beautifulsoup4.git
+  ref: bcd7af0e9159d97aa511fb2d879424d1c1c5aadf
+  build-system: python-distutils
+- name: waitress
+  repo: upstream:python-packages/waitress.git
+  ref: b795d573a5a9e6e39b46a6e82da367a6a5db8dbd
+  unpetrify-ref: 0.8.9
+  build-system: python-distutils
+- name: webtest
+  repo: upstream:python-packages/webtest.git
+  ref: 6a24fba456d1c4ac2609b90f1fdc377c595608a4
+  unpetrify-ref: 2.0.16
+  build-system: python-distutils
+  build-depends:
+  - waitress
+  - beautifulsoup4
+- name: testresources
+  repo: upstream:python-packages/testresources
+  ref: ef938bcce0e436f9e9ffef932a898dc248a1d6ea
+  unpetrify-ref: 0.2.7
+  build-system: python-distutils
+  build-depends:
+  - testtools
+  - fixtures
+  - check
+  - cppunit
diff --git a/strata/openstack-services/subunit.morph b/strata/test-tools/subunit.morph
index b7b43a39..0d3819ed 100644
--- a/strata/openstack-services/subunit.morph
+++ b/strata/test-tools/subunit.morph
@@ -1,3 +1,3 @@
-name: python-subunit
+name: subunit
 kind: chunk
 build-system: autotools
diff --git a/strata/tools.morph b/strata/tools.morph
index e6449631..64eb2261 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -2,17 +2,14 @@ name: tools
 kind: stratum
 description: Various tools
 build-depends:
-- morph: strata/foundation.morph
+- morph: strata/core.morph
+- morph: strata/glib-common.morph
 chunks:
 - name: distcc
   morph: strata/tools/distcc.morph
   repo: upstream:distcc
   ref: c9691a9604fdf9d6711204999787d332b7141692
   unpetrify-ref: baserock/morph
-- name: file
-  repo: upstream:file
-  ref: f69c3fd9bcb108292e7887dd889e8b49f68c4a52
-  unpetrify-ref: file-5.22
 - name: gdb
   morph: strata/tools/gdb.morph
   repo: upstream:binutils-gdb
@@ -22,6 +19,7 @@ chunks:
   repo: upstream:linux-user-chroot
   ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: lsof
   morph: strata/tools/lsof.morph
   repo: upstream:lsof
@@ -31,6 +29,7 @@ chunks:
   repo: upstream:strace
   ref: 6d8c0637e8dd0f65c667af33c612230552419db1
   unpetrify-ref: v4.8
+  build-system: autotools
 - name: vala-bootstrap
   morph: strata/tools/vala-bootstrap.morph
   repo: upstream:vala
@@ -40,6 +39,7 @@ chunks:
   repo: upstream:vala
   ref: 5f6ebe007050be12bdc4aa7c902ae4059f28874a
   unpetrify-ref: 0.28.0
+  build-system: autotools
   build-depends:
   - vala-bootstrap
 - name: u-boot
@@ -61,6 +61,7 @@ chunks:
   repo: upstream:sudo
   ref: a4769dc7999b53260325fb89945bef85714fb338
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: procps-ng
   morph: strata/tools/procps-ng.morph
   repo: upstream:procps-ng
@@ -71,22 +72,13 @@ chunks:
   repo: upstream:ipmitool
   ref: be7917f9f58c8a354bc0960ed57516af5d2bd29a
   unpetrify-ref: IPMITOOL_1_8_14
-  build-depends:
-  - file
-- name: libpcap
-  morph: strata/tools/libpcap.morph
-  repo: upstream:libpcap
-  ref: 098a643f817e8a9929c70dfba157e4d399398375
-  unpetrify-ref: libpcap-1.7
-- name: tcpdump
-  morph: strata/tools/tcpdump.morph
-  repo: upstream:tcpdump
-  ref: 8aa5edea1b8846740514dee4158b6c707d38fc13
-  unpetrify-ref: tcpdump-4.7
-  build-depends:
-  - libpcap
 - name: parted
   morph: strata/tools/parted.morph
   repo: upstream:parted
-  ref: 0477d5ac971681b36cb2d2a97d1de8afd2a696d3
+  ref: 387e96e6eac59d84e9a688422b4b321ae9beaa20
   unpetrify-ref: baserock/v3.2
+- name: zip
+  morph: strata/tools/zip.morph
+  repo: upstream:zip
+  ref: e52e9d6a339aad5fcff464cf207da51c02996e39
+  unpetrify-ref: zip30
diff --git a/strata/tools/gdb.morph b/strata/tools/gdb.morph
index 808ff7d7..6f60da9e 100644
--- a/strata/tools/gdb.morph
+++ b/strata/tools/gdb.morph
@@ -2,4 +2,5 @@ name: gdb
 kind: chunk
 build-system: autotools
 configure-commands:
-- ./configure --prefix="$PREFIX" --disable-werror --disable-gas --disable-binutils --disable-ld --disable-gold --disable-gprof
+- ./configure --prefix="$PREFIX" --disable-werror --disable-gas --disable-binutils
+  --disable-ld --disable-gold --disable-gprof
diff --git a/strata/tools/parted.morph b/strata/tools/parted.morph
index d99c73cd..86d74da6 100644
--- a/strata/tools/parted.morph
+++ b/strata/tools/parted.morph
@@ -2,6 +2,7 @@ name: parted
 kind: chunk
 build-system: autotools
 pre-configure-commands:
+- sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
 - ./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib
 configure-commands:
 # Disable device-mapper as it is not installed on Baserock
diff --git a/strata/tools/procps-ng.morph b/strata/tools/procps-ng.morph
index 69df3d4a..e030b36c 100644
--- a/strata/tools/procps-ng.morph
+++ b/strata/tools/procps-ng.morph
@@ -9,11 +9,11 @@ description: |
 build-system: autotools
 
 configure-commands:
-  - NOCONFIGURE=1 ./autogen.sh
+- NOCONFIGURE=1 ./autogen.sh
   # Setting exec-prefix to /usr causes a bunch of stuff to go in /usr/usr/bin
   # Setting prefix to / causes files to go in /include and /share
   # So don't do either of those things!
-  - ./configure --prefix="$PREFIX" --exec-prefix=/
+- ./configure --prefix="$PREFIX" --exec-prefix=/
 
 post-install-commands:
 # We need to link the binaries into /bin so that they override the Busybox
diff --git a/strata/tools/zip.morph b/strata/tools/zip.morph
new file mode 100644
index 00000000..070467e0
--- /dev/null
+++ b/strata/tools/zip.morph
@@ -0,0 +1,9 @@
+name: zip
+kind: chunk
+configure-commands:
+- cp unix/Makefile .
+build-commands:
+- sed -i -e 's/^prefix = .*$/prefix = $$DESTDIR\/$$PREFIX/' Makefile
+- make generic
+install-commands:
+- make install
diff --git a/strata/unionfs-fuse-group.morph b/strata/unionfs-fuse-group.morph
index 914b18e0..acb094ea 100644
--- a/strata/unionfs-fuse-group.morph
+++ b/strata/unionfs-fuse-group.morph
@@ -1,21 +1,20 @@
 name: unionfs-fuse-group
 kind: stratum
 
-description:
+description: |
   User-space union file system.
 
-  This is used by Morph for systems which are unable to use 'overlayfs'.
-  It is slower than 'overlayfs', because it runs outside rather than
-  inside the kernel, but 'overlayfs' is only available in Linux 3.18 and
-  newer.
+  This is used by Morph for systems which are unable to use 'overlayfs'. It is slower
+  than 'overlayfs', because it runs outside rather than inside the kernel, but 'overlayfs'
+  is only available in Linux 3.18 and newer.
 
 build-depends:
 # Depends on foundation for 'fuse', and maybe other stuff.
 - morph: strata/foundation.morph
 
 chunks:
-  - name: unionfs.fuse
-    morph: strata/unionfs-fuse-group/unionfs-fuse.morph
-    repo: upstream:unionfs-fuse
-    ref: efac5b7aa91ec860f8f430a8d21060fe53a07002
-    unpetrify-ref: v0.26
+- name: unionfs-fuse
+  morph: strata/unionfs-fuse-group/unionfs-fuse.morph
+  repo: upstream:unionfs-fuse
+  ref: efac5b7aa91ec860f8f430a8d21060fe53a07002
+  unpetrify-ref: v0.26
diff --git a/strata/unionfs-fuse-group/unionfs-fuse.morph b/strata/unionfs-fuse-group/unionfs-fuse.morph
index 9b8ac2c7..98e1ce1f 100644
--- a/strata/unionfs-fuse-group/unionfs-fuse.morph
+++ b/strata/unionfs-fuse-group/unionfs-fuse.morph
@@ -1,8 +1,7 @@
 name: unionfs-fuse
 kind: chunk
 
-description:
-  User-space union file system.
+description: User-space union file system.
 
 build-system: manual
 
diff --git a/strata/virtualization.morph b/strata/virtualization.morph
index 548019aa..fe02f0f8 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.morph
@@ -1,10 +1,10 @@
 name: virtualization
 kind: stratum
 description: |
-    Virtualization for baserock
-    NOTE: this stratum requires kernel support, please see openstack bsp
-    kernel history to check which config are needed for openvswitch, libvirt,
-    or ebtables, for example.
+  Virtualization for baserock
+  NOTE: this stratum requires kernel support, please see openstack bsp
+  kernel history to check which config are needed for openvswitch or libvirt,
+  for example.
 build-depends:
 - morph: strata/libsoup-common.morph
 - morph: strata/python-core.morph
@@ -12,17 +12,14 @@ build-depends:
 - morph: strata/connman-common.morph
 - morph: strata/lvm.morph
 - morph: strata/xorg-util-macros-common.morph
+- morph: strata/networking-utils.morph
+- morph: strata/docutils.morph
 chunks:
 - name: yajl
   morph: strata/virtualization/yajl.morph
   repo: upstream:yajl
   ref: 52fc681857228c65c1cb439782da485554875481
   unpetrify-ref: baserock/morph
-- name: xml-catalog
-  morph: strata/virtualization/xml-catalog.morph
-  repo: baserock:baserock/xml-catalog
-  ref: 1d4a2abc875c4dda1b5eadc0a097a48a8d2ec82b
-  unpetrify-ref: master
 - name: dnsmasq
   morph: strata/virtualization/dnsmasq.morph
   repo: upstream:dnsmasq
@@ -37,16 +34,12 @@ chunks:
   repo: upstream:libpciaccess
   ref: b9c068896914b4132a24839c9ef7f9fcd6282d88
   unpetrify-ref: master
+  build-system: autotools
 - name: dmidecode
   morph: strata/virtualization/dmidecode.morph
   repo: upstream:dmidecode
   ref: 47a0aa5d6696a83922ee70279b7253a4e55947d5
   unpetrify-ref: master
-- name: ebtables
-  morph: strata/virtualization/ebtables.morph
-  repo: upstream:ebtables
-  ref: f4bdc80ae8c1a79b4ab5dcb8431ad85aea618d66
-  unpetrify-ref: master
 - name: libvirt
   morph: strata/virtualization/libvirt.morph
   repo: upstream:libvirt
@@ -56,24 +49,25 @@ chunks:
   - libpciaccess
   - dnsmasq
   - qemu
-  - xml-catalog
   - yajl
   - dmidecode
-  - ebtables
 - name: pycurl
   repo: upstream:pycurl
   ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e
   unpetrify-ref: baserock/morph
+  build-system: python-distutils
 - name: urlgrabber
   repo: upstream:urlgrabber
   ref: bf0a0be71373dec515bbb54e0613a3b9b0c00b04
   unpetrify-ref: master
+  build-system: python-distutils
   build-depends:
   - pycurl
 - name: libvirt-python
   repo: upstream:libvirt-python
   ref: 8e09c79a07b097a6ba9af83be4916fb9c9538500
   unpetrify-ref: v1.2.10
+  build-system: python-distutils
   build-depends:
   - libvirt
   - urlgrabber
@@ -86,6 +80,7 @@ chunks:
   repo: upstream:virt-manager
   ref: 8b7ebd4538ffbd2d246fdeee4f1bb1c452585575
   unpetrify-ref: v1.0.1
+  build-system: python-distutils
   build-depends:
   - libvirt-python
   - libosinfo
diff --git a/strata/virtualization/libvirt.morph b/strata/virtualization/libvirt.morph
index bdc99ddf..1687213c 100644
--- a/strata/virtualization/libvirt.morph
+++ b/strata/virtualization/libvirt.morph
@@ -21,6 +21,9 @@ configure-commands:
   --without-storage-disk --with-storage-rbd --without-storage-sheepdog \
   --without-storage-gluster --without-wireshark-dissector --disable-werror \
   --prefix="$PREFIX"
+post-install-commands:
+# Don't autostart the default network created by libvirt
+- rm -f "$DESTDIR"/etc/libvirt/qemu/networks/autostart/default.xml
 system-integration:
   libvirt-misc:
     01-addgroup:
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index f65fa63e..37a57c5b 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -1,7 +1,7 @@
 name: wayland-generic
 kind: stratum
 build-depends:
-- morph: strata/foundation.morph
+- morph: strata/core.morph
 - morph: strata/xorg-util-macros-common.morph
 chunks:
 - name: libxkbcommon
@@ -12,7 +12,7 @@ chunks:
 - name: wayland
   morph: strata/wayland-generic/wayland.morph
   repo: upstream:wayland
-  ref: 8e9d5a108476b3435a8286613b9a63b69afd92b7
-  unpetrify-ref: 1.7.0
+  ref: 60024af597b68974c451c89f960a7c11de11c33a
+  unpetrify-ref: 1.8.0
   build-depends:
   - libxkbcommon
diff --git a/strata/webtools.morph b/strata/webtools.morph
index 17a1abda..5010a4c1 100644
--- a/strata/webtools.morph
+++ b/strata/webtools.morph
@@ -14,6 +14,7 @@ chunks:
   repo: upstream:libgit2
   ref: 4b0a36e881506a02b43a4ae3c19c93c919b36eeb
   unpetrify-ref: master
+  build-system: cmake
 - name: nginx
   morph: strata/webtools/nginx.morph
   repo: upstream:nginx
diff --git a/strata/weston-common.morph b/strata/weston-common.morph
index 2925d72c..fbc5d5f1 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: 322383ed469d69401b502618718a97a4e85c97d8 
-  unpetrify-ref: baserock/weston-1.7.0/tegra
+  ref: 97a6d48e725956a58afad4450c5981c42ba4aa9c
+  unpetrify-ref: baserock/weston-1.8.0/tegra
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
index 71bf7c17..ea619821 100644
--- a/strata/weston-genivi.morph
+++ b/strata/weston-genivi.morph
@@ -2,7 +2,7 @@ name: weston-genivi
 kind: stratum
 build-depends:
 - morph: strata/graphics-common.morph
-- morph: strata/input-genivi.morph
+- morph: strata/input-common.morph
 - morph: strata/mesa-common.morph
 - morph: strata/libdrm-common.morph
 - morph: strata/wayland-generic.morph
@@ -10,12 +10,12 @@ chunks:
 - name: weston
   morph: strata/weston-genivi/weston.morph
   repo: upstream:weston
-  ref: 1d5fe5b2bdb9c62903baec6f38ada60f4065c16f
-  unpetrify-ref: baserock/jonathanmaw/genivi-demo-jetson
+  ref: 5d7a71cb941ed419ec042ea28be56c87ea407db6
+  unpetrify-ref: baserock/genivi/1.3.0
 - name: wayland-ivi-extension
   morph: strata/weston-genivi/wayland-ivi-extension.morph
   repo: upstream:genivi/wayland-ivi-extension
-  ref: d8bcf5ceb6555c7179d31fb537a3ae0b1b178e7c
+  ref: 43fa65ede93cef9e6c902df2248229ad204b510a
   unpetrify-ref: master
   build-depends:
   - weston
diff --git a/strata/x-common.morph b/strata/x-common.morph
index 69ffdba3..f92f97f5 100644
--- a/strata/x-common.morph
+++ b/strata/x-common.morph
@@ -7,115 +7,149 @@ chunks:
   repo: upstream:xorg-proto-bigreqsproto
   ref: d6ed3e927a756900ad4c9fd7235f8f7f34f376db
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-proto-compositeproto
   repo: upstream:xorg-proto-compositeproto
   ref: 39738dbe9438dc80fc6b9e221d9ed26a6d42da6b
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-proto-damageproto
   repo: upstream:xorg-proto-damageproto
   ref: 015b980e5091492dbe681af59569768ba89fbfe0
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-proto-dmxproto
   repo: upstream:xorg-proto-dmxproto
   ref: 395f6fcc0a5635907b5e45829e86b29431316184
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-proto-fixesproto
   repo: upstream:xorg-proto-fixesproto
   ref: b6c6bc2aa4b83f8763c75c90e6671052272a2af2
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-proto-fontsproto
   repo: upstream:xorg-proto-fontsproto
   ref: df8c05f7c0253a36589d96efa52938215eff9d4d
   unpetrify-ref: fontsproto-2.1.3
+  build-system: autotools
 - name: xorg-proto-glproto
   repo: upstream:xorg-proto-glproto
   ref: f84853d97d5749308992412a215fa518b6536eb3
   unpetrify-ref: glproto-1.4.17
+  build-system: autotools
 - name: xorg-proto-inputproto
   repo: upstream:xorg-proto-inputproto
   ref: 343ff0938f592876b9d82c966f166bf45a78c3c8
   unpetrify-ref: inputproto-2.3.1
+  build-system: autotools
 - name: xorg-proto-kbproto
   repo: upstream:xorg-proto-kbproto
   ref: f7022f5775350dce3348b7151845a32390e98791
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-proto-xineramaproto
   repo: upstream:xorg-proto-xineramaproto
   ref: 4e77b45e0d6b42a448dab2ec316eeb5c490ecfed
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-proto-randrproto
   repo: upstream:xorg-proto-randrproto
   ref: ca7cc541c2e43e6c784df19b4583ac35829d2f72
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-proto-recordproto
   repo: upstream:xorg-proto-recordproto
   ref: 0fd4f8e57c1e637b2aaaaa0f539ddbac8cc50575
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-proto-renderproto
   repo: upstream:xorg-proto-renderproto
   ref: 935f5ec95a3718c184ff685f5b79b467483b7844
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-proto-resourceproto
   repo: upstream:xorg-proto-resourceproto
   ref: ada91f54c98b5a61d3e116fca6bf239a8604730f
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-proto-scrnsaverproto
   repo: upstream:xorg-proto-scrnsaverproto
   ref: 614532026e8ec7496216316fb584d6f2af6a7f7b
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-proto-videoproto
   repo: upstream:xorg-proto-videoproto
   ref: e42cf822e230cff5c6550ca2c050dfa27d2c9611
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-proto-xcmiscproto
   repo: upstream:xorg-proto-xcmiscproto
   ref: 83549077a3c2140b9862709004cd873f1c55e395
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-proto-xextproto
   repo: upstream:xorg-proto-xextproto
   ref: 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7
   unpetrify-ref: xextproto-7.3.0
+  build-system: autotools
 - name: xorg-proto-xf86bigfontproto
   repo: upstream:xorg-proto-xf86bigfontproto
   ref: f805b328b2195de384c0fb6b82ef5f88c179b2c0
   unpetrify-ref: baserock/morph
+  build-system: autotools
+- name: xorg-proto-xf86dgaproto
+  repo: upstream:xorg-proto-xf86dgaproto
+  ref: c52b205c3175309be7952774668c87dd2d5ce30e
+  unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-proto-xf86driproto
   repo: upstream:xorg-proto-xf86driproto
   ref: cb03b8d49bf063860859c1ed8bcecd055551e93a
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-proto-x11proto
   repo: upstream:xorg-proto-x11proto
   ref: 03cbbf6c3e811c026c86e3a60d2f9af56606e155
   unpetrify-ref: xproto-7.0.26
+  build-system: autotools
 - name: xorg-proto-dri2proto
   repo: upstream:xorg-proto-dri2proto
   ref: ead89ad84877551cc15d26b95cb19a3e205df71f
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-proto-dri3proto
   repo: upstream:xorg-proto-dri3proto
   ref: 91df0f88b70c268f3580385a7b37543ab8c544c8
+  build-system: autotools
 - name: xorg-proto-presentproto
   repo: upstream:xorg-proto-presentproto
   ref: ef84007fc4a23d3897b4776906139de9d0698c2a
+  build-system: autotools
 - name: xcb-proto
   repo: upstream:xcb-proto
   ref: 4b384d2a015c50d0e93dcacda4b8260a3fd37640
-  unpetrify-ref: "1.11"
+  unpetrify-ref: '1.11'
+  build-system: autotools
 - name: xorg-lib-libxshmfence
   repo: upstream:xorg-lib-libxshmfence
   ref: 9c4f070e1304a3503cfab08f68573443025fc4c9
+  unpetrify-ref: master
+  build-system: autotools
   build-depends:
   - xorg-proto-x11proto
 - name: xorg-lib-libXau
   repo: upstream:xorg-lib-libXau
   ref: 1a8a1b2c68967b48c07b56142799b1020f017027
   unpetrify-ref: baserock/morph
+  build-system: autotools
   build-depends:
   - xorg-proto-x11proto
 - name: xcb-libxcb
   repo: upstream:xcb-libxcb
   ref: d1e8ec96fca4862f37ec9f0e9407bb989c4c161a
-  unpetrify-ref: "1.11"
+  unpetrify-ref: '1.11'
+  build-system: autotools
   build-depends:
   - xcb-proto
   - xorg-lib-libXau
@@ -123,24 +157,28 @@ chunks:
   repo: upstream:xcb-util
   ref: 4de010f122da40e17b52866d07d1d501a66bf007
   unpetrify-ref: baserock/0.4.0
+  build-system: autotools
   build-depends:
   - xcb-libxcb
 - name: util-wm
   repo: upstream:util-wm
   ref: fb7afc3f291c8cc072d327cd8d97ab1db3283c21
   unpetrify-ref: baserock/0.4.1
+  build-system: autotools
   build-depends:
   - xcb-libxcb
 - name: util-keysyms
   repo: upstream:util-keysyms
   ref: edb763a8837d3932690b9d6d77cb7e20a9ab8013
   unpetrify-ref: baserock/0.4.0
+  build-system: autotools
   build-depends:
   - xcb-libxcb
 - name: util-image
   repo: upstream:util-image
   ref: f20f25a1c017c58d5d7dfffc6e9adc8d31879152
   unpetrify-ref: baserock/0.4.0
+  build-system: autotools
   build-depends:
   - xcb-libxcb
   - xcb-util
@@ -148,10 +186,12 @@ chunks:
   repo: upstream:xorg-lib-libxtrans
   ref: 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03
   unpetrify-ref: xtrans-1.3.5
+  build-system: autotools
 - name: xorg-lib-libX11
   repo: upstream:xorg-lib-libX11
   ref: cb107760df33ffc8630677e66e2e50aa37950a5c
   unpetrify-ref: libX11-1.6.2
+  build-system: autotools
   build-depends:
   - xcb-libxcb
   - xorg-lib-libxtrans
@@ -164,6 +204,7 @@ chunks:
   repo: upstream:xorg-lib-libXext
   ref: 8eee1236041d46a21faba32e0d27c26985267d89
   unpetrify-ref: baserock/morph
+  build-system: autotools
   build-depends:
   - xorg-lib-libX11
   - xorg-lib-libXau
@@ -173,6 +214,7 @@ chunks:
   repo: upstream:xorg-lib-libXi
   ref: 9b26b81477cf3486e5aa0ef8d81af68a0f04df1b
   unpetrify-ref: baserock/morph
+  build-system: autotools
   build-depends:
   - xorg-lib-libX11
   - xorg-lib-libXext
@@ -183,13 +225,24 @@ chunks:
   repo: upstream:xorg-lib-libXfixes
   ref: 0cb446962381f750e05d97bfb974ca1e32481d5d
   unpetrify-ref: libXfixes-5.0.1
+  build-system: autotools
   build-depends:
   - xorg-lib-libXext
   - xorg-proto-fixesproto
+- name: xorg-lib-libXcomposite
+  repo: upstream:xorg-lib-libXcomposite
+  ref: eda48b1bedaa344ada8e13930c9ab3058b836190
+  unpetrify-ref: baserock/morph
+  build-system: autotools
+  build-depends:
+  - xorg-lib-libX11
+  - xorg-lib-libXfixes
+  - xorg-proto-compositeproto
 - name: xorg-lib-libXrender
   repo: upstream:xorg-lib-libXrender
   ref: 1af52cb334377611233d7dc156bc1e6f7923756d
   unpetrify-ref: baserock/morph
+  build-system: autotools
   build-depends:
   - xorg-lib-libX11
   - xorg-proto-renderproto
@@ -197,6 +250,7 @@ chunks:
   repo: upstream:xorg-lib-libXrandr
   ref: 99a63d10cbbab7d69a52d25d78795a3278506ea9
   unpetrify-ref: baserock/morph
+  build-system: autotools
   build-depends:
   - xorg-lib-libX11
   - xorg-lib-libXext
@@ -204,10 +258,21 @@ 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-system: autotools
+  build-depends:
+  - xorg-lib-libX11
+  - xorg-lib-libXext
+  - xorg-proto-xextproto
+  - xorg-proto-xineramaproto
 - name: xorg-lib-libXtst
   repo: upstream:xorg-lib-libXtst
   ref: 2aafac9474a0a0a0c39797862f823255918cf368
   unpetrify-ref: baserock/morph
+  build-system: autotools
   build-depends:
   - xorg-lib-libX11
   - xorg-lib-libXext
@@ -219,6 +284,7 @@ chunks:
   repo: upstream:xorg-lib-libXdamage
   ref: 0d35761dc39409b70e04dd0786aef6537f92976a
   unpetrify-ref: baserock/morph
+  build-system: autotools
   build-depends:
   - xorg-lib-libXfixes
   - xorg-proto-damageproto
@@ -226,9 +292,34 @@ chunks:
   repo: upstream:xorg-lib-libXcursor
   ref: 1b98fd6a2e8c00a563187849a585e68c7344468b
   unpetrify-ref: baserock/morph
+  build-system: autotools
   build-depends:
   - xorg-lib-libXrender
   - xorg-lib-libXfixes
   - xorg-proto-fixesproto
   - xorg-lib-libXau
   - xorg-lib-libX11
+- name: xorg-lib-libICE
+  repo: upstream:xorg-lib-libICE
+  ref: b0cc7794c89d64fc54d0c75b2bba79fd7a1c7e0a
+  unpetrify-ref: libICE-1.0.9
+  build-system: autotools
+  build-depends:
+  - xorg-proto-x11proto
+  - xorg-lib-libxtrans
+- name: xorg-lib-libSM
+  repo: upstream:xorg-lib-libSM
+  ref: d0659dcd3aa23598b38826ac78f85071772c436f
+  unpetrify-ref: libSM-1.2.2
+  build-system: autotools
+  build-depends:
+  - xorg-lib-libICE
+- name: xorg-lib-libXt
+  repo: upstream:xorg-lib-libXt
+  ref: e7411e7e5299116604ff1f01d9415802607f1051
+  unpetrify-ref: libXt-1.1.5
+  build-system: autotools
+  build-depends:
+  - xorg-proto-kbproto
+  - xorg-lib-libX11
+  - xorg-lib-libSM
diff --git a/strata/x-drivers.morph b/strata/x-drivers.morph
new file mode 100644
index 00000000..185d6b40
--- /dev/null
+++ b/strata/x-drivers.morph
@@ -0,0 +1,36 @@
+name: x-drivers
+kind: stratum
+build-depends:
+- morph: strata/input-common.morph
+- morph: strata/x-generic.morph
+chunks:
+- name: xorg-driver-xf86-video-fbdev
+  repo: upstream:xorg-driver-xf86-video-fbdev
+  ref: 679ed9a4e6b54227df191c580e3ef641e075db19
+  unpetrify-ref: xf86-video-fbdev-0.4.4
+  build-system: autotools
+- name: xorg-driver-xf86-video-vesa
+  repo: upstream:xorg-driver-xf86-video-vesa
+  ref: b49c293e67cd88424ff40a2ca4e58b28528691d7
+  unpetrify-ref: xf86-video-vesa-2.3.4
+  build-system: autotools
+- name: xorg-driver-xf86-video-intel
+  repo: upstream:xorg-driver-xf86-video-intel
+  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
+  build-system: autotools
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index 27a7c7b6..9c2f498d 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.morph
@@ -11,24 +11,29 @@ chunks:
   repo: upstream:libepoxy
   ref: 7422de5b4be7b19d789136b3bb5f932de42db27c
   unpetrify-ref: v1.2
+  build-system: autotools
 - 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
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xorg-lib-libfontenc
   repo: upstream:xorg-lib-libfontenc
   ref: f5d1208172e965fdd7fae8927bd3e29b3cc3a975
   unpetrify-ref: baserock/morph
+  build-system: autotools
   build-depends:
   - xorg-font-util
 - name: xorg-lib-libXfont
   repo: upstream:xorg-lib-libXfont
   ref: ad4f4d8a2d0730c0ea3c09210bf921638b4682bc
   unpetrify-ref: libXfont-1.5.0
+  build-system: autotools
   build-depends:
   - xorg-lib-libfontenc
 - name: xserver
@@ -45,5 +50,11 @@ chunks:
   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
+  unpetrify-ref: baserock/morph
+  build-system: autotools
diff --git a/strata/x-generic/xserver.morph b/strata/x-generic/xserver.morph
index ca678331..e13ba77f 100644
--- a/strata/x-generic/xserver.morph
+++ b/strata/x-generic/xserver.morph
@@ -5,7 +5,6 @@ configure-commands:
 - |
   ./autogen.sh --prefix="$PREFIX" \
   --disable-glx \
-  --disable-xorg \
   --disable-xvfb \
   --disable-xnest \
   --disable-xquartz \
diff --git a/strata/xfce.morph b/strata/xfce.morph
index 295abfe1..552cbd89 100644
--- a/strata/xfce.morph
+++ b/strata/xfce.morph
@@ -3,41 +3,33 @@ kind: stratum
 description: xfce stratum
 build-depends:
 - morph: strata/gtk2.morph
-- morph: strata/x-generic.morph
+- morph: strata/audio-bluetooth.morph
 chunks:
-- name: libcroco
-  repo: upstream:libcroco
-  ref: 611f624a6e15065792b41eb5ce14811293f3fb0a
-  unpetrify-ref: baserock/morph
-- name: librsvg
-  morph: strata/xfce/librsvg.morph
-  repo: upstream:librsvg
-  ref: 61171ca59d02b58b7da1697ca1d924bff93e66cb
-  unpetrify-ref: baserock/morph
 - name: xfce-dev-tools
   repo: upstream:xfce/xfce4-dev-tools
   ref: 9244250ac0c15ba160688758c5dccf97f3f160ef
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: libxfce4util
   morph: strata/xfce/libxfce4util.morph
   repo: upstream:xfce/libxfce4util
-  ref: fc0437fe503c3eaa5ccd4fa68f098bc428f27cad
-  unpetrify-ref: baserock/morph
+  ref: 5f56641e09b081f7d76d3feeee307589b21840c1
+  unpetrify-ref: libxfce4util-4.11.0
   build-depends:
   - xfce-dev-tools
 - name: xfconf
   morph: strata/xfce/xfconf.morph
   repo: upstream:xfce/xfconf
-  ref: ed6ed2f7656a0d5d8cb453cb643061c9a157f2ae
-  unpetrify-ref: baserock/morph
+  ref: e5261e292130c96b6e62a8c897b1cc85bbb786ac
+  unpetrify-ref: master
   build-depends:
   - xfce-dev-tools
   - libxfce4util
 - name: libxfce4ui
   morph: strata/xfce/libxfce4ui.morph
   repo: upstream:xfce/libxfce4ui
-  ref: a9c2a379709915dfda255d3ca9181fac3f8484d8
-  unpetrify-ref: baserock/morph
+  ref: b9e6a57385ff6f0c15bbc637b76472211e3696b0
+  unpetrify-ref: libxfce4ui-4.11.2
   build-depends:
   - xfce-dev-tools
   - libxfce4util
@@ -45,14 +37,16 @@ chunks:
 - name: garcon
   morph: strata/xfce/garcon.morph
   repo: upstream:xfce/garcon
-  ref: febd4136365714556f6afbccf4302e8f4550e5d1
+  ref: 69ff09cf0a9ee3ff9518822614637dc2d4f89ce6
   unpetrify-ref: baserock/morph
   build-depends:
   - libxfce4util
+  - libxfce4ui
 - name: perl-uri
   repo: upstream:libwww-perl/uri
   ref: 3dd72ded7f043a4f6973781fe594722e2e95f491
   unpetrify-ref: baserock/morph
+  build-system: cpan
 - name: exo
   morph: strata/xfce/exo.morph
   repo: upstream:xfce/exo
@@ -90,8 +84,8 @@ chunks:
 - name: xfce4-settings
   morph: strata/xfce/xfce4-settings.morph
   repo: upstream:xfce/xfce4-settings
-  ref: 697ce5cd4bf4860a0a20c27b557be296c9adf469
-  unpetrify-ref: baserock/morph
+  ref: f04388fae30685b5038358674dec69406ba87f2c
+  unpetrify-ref: xfce4-settings-4.11.3
   build-depends:
   - xfce-dev-tools
   - xfconf
@@ -102,11 +96,12 @@ chunks:
   repo: upstream:iceauth
   ref: c07d443d43e53cfe21b53a9a0eafcd6189432867
   unpetrify-ref: baserock/morph
+  build-system: autotools
 - name: xfce4-session
   morph: strata/xfce/xfce4-session.morph
   repo: upstream:xfce/xfce4-session
-  ref: 2c89b2f12409ca617fc094e2942cb0d69318c7b5
-  unpetrify-ref: baserock/morph
+  ref: d4e20cbb9b1df864b502e9e8879a538f089fd5d2
+  unpetrify-ref: xfce4-session-4.11.1
   build-depends:
   - iceauth
   - exo
@@ -123,8 +118,8 @@ chunks:
 - name: xfdesktop
   morph: strata/xfce/xfdesktop.morph
   repo: upstream:xfce/xfdesktop
-  ref: d2f7404da32f29cfec4a704389112fe7183edda5
-  unpetrify-ref: baserock/morph
+  ref: f32d76856e6eee9bc3d772b2fb6c2b8810ae63dc
+  unpetrify-ref: xfdesktop-4.11.8
   build-depends:
   - exo
   - libxfce4ui
@@ -133,8 +128,8 @@ chunks:
 - name: xfwm4
   morph: strata/xfce/xfwm4.morph
   repo: upstream:xfce/xfwm4
-  ref: 523ef8a6861af772be3468cd700ad14172c86768
-  unpetrify-ref: baserock/morph
+  ref: f5c1c74e1436deff7f16ef92c98097ac3baae290
+  unpetrify-ref: xfwm4-4.11.3_plus_fallback_theme
   build-depends:
   - exo
   - libxfce4util
@@ -144,8 +139,8 @@ chunks:
 - name: xfce4-appfinder
   morph: strata/xfce/xfce4-appfinder.morph
   repo: upstream:xfce/xfce4-appfinder
-  ref: 5c069f13fde648913a59f022957b2c83b5764f39
-  unpetrify-ref: baserock/morph
+  ref: 6c2bc7a09dd6e85bb78913cdc8af2292a9361e04
+  unpetrify-ref: xfce4-appfinder-4.11.0
   build-depends:
   - exo
   - libxfce4ui
@@ -153,12 +148,12 @@ chunks:
 - name: tumbler
   morph: strata/xfce/tumbler.morph
   repo: upstream:xfce/tumbler
-  ref: f8191f286227a045fbdabd7684c9da81ade518c8
-  unpetrify-ref: baserock/morph
+  ref: 073c2080c79075fdf574064fa2098c4b5bb79a11
+  unpetrify-ref: tumbler-0.1.30
   build-depends:
   - xfce-dev-tools
 - name: elementary-xfce
   morph: strata/xfce/elementary-xfce.morph
   repo: upstream:elementary-xfce
-  ref: 81e683bb46f8ba58c49c60ed75124951b7ba0779
-  unpetrify-ref: baserock/morph
+  ref: 9681d40e7a3545c96dfb1670e00514acfad5b089
+  unpetrify-ref: v0.5
diff --git a/strata/xfce/librsvg.morph b/strata/xfce/librsvg.morph
deleted file mode 100644
index f4d880ed..00000000
--- a/strata/xfce/librsvg.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: librsvg
-kind: chunk
-build-system: autotools
-configure-commands:
-- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --disable-gtk-theme
diff --git a/strata/xorg-util-macros-common.morph b/strata/xorg-util-macros-common.morph
index 909c9420..7e252a90 100644
--- a/strata/xorg-util-macros-common.morph
+++ b/strata/xorg-util-macros-common.morph
@@ -7,9 +7,11 @@ chunks:
   repo: upstream:xorg-util-macros
   ref: 9a54b858601bd305de2737b06e609084a2a114c2
   unpetrify-ref: util-macros-1.19.0
+  build-system: autotools
 - name: xcb-pthread-stubs
   repo: upstream:xcb-pthread-stubs
   ref: 431d2c0be218d878b9dd3862e4232243c599df4b
   unpetrify-ref: baserock/morph
+  build-system: autotools
   build-depends:
   - xorg-util-macros
diff --git a/strata/xstatic.morph b/strata/xstatic.morph
index bf21a296..64b1fc64 100644
--- a/strata/xstatic.morph
+++ b/strata/xstatic.morph
@@ -1,13 +1,13 @@
 name: xstatic
 kind: stratum
 description: |
-    Stratum with Xstatic and some xstatic libraries.
+  Stratum with Xstatic and some xstatic libraries.
 
-    XStatic is a packaging standard to package external static files as
-    a python package, so they are easily usable on all OSes.
+  XStatic is a packaging standard to package external static files as
+  a python package, so they are easily usable on all OSes.
 
-    This conflicts with the 'everything from Git' policy of Baserock,
-    but it is required right now for the Openstack system to work.
+  This conflicts with the 'everything from Git' policy of Baserock,
+  but it is required right now for the Openstack system to work.
 build-depends:
 - morph: strata/foundation.morph
 - morph: strata/python-core.morph
@@ -16,99 +16,139 @@ chunks:
   repo: upstream:xstatic
   ref: 6c8604a422ba7f176ce6b372a8e182c293d06fb2
   unpetrify-ref: 1.0.1
+  build-system: python-distutils
 - name: xstatic-angular
   repo: upstream:xstatic-packages/xstatic-angular
   ref: dac047df05da5bb20de4e78876bc03820d0c6671
   unpetrify-ref: 1.3.7.0
+  build-system: python-distutils
 - name: xstatic-angular-animate
   repo: upstream:xstatic-packages/xstatic-angular-animate
   ref: 91b9d3197f67213e4e35e9a35ba7196b898731e7
   unpetrify-ref: master
+  build-system: python-distutils
 - name: xstatic-angular-bootstrap
   repo: upstream:xstatic-packages/xstatic-angular-bootstrap
-  ref: 2a8c157b8b0733afbfdaf7eea29cf012a8b7f483
-  unpetrify-ref: master
+  ref: b581edb6975175a564fd02766aef2f9043702c80
+  unpetrify-ref: 0.11.0.3
+  build-system: python-distutils
+- name: xstatic-angular-lrdragndrop
+  repo: upstream:xstatic-packages/xstatic-angular-lrdragndrop
+  ref: 55c7494492e6da2a6664aa00941864dd64589396
+  unpetrify-ref: 1.0.2.3
+  build-system: python-distutils
 - name: xstatic-angular-cookies
   repo: upstream:xstatic-packages/xstatic-angular-cookies
   ref: 66141a33ae7ad84b82ba9384a8101ae15ccd6da5
   unpetrify-ref: 1.2.1.1
+  build-system: python-distutils
 - name: xstatic-angular-fileupload
   repo: upstream:xstatic-packages/xstatic-angular-fileupload
   ref: 04bcd774dae17cfff5e826fc0874f6403b4a6cae
   unpetrify-ref: master
+  build-system: python-distutils
 - name: xstatic-angular-mock
   repo: upstream:xstatic-packages/xstatic-angular-mock
   ref: 20fdada109b167bcdcacec22986b43fdb42866f3
   unpetrify-ref: 1.2.1.1
+  build-system: python-distutils
 - name: xstatic-angular-sanitize
   repo: upstream:xstatic-packages/xstatic-angular-sanitize
   ref: 9e0f03ada6fc00f8583903aeb6d9fc6516784999
   unpetrify-ref: master
+  build-system: python-distutils
 - name: xstatic-angular-smart-table
   repo: upstream:xstatic-packages/xstatic-angular-smart-table
   ref: e0fbf69fb156b995547471d71c5c6a7f88989d47
   unpetrify-ref: master
+  build-system: python-distutils
 - name: xstatic-bootstrap-datepicker
   repo: upstream:xstatic-packages/xstatic-bootstrap-datepicker
   ref: 60caf41e32d49f9bc715c39570f01449ebfbd37a
   unpetrify-ref: master
+  build-system: python-distutils
 - name: xstatic-bootstrap-scss
   repo: upstream:xstatic-packages/xstatic-bootstrap-scss
-  ref: e8ca8e38e464691268faec8cd6ae59777ee7ee9e
-  unpetrify-ref: master
+  ref: d81b7b71c6c088406e90d1bdba0e10f0a304bbdc
+  unpetrify-ref: 3.1.1.1
+  build-system: python-distutils
 - name: xstatic-d3
   repo: upstream:xstatic-packages/xstatic-d3
   ref: 1e754e73c801fb9315995ffeb95ae51233c4fcaf
   unpetrify-ref: master
+  build-system: python-distutils
 - name: xstatic-hogan
   repo: upstream:xstatic-packages/xstatic-hogan
   ref: 9e39977f6a6744810b08fa0323147e9f31dbd363
   unpetrify-ref: master
+  build-system: python-distutils
 - name: xstatic-font-awesome
   repo: upstream:xstatic-packages/xstatic-font-awesome
   ref: c13aad1b95b1d84e73f2565a18a5a8e2bd2194a7
   unpetrify-ref: 4.2.0.0
+  build-system: python-distutils
 - name: xstatic-jasmine
   repo: upstream:xstatic-packages/xstatic-jasmine
   ref: a55f5db1dbe59b23c7d6284250bf4eac1d0143c3
   unpetrify-ref: 2.1.2.0
+  build-system: python-distutils
 - name: xstatic-jquery
   repo: upstream:xstatic-packages/xstatic-jquery
   ref: e91c5bf82535a62c1cfac61b5efb6b5c0157c1f5
   unpetrify-ref: master
+  build-system: python-distutils
 - name: xstatic-jquery-bootstrap-wizard
   repo: upstream:xstatic-packages/xstatic-jquery-bootstrap-wizard
   ref: 07ae7e3a15b3af3d3d378d1f2412fe503ee42142
   unpetrify-ref: master
+  build-system: python-distutils
 - name: xstatic-jquery-migrate
   repo: upstream:xstatic-packages/xstatic-jquery-migrate
   ref: 989b3b31106727542dd83810c3b952f90d8cdb8f
   unpetrify-ref: master
+  build-system: python-distutils
 - name: xstatic-jquery-quicksearch
   repo: upstream:xstatic-packages/xstatic-jquery-quicksearch
   ref: f5221c8c30507340846d97d6db41a782e7c63316
   unpetrify-ref: master
+  build-system: python-distutils
 - name: xstatic-jquery-tablesorter
   repo: upstream:xstatic-packages/xstatic-jquery-tablesorter
   ref: eb78328391f44a9a88033e1aede1a605902c5551
   unpetrify-ref: master
+  build-system: python-distutils
 - name: xstatic-jquery-ui
   repo: upstream:xstatic-packages/xstatic-jquery-ui
   ref: b494369430dafd8ac4ddbe90efb9f8ad20a6e6d1
   unpetrify-ref: 1.11.0.1
+  build-system: python-distutils
+- name: xstatic-magic-search
+  repo: upstream:xstatic-packages/xstatic-magic-search
+  ref: 60d6954a36e54afa1f925324e7b527d235bdb484
+  unpetrify-ref: 0.2.0.1
+  build-system: python-distutils
 - name: xstatic-jsencrypt
   repo: upstream:xstatic-packages/xstatic-jsencrypt
   ref: 5c0f088310ecd602e3aaf5e683385b0d27258409
   unpetrify-ref: master
+  build-system: python-distutils
 - name: xstatic-qunit
   repo: upstream:xstatic-packages/xstatic-qunit
   ref: c3189eaa77c68c149a40b8c0afc8722cf394bd1f
   unpetrify-ref: master
+  build-system: python-distutils
 - name: xstatic-rickshaw
   repo: upstream:xstatic-packages/xstatic-rickshaw
   ref: 6427ca5406852bc779d6918f487bb0fe3f063e77
   unpetrify-ref: master
+  build-system: python-distutils
 - name: xstatic-spin
   repo: upstream:xstatic-packages/xstatic-spin
   ref: 74b4c0d0ff12db1f84787246857d5e925ff6883f
   unpetrify-ref: master
+  build-system: python-distutils
+- name: xstatic-termjs
+  repo: upstream:xstatic-packages/xstatic-termjs
+  ref: a4ac0b809ab0d84c636a760215839bb6d68d0113
+  unpetrify-ref: master
+  build-system: python-distutils
diff --git a/strata/zookeeper-server.morph b/strata/zookeeper-server.morph
index 97acd2ca..483a3fde 100644
--- a/strata/zookeeper-server.morph
+++ b/strata/zookeeper-server.morph
@@ -1,6 +1,7 @@
 name: zookeeper-server
 kind: stratum
-description: This Stratum installs a zookeeper server and small program to populate it with default data.
+description: This Stratum installs a zookeeper server and small program to populate
+  it with default data.
 build-depends:
 - morph: strata/zookeeper.morph
 chunks:
diff --git a/strata/zookeeper.morph b/strata/zookeeper.morph
index 6328d327..e345b6d1 100644
--- a/strata/zookeeper.morph
+++ b/strata/zookeeper.morph
@@ -4,26 +4,11 @@ description: |
   This stratum installs zookeeper and its dependencies.
 build-depends:
 - morph: strata/core.morph
+- morph: strata/test-tools.morph
+- morph: strata/java.morph
 chunks:
-- name: cppunit
-  repo: upstream:cppunit
-  ref: 77bb121d73c4593d6e3addacacb1bfbd21f53dcf
-- name: java-binary
-  morph: strata/zookeeper/java-binary.morph
-  repo: github:franred/gerrit-installation-binaries
-  ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e
-  unpetrify-ref: master
-- name: java-ant
-  morph: strata/zookeeper/java-ant.morph
-  repo: upstream:java/ant
-  ref: master
-  build-depends:
-  - cppunit
-  - java-binary
 - name: zookeeper
   morph: strata/zookeeper/zookeeper.morph
   repo: upstream:zookeeper
   ref: baserock/mikesmith/zookeeper
   unpetrify-ref: trunk
-  build-depends:
-  - java-ant
diff --git a/strata/zookeeper/java-binary.morph b/strata/zookeeper/java-binary.morph
deleted file mode 100644
index a6c11f95..00000000
--- a/strata/zookeeper/java-binary.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: java-binary
-kind: chunk
-configure-commands: []
-build-commands:
-- cat jdk-8u20-linux-x64.tar.gz_* > jdk-8u20-linux-x64.tar.gz
-install-commands:
-- mkdir -p "$DESTDIR$PREFIX"/bin
-- mkdir -p "$DESTDIR$PREFIX"/lib
-- tar zxf jdk-8u20-linux-x64.tar.gz -C "$DESTDIR$PREFIX"/lib
-- unzip jce_policy-8.zip -d "$DESTDIR$PREFIX"/lib/jdk1.8.0_20/jre/lib/security
-- ln -sfn "$PREFIX"/lib/jdk1.8.0_20/jre/bin/java "$DESTDIR$PREFIX"/bin/
diff --git a/strata/zookeeper/zookeeper-client.morph b/strata/zookeeper/zookeeper-client.morph
index 591c1840..7bc99f08 100644
--- a/strata/zookeeper/zookeeper-client.morph
+++ b/strata/zookeeper/zookeeper-client.morph
@@ -1,17 +1,17 @@
 name: zookeeper-client
 kind: chunk
 build-commands:
- - mkdir -p "$DESTDIR$PREFIX"/zookeeper-client
- - cp -r * "$DESTDIR$PREFIX"/zookeeper-client
- - make -C "$DESTDIR$PREFIX"/zookeeper-client/ZKTest/Release/
+- mkdir -p "$DESTDIR$PREFIX"/zookeeper-client
+- cp -r * "$DESTDIR$PREFIX"/zookeeper-client
+- make -C "$DESTDIR$PREFIX"/zookeeper-client/ZKTest/Release/
 post-install-commands:
- - |
-   install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-client.service
-   [unit]
-       Description=Zookeeper client init
-   [Service]
-       ExecStart=/usr/zookeeper-client/ZKTest/Release/ZKTest nodeTypeOne 10.24.1.198
-       RemainAfterExit=yes
-   [Install]
-       WantedBy=multi-user.target
-   EOF
+- |
+  install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-client.service
+  [unit]
+      Description=Zookeeper client init
+  [Service]
+      ExecStart=/usr/zookeeper-client/ZKTest/Release/ZKTest nodeTypeOne 10.24.1.198
+      RemainAfterExit=yes
+  [Install]
+      WantedBy=multi-user.target
+  EOF
diff --git a/strata/zookeeper/zookeeper-server.morph b/strata/zookeeper/zookeeper-server.morph
index 082c063c..502bbda3 100644
--- a/strata/zookeeper/zookeeper-server.morph
+++ b/strata/zookeeper/zookeeper-server.morph
@@ -1,30 +1,30 @@
 name: zookeeper-server
 kind: chunk
 build-commands:
- - mkdir -p "$DESTDIR$PREFIX"/zookeeper_server
- - cp -r * "$DESTDIR$PREFIX"/zookeeper_server
- - make -C "$DESTDIR$PREFIX"/zookeeper_server/zkServerFileSetup/Release/ 
+- mkdir -p "$DESTDIR$PREFIX"/zookeeper_server
+- cp -r * "$DESTDIR$PREFIX"/zookeeper_server
+- make -C "$DESTDIR$PREFIX"/zookeeper_server/zkServerFileSetup/Release/
 post-install-commands:
- - |
-   install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-server.service
-   [unit]
-       Description=Zookeeper server
-   [Service]
-       ExecStart=/usr/zookeeper/bin/zkServer.sh start
-       RemainAfterExit=yes
-   [Install]
-       WantedBy=multi-user.target
-   EOF
- - |
-   install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-init.service
-   [unit]
-       Description=Zookeeper server init
-   [Service]
-       ExecStart=/usr/zookeeper_server/zkServerFileSetup/Release/zkServerFileSetup
-       RemainAfterExit=no
-   [Install]
-       WantedBy=multi-user.target
-   EOF
- - mkdir "$DESTDIR"/etc/systemd/system/multi-user.target.wants
- - ln -s "$DESTDIR"/etc/systemd/system/zookeeper-server.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-server.service 
- - ln -s "$DESTDIR"/etc/systemd/system/zookeeper-init.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-init.service
+- |
+  install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-server.service
+  [unit]
+      Description=Zookeeper server
+  [Service]
+      ExecStart=/usr/zookeeper/bin/zkServer.sh start
+      RemainAfterExit=yes
+  [Install]
+      WantedBy=multi-user.target
+  EOF
+- |
+  install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-init.service
+  [unit]
+      Description=Zookeeper server init
+  [Service]
+      ExecStart=/usr/zookeeper_server/zkServerFileSetup/Release/zkServerFileSetup
+      RemainAfterExit=no
+  [Install]
+      WantedBy=multi-user.target
+  EOF
+- mkdir "$DESTDIR"/etc/systemd/system/multi-user.target.wants
+- ln -s "$DESTDIR"/etc/systemd/system/zookeeper-server.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-server.service
+- ln -s "$DESTDIR"/etc/systemd/system/zookeeper-init.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-init.service
diff --git a/strata/zookeeper/zookeeper.morph b/strata/zookeeper/zookeeper.morph
index dbe6ccbb..db446a1b 100644
--- a/strata/zookeeper/zookeeper.morph
+++ b/strata/zookeeper/zookeeper.morph
@@ -1,14 +1,14 @@
 name: zookeeper
 kind: chunk
 configure-commands:
-  - mkdir -p "$DESTDIR$PREFIX"/lib/zookeeper
+- mkdir -p "$DESTDIR$PREFIX"/lib/zookeeper
 build-commands:
-  - ant -p compile_jute
-  - mkdir -p "$DESTDIR$PREFIX"/zookeeper
-  - cp -r * "$DESTDIR$PREFIX"/zookeeper
-  - cd "$DESTDIR$PREFIX"/zookeeper/src/c && autoreconf -i
-  - cd "$DESTDIR$PREFIX"/zookeeper/src/c && ./configure --prefix="$PREFIX" --libdir="$PREFIX"/lib/
-  - make -C "$DESTDIR$PREFIX"/zookeeper/src/c
-  - cd "$DESTDIR$PREFIX"/zookeeper/src/c && make install
-  - mv "$DESTDIR$PREFIX"/zookeeper/conf/zoo_sample.cfg "$DESTDIR$PREFIX"/zookeeper/conf/zoo.cfg 
-  - make -C "$DESTDIR$PREFIX"/zookeeper/src/c zktest-mt
+- ant -p compile_jute
+- mkdir -p "$DESTDIR$PREFIX"/zookeeper
+- cp -r * "$DESTDIR$PREFIX"/zookeeper
+- cd "$DESTDIR$PREFIX"/zookeeper/src/c && autoreconf -i
+- cd "$DESTDIR$PREFIX"/zookeeper/src/c && ./configure --prefix="$PREFIX" --libdir="$PREFIX"/lib/
+- make -C "$DESTDIR$PREFIX"/zookeeper/src/c
+- cd "$DESTDIR$PREFIX"/zookeeper/src/c && make install
+- mv "$DESTDIR$PREFIX"/zookeeper/conf/zoo_sample.cfg "$DESTDIR$PREFIX"/zookeeper/conf/zoo.cfg
+- make -C "$DESTDIR$PREFIX"/zookeeper/src/c zktest-mt
author	Firehose merge bot <firehose@merge.bot>	2015-09-11 14:53:48 +0000
committer	Firehose merge bot <firehose@merge.bot>	2015-09-11 14:53:48 +0000
commit	b4d53e2cc0e63babbc4b3fec8a68ae67f47fab00 (patch)
tree	862c0d368c4d561b57b940d173152e1c541ba933 /strata
parent	0fcbdc18897c838d5ef56be15f3a25c4f506c6fb (diff)
download	definitions-b4d53e2cc0e63babbc4b3fec8a68ae67f47fab00.tar.gz