diff --git a/setup.sh b/setup.sh index 493297f9e5d9533debb3956f2e2dbb921fd61e5d..e83bf7514b90a4a07b72a056c0e09b2811e2daad 100755 --- a/setup.sh +++ b/setup.sh @@ -52,34 +52,34 @@ 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 -) +#( +# 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 -( - 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 +# 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