diff --git a/setup.sh b/setup.sh index e83bf7514b90a4a07b72a056c0e09b2811e2daad..6425ee94ecf58fbb8a7bfe2b12bd84b47c070aa5 100755 --- a/setup.sh +++ b/setup.sh @@ -67,19 +67,24 @@ echo $done_text #) # Now apply patches to libtock-rs. Do that in a sub-shell -#( -# 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 -#) +( + cd third_party/libtock-rs/ && \ + for p in ../../patches/libtock-rs/[0-9][0-9]-*.patch + do + if [ $p != ../../patches/libtock-rs/03-timer.patch ] + then + echo "Ignoring patch $p" + continue + fi + 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