Revert broken commit until the problem is fixed (or patch reverted) upstream
authorMichal Sojka <sojkam1@fel.cvut.cz>
Sat, 5 Sep 2015 11:10:04 +0000 (13:10 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Sat, 5 Sep 2015 11:10:28 +0000 (13:10 +0200)
continuous/steps/11-patch

index 6a9fddb..79ed0f4 100755 (executable)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
@@ -8,4 +8,22 @@ 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 vercmp v4.2-rc2-34-g0b05e2d lt $(git describe); 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