Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
OpenSK
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
koenigl2
OpenSK
Commits
a13f67a1
Commit
a13f67a1
authored
4 years ago
by
koenigl
Browse files
Options
Downloads
Patches
Plain Diff
re-enable timer patch
parent
a3885e25
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
setup.sh
+18
-13
18 additions, 13 deletions
setup.sh
with
18 additions
and
13 deletions
setup.sh
+
18
−
13
View file @
a13f67a1
...
@@ -67,19 +67,24 @@ echo $done_text
...
@@ -67,19 +67,24 @@ echo $done_text
#)
#)
# Now apply patches to libtock-rs. Do that in a sub-shell
# Now apply patches to libtock-rs. Do that in a sub-shell
#(
(
# cd third_party/libtock-rs/ && \
cd
third_party/libtock-rs/
&&
\
# for p in ../../patches/libtock-rs/[0-9][0-9]-*.patch
for
p
in
../../patches/libtock-rs/[0-9][0-9]-
*
.patch
# do
do
# echo -n '[-] Applying patch "'$(basename $p)'"... '
if
[
$p
!=
../../patches/libtock-rs/03-timer.patch
]
# if git apply "$p"
then
# then
echo
"Ignoring patch
$p
"
# echo $done_text
continue
# else
fi
# patch_conflict_detected
echo
-n
'[-] Applying patch "'
$(
basename
$p
)
'"... '
# fi
if
git apply
"
$p
"
# done
then
#)
echo
$done_text
else
patch_conflict_detected
fi
done
)
# Ensure we have certificates, keys, etc. so that the tests can run
# Ensure we have certificates, keys, etc. so that the tests can run
source
tools/gen_key_materials.sh
source
tools/gen_key_materials.sh
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment