Already Patched OTP is not detected anymore

grisp / rebar3_grisp

Rebar plug-in for GRiSP

https://www.grisp.org

Apache License 2.0

21 stars 10 forks source link

Already Patched OTP is not detected anymore #49

Closed holzingk closed 5 years ago

holzingk commented 5 years ago

Steps to reproduce:

Build OTP with some custom Drivers.
Rebuild.

===> sh(git apply --ignore-whitespace otp.patch)
failed with return code 1 and the following output:
error: Anwendung des Patches fehlgeschlagen: erts/emulator/Makefile.in:889
error: erts/emulator/Makefile.in: Patch konnte nicht angewendet werden

holzingk commented 5 years ago

The issue is that we are now changing two sections of the erts/emulator/Makefile.in thus the line numbers in the patch of the second change do not match up anymore after the patch has been applied once.

Proposed solution: Checkout a clean version of the file everytime and apply the patch everytime, since it's not an expensive task.

holzingk commented 5 years ago

Now I cannot reproduce it anymore myself.

I think the project i was using was in some unspecified state.