Setup submodules before the rest so that GitHub workflows can find the rust-toolchain.

setup.sh

@@ -19,6 +19,9 @@ done_text="$(tput bold)DONE.$(tput sgr0)"
 
 set -e
 
+# Ensure the submodules are pulled and up-to-date, and apply patches
+./setup-submodules.sh
+
 # Check that rustup and pip3 are installed
 check_command () {
   if ! which "$1" >/dev/null
@@ -30,60 +33,6 @@ check_command () {
 check_command rustup " Follow the steps under https://rustup.rs/ to install it."
 check_command pip3
 
-# Ensure the submodules are pulled and up-to-date
-git submodule update --init
-
-patch_conflict_detected () {
-  cat <<EOF
-
-This script cannot be run twice without reverting the patches.
-
-To do so, follow these instructions:
-1. Commit any changes you want to save.
-2. Run the ./reset.sh script to revert all uncommitted changes.
-3. Run the ./setup.sh script again.
-EOF
-  exit 1
-}
-
-# Copy additional boards to the kernel.
-echo -n '[-] Copying additional boards to Tock... '
-cp -r boards/* third_party/tock/boards
-echo $done_text
-
-# Apply patches to kernel. Do that in a sub-shell.
-(
-  cd third_party/tock/ && \
-  for p in ../../patches/tock/[0-9][0-9]-*.patch
-  do
-    echo -n '[-] Applying patch "'$(basename $p)'"... '
-    if git apply "$p"
-    then
-      echo $done_text
-    else
-      patch_conflict_detected
-    fi
-  done
-)
-
-# Now apply patches to libtock-rs. Do that in a sub-shell.
-#
-# Commented out as there are not patches at the moment, and the pattern fails in
-# that case.
-#(
-#  cd third_party/libtock-rs/ && \
-#  for p in ../../patches/libtock-rs/[0-9][0-9]-*.patch
-#  do
-#    echo -n '[-] Applying patch "'$(basename $p)'"... '
-#    if git apply "$p"
-#    then
-#      echo $done_text
-#    else
-#      patch_conflict_detected
-#    fi
-#  done
-#)
-
 # Ensure we have certificates, keys, etc. so that the tests can run
 source tools/gen_key_materials.sh
 generate_crypto_materials N