From 0c8b5f57bc996f4f8533ddde65756713660166f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20K=C3=B6nig?= <leonard.r.koenig@googlemail.com> Date: Tue, 2 Jun 2020 19:32:48 +0200 Subject: [PATCH] WIP: deactivate patches --- setup.sh | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/setup.sh b/setup.sh index 493297f..e83bf75 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 -- GitLab