continuous: Revert failing commit

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

diff --git a/continuous/steps/11-patch b/continuous/steps/11-patch
index e3d20beead52e50ded7de75f1fccc61ab940d934..a64eaafdd0c63eae351c99ff89e822f98b352eba 100755 (executable)
--- a/continuous/steps/11-patch
+++ b/continuous/steps/11-patch
@@ -1,9 +1,44 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
 cd linux
 
+git reset --hard
+
 echo "! Repo $(git config remote.origin.url) $(git describe) $(git rev-parse HEAD) ok"
 
-git am < ../shark-ryu-board-patch.patch
+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 -q $(git rev-parse HEAD); then
+    # Revert commit that causes unbootable system (v4.2-rc2-34-g0b05e2d)
+    git revert --no-edit 0b05e2d671c40cfb57e66e4e402320d6e056b2f8 # powerpc/32: cacheable_memcpy becomes memcpy
+    git reset HEAD^ # Do not commit revert - this helps with bisecting
+fi
+
+if git rev-list --ancestry-path 990486c8af044f89bddfbde1d1cf9fde449bedbf^..7a5692e6e533fd379081ab06fb58f3f5ee4d80bc^|grep -q $(git rev-parse HEAD); then
+    # Revert commit that causes compile error (v4.3-rc4-3-g990486c)
+    git revert --no-edit 990486c8af044f89bddfbde1d1cf9fde449bedbf # strscpy: zero any trailing garbage bytes in the destination
+    git reset HEAD^ # Do not commit revert - this helps with bisecting
+fi
+
+if git rev-list v4.6-rc6..HEAD|grep -q 7322dd755e7dd34bc5359aa27abeed1687e0f628; then
+   # Revert commit that causes compile error
+    git revert --no-edit 7322dd755e7dd34bc5359aa27abeed1687e0f628 # byteswap: try to avoid __builtin_constant_p gcc bug
+    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