From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Wed, 10 Aug 2016 10:43:15 +0000 (+0200)
Subject: continuous: Apply fixup patch in a better way
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/af9262178bbb969da392479ddd8bbfbf2e044a07

continuous: Apply fixup patch in a better way

The patch is made smaller to apply even after changing surrounding
lines. This allows the patch to be applied to all commits before
introducing the big and applying the fix (in mainline).

Unfortunately, another bug seems to be present there, which cases
MPC5200 not to boot.
---

diff --git a/continuous/steps/11-patch b/continuous/steps/11-patch
index 2252828..fa78e34 100755
--- a/continuous/steps/11-patch
+++ b/continuous/steps/11-patch
@@ -43,20 +43,16 @@ if git rev-list --ancestry-path 7322dd755e7dd34bc5359aa27abeed1687e0f628^..v4.6^
     git reset HEAD^ # Do not commit revert - this helps with bisecting
 fi
 
-if git rev-list --ancestry-path 9402c684613163888714df0955fa1f17142b08bf^..a28e46f109c9637b2539b9995078d5df4f7f6c09^|grep -q $(git rev-parse HEAD); then
+if git rev-list --ancestry-path 9402c684613163888714df0955fa1f17142b08bf^..2c0f99516f53911c3f2f81ab3815841e3408f11e^|grep -q $(git rev-parse HEAD); then
     # Apply fix for commit that breaks boot
     git apply --index <<EOF
 --- a/arch/powerpc/lib/feature-fixups.c
 +++ b/arch/powerpc/lib/feature-fixups.c
-@@ -154,7 +154,7 @@ static void do_final_fixups(void)
-
- void apply_feature_fixups(void)
+@@ -154,3 +154,3 @@ static void do_final_fixups(void)
  {
 -	struct cpu_spec *spec = *PTRRELOC(&cur_cpu_spec);
 +	struct cpu_spec *spec = PTRRELOC(*PTRRELOC(&cur_cpu_spec));
  
- 	/*
- 	 * Apply the CPU-specific and firmware specific fixups to kernel text
 EOF
 fi