12 files changed, 42 insertions, 21 deletions
diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph
index e378cca5..59f7155f 100644
--- a/clusters/jetson-upgrade.morph
+++ b/clusters/jetson-upgrade.morph
@@ -1,7 +1,7 @@
 name: jetson-upgrade
 kind: cluster
 systems:
-- morph: devel-system-armv7lhf-jetson
+- morph: systems/devel-system-armv7lhf-jetson.morph
   deploy-defaults:
     TROVE_HOST: TROVE_HOST
     TROVE_ID: TROVE_ID
@@ -15,4 +15,3 @@ systems:
     jetson:
         type: ssh-rsync
         location: root@localhost
-        HOSTNAME: baserock-jetson
diff --git a/distbuild.configure b/distbuild.configure
index 79148106..d9b9fb8a 100644
--- a/distbuild.configure
+++ b/distbuild.configure
@@ -40,13 +40,12 @@
 
 set -e
 
-set -u
-
 if [ -n "$DISTBUILD_GENERIC" ]; then
     echo "Not configuring the distbuild node, it will be generic"
     exit 0
 fi
 
+set -u
 
 # Check that all the variables needed are present:
 
diff --git a/mason.configure b/mason.configure
index 4341d8c0..4d11feb4 100644
--- a/mason.configure
+++ b/mason.configure
@@ -102,19 +102,18 @@ mkdir -p "$MASON_DATA"
 python <<'EOF' >"$MASON_DATA/mason.conf"
 import os, sys, yaml
 
-trove_configuration={
-    'ARTIFACT_CACHE_SERVIER': os.environ['ARTIFACT_CACHE_SERVER'],
+mason_configuration={
+    'ARTIFACT_CACHE_SERVER': os.environ['ARTIFACT_CACHE_SERVER'],
     'MASON_CLUSTER_MORPHOLOGY': os.environ['MASON_CLUSTER_MORPHOLOGY'],
     'MASON_DEFINITIONS_REF': os.environ['MASON_DEFINITIONS_REF'],
     'MASON_DISTBUILD_ARCH': os.environ['MASON_DISTBUILD_ARCH'],
     'MASON_TEST_HOST': os.environ['MASON_TEST_HOST'],
-    'TROVE_ADMIN_NAME': os.environ['TROVE_ADMIN_NAME'],
     'TROVE_ID': os.environ['TROVE_ID'],
     'TROVE_HOST': os.environ['TROVE_HOST'],
     'CONTROLLERHOST': os.environ['CONTROLLERHOST'],
 }
 
-yaml.dump(trove_configuration, sys.stdout, default_flow_style=False)
+yaml.dump(mason_configuration, sys.stdout, default_flow_style=False)
 EOF
 
 
diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph
index 0e2f7922..c76ae537 100644
--- a/strata/armv7lhf-cross-toolchain.morph
+++ b/strata/armv7lhf-cross-toolchain.morph
@@ -13,8 +13,8 @@ chunks:
 - name: armv7lhf-cross-linux-api-headers
   morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
   repo: upstream:linux
-  ref: eff825d6e284eb0fb04b434429a3e3b2e10cabf8
-  unpetrify-ref: baserock/build-essential
+  ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
+  unpetrify-ref: baserock/v3.8
   build-depends: []
 - name: armv7lhf-cross-gcc-nolibc
   morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph
diff --git a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
index 351134b7..c2654419 100644
--- a/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
+++ b/strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph
@@ -1,7 +1,6 @@
 name: armv7lhf-cross-linux-api-headers
 kind: chunk
 install-commands:
-- make mrproper
 - ARCH=arm make INSTALL_HDR_PATH=dest headers_install
 - |
   # Copy headers to the sysroot where the eglibc build will find them,
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 3918a13e..7886b610 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -58,8 +58,8 @@ chunks:
 - name: stage2-linux-api-headers
   morph: strata/build-essential/stage2-linux-api-headers.morph
   repo: upstream:linux
-  ref: eff825d6e284eb0fb04b434429a3e3b2e10cabf8
-  unpetrify-ref: baserock/build-essential
+  ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
+  unpetrify-ref: baserock/v3.8
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -181,8 +181,8 @@ chunks:
 - name: linux-api-headers
   morph: strata/build-essential/linux-api-headers.morph
   repo: upstream:linux
-  ref: eff825d6e284eb0fb04b434429a3e3b2e10cabf8
-  unpetrify-ref: baserock/build-essential
+  ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa
+  unpetrify-ref: baserock/v3.8
   build-depends:
   - stage2-binutils
   - stage2-busybox
diff --git a/strata/build-essential/linux-api-headers.morph b/strata/build-essential/linux-api-headers.morph
index d28b0905..e1ff2638 100644
--- a/strata/build-essential/linux-api-headers.morph
+++ b/strata/build-essential/linux-api-headers.morph
@@ -1,7 +1,6 @@
 name: linux-api-headers
 kind: chunk
 install-commands:
-- make mrproper
 - ARCH=$(./morph-arch) make INSTALL_HDR_PATH=dest headers_install
 - install -d "$DESTDIR${PREFIX-/usr}/include"
 - cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
diff --git a/strata/build-essential/stage2-linux-api-headers.morph b/strata/build-essential/stage2-linux-api-headers.morph
index e7d1f8ed..5cbf2f05 100644
--- a/strata/build-essential/stage2-linux-api-headers.morph
+++ b/strata/build-essential/stage2-linux-api-headers.morph
@@ -1,7 +1,6 @@
 name: stage2-linux-api-headers
 kind: chunk
 install-commands:
-- make mrproper
 - |
   export ARCH=$(./morph-arch)
   make INSTALL_HDR_PATH=dest headers_install
diff --git a/strata/core.morph b/strata/core.morph
index 4c6a23bf..f0f22871 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -13,8 +13,8 @@ chunks:
 - name: cmake
   morph: strata/core/cmake.morph
   repo: upstream:cmake
-  ref: 99c4f0a49237633372f218a44e3503e0a2bddae6
-  unpetrify-ref: baserock/morph
+  ref: 0b3781e4c497566acaa504d4106d11c02a642501
+  unpetrify-ref: v2.8.12.2
   build-depends: []
 - name: gdbm
   morph: strata/core/gdbm.morph
@@ -166,6 +166,14 @@ chunks:
   - cpython
   - libtool
   - xz
+- name: ca-certificates
+  morph: strata/core/ca-certificates.morph
+  repo: upstream:ca-certificates
+  ref: e9b06b26d9e57444e74a5cb6beca3f12726fc3c6
+  unpetrify-ref: baserock/debian/20140325
+  build-depends:
+  - automake
+  - cpython
 - name: curl
   morph: strata/core/curl.morph
   repo: upstream:curl
@@ -176,6 +184,7 @@ chunks:
   - automake
   - libtool
   - openssl-new
+  - ca-certificates
 - name: libexpat
   morph: strata/core/libexpat.morph
   repo: upstream:libexpat
diff --git a/strata/core/ca-certificates.morph b/strata/core/ca-certificates.morph
new file mode 100644
index 00000000..3072e4f3
--- /dev/null
+++ b/strata/core/ca-certificates.morph
@@ -0,0 +1,18 @@
+name: ca-certificates
+kind: chunk
+build-system: autotools
+configure-commands: []
+pre-install-commands:
+- mkdir -p "$DESTDIR"/usr/share/ca-certificates
+- mkdir -p "$DESTDIR"/usr/sbin
+post-install-commands:
+- mkdir "$DESTDIR"/etc
+- |
+  cd "$DESTDIR"/usr/share/ca-certificates
+  find * -type f > "$DESTDIR"/etc/ca-certificates.conf
+- |
+  export CERTSCONF="$DESTDIR/etc/ca-certificates.conf"
+  export CERTSDIR="$DESTDIR/usr/share/ca-certificates"
+  export ETCCERTSDIR="$DESTDIR/etc/ssl/certs"
+  mkdir -p "$ETCCERTSDIR"
+  ./sbin/update-ca-certificates
diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph
index 50a230d6..7b1a362b 100644
--- a/strata/cross-bootstrap.morph
+++ b/strata/cross-bootstrap.morph
@@ -74,7 +74,7 @@ chunks:
   - six
 - name: morph
   repo: baserock:baserock/morph
-  ref: a32de7934cce79dda2b8dc20be1c5ec94109869e
+  ref: b15babc4a166e476d5bcd3946e8db8e2d4583969
   unpetrify-ref: master
   build-depends:
   - cliapp
diff --git a/strata/tools.morph b/strata/tools.morph
index f1ce9d85..f9380943 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -100,7 +100,7 @@ chunks:
   - six
 - name: morph
   repo: baserock:baserock/morph
-  ref: c754d0366d4557910775bfa83c85ffdf98af0610
+  ref: b15babc4a166e476d5bcd3946e8db8e2d4583969
   unpetrify-ref: master
   build-depends:
   - cliapp