projects
/
can-benchmark.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4716e20
)
continuous: Improve patch script to make bisecting easier
author
Michal Sojka
<sojkam1@fel.cvut.cz>
Sat, 19 Sep 2015 11:52:29 +0000
(13:52 +0200)
committer
Michal Sojka
<sojkam1@fel.cvut.cz>
Sat, 19 Sep 2015 11:52:29 +0000
(13:52 +0200)
continuous/steps/11-patch
patch
|
blob
|
history
diff --git
a/continuous/steps/11-patch
b/continuous/steps/11-patch
index
8c5397c
..
6ae59dc
100755
(executable)
--- a/
continuous/steps/11-patch
+++ b/
continuous/steps/11-patch
@@
-27,6
+27,9
@@
if vercmp v4.2-rc2-34-g0b05e2d lt $git_desc &&
vercmp v4.3-rc1-144-gf240bdd gt $git_desc ; then
# Revert commit that causes unbootable system
git revert --no-edit 0b05e2d671c40cfb57e66e4e402320d6e056b2f8 # powerpc/32: cacheable_memcpy becomes memcpy
+ git reset HEAD^ # Do not commit revert - this helps with bisecting
fi
+# It the dts file exists, next command fails
+rm -f arch/powerpc/boot/dts/shark-ryu.dts
git apply --index < ../shark-ryu-board-patch.patch