continuous: Fix determination of where we should revert

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

diff --git a/continuous/steps/11-patch b/continuous/steps/11-patch
index de5d6630285f1b07a2eb926eb0ed312521a79a6c..3a478c257c91db6fa589bc7cfb772a2b75a803b3 100755 (executable)
--- a/continuous/steps/11-patch
+++ b/continuous/steps/11-patch
@@ -1,6 +1,32 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
 cd linux
-git am < ../shark-ryu-board-patch.patch
+
+git reset --hard
+
+echo "! Repo $(git config remote.origin.url) $(git describe) $(git rev-parse HEAD) ok"
+
+function vercmp()
+{
+    v1=${1#v}
+    op=$2
+    v2=${3#v}
+
+    # Make release candidates sort before the final release
+    v1=${v1/rc/\~}
+    v2=${v2/rc/\~}
+
+    dpkg --compare-versions $v1 $op $v2
+}
+
+if git rev-list --ancestry-path 0b05e2d671c40cfb57e66e4e402320d6e056b2f8..1cd03890ea64795e53f17a94928cca22495acb2a^|grep $(git rev-parse HEAD); 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