continuous: Improve patch script to make bisecting easier

[can-benchmark.git] / continuous / steps / 11-patch

diff --git a/continuous/steps/11-patch b/continuous/steps/11-patch
index 79ed0f470dd1e993f667280c963986082fcf2f12..6ae59dc29e3a82a51fc38bc837ba3de1d186c3e4 100755 (executable)
--- a/continuous/steps/11-patch
+++ b/continuous/steps/11-patch
@@ -21,9 +21,15 @@ function vercmp()
     dpkg --compare-versions $v1 $op $v2
 }
 
-if vercmp v4.2-rc2-34-g0b05e2d lt $(git describe); then
+git_desc=$(git describe)
+
+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