continuous: Memcpy bug was fixed upstream

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

diff --git a/continuous/steps/11-patch b/continuous/steps/11-patch
index e3d20beead52e50ded7de75f1fccc61ab940d934..8c5397c26308d602e6fd41877842120b74c89803 100755 (executable)
--- a/continuous/steps/11-patch
+++ b/continuous/steps/11-patch
@@ -1,9 +1,32 @@
-#!/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
+}
+
+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
+fi
+
+git apply --index < ../shark-ryu-board-patch.patch