Error When Applying edk2 Patch

andreiw / RaspberryPiPkg

DEPRECATED - DO NOT USE | Go here instead ->

https://github.com/tianocore/edk2-platforms/tree/master/Platform/RaspberryPi/RPi3

746 stars 143 forks source link

Error When Applying edk2 Patch #115

Closed GlennHS closed 5 years ago

GlennHS commented 5 years ago

warning: BaseTools/Conf/tools_def.template has type 100644, expected 100755
error: patch failed: BaseTools/Conf/tools_def.template:4152
error: BaseTools/Conf/tools_def.template: patch does not apply

This is after applying the rollback to the last stable commit. My directory structure is as follows

/RaspberryPiPkg

|=edk2Patches

|=|=0001-BaseTools...

/edk2

Thanks

andreiw commented 5 years ago

Chmod the referenced file in the error message to be 755 (ie +x)?