Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OcPeCoffExtLib: Add support for FixupAppleEfiImages quirk #498

Merged
merged 3 commits into from
Nov 3, 2023

Conversation

mikebeaton
Copy link
Contributor

@mikebeaton mikebeaton commented Nov 2, 2023

Fixes acidanthera/bugtracker#2233

For the purposes of viewing the changes, I strongly recommend mikebeaton@b6d5baf (i.e. commit 2/3), since this makes it very clear how OcPeCoffFixup.c relates to PeCoffInit.c which it came from.

  • Commit 1/3 imports the two files from BasePeCoffLib2 with no changes (except renaming PeCoffInit.c -> OcPeCoffFixup.c)
  • Commit 2/3 all the actual changes, making it easy to see what changed between PeCoffInit.c -> OcPeCoffFixup.c
  • Commit 3/3 just the required uncrustify changes to OcPeCoffFixup.c

Since all three commits are valid builds of OpenCore (with only Uncrustify errors, only in one file, in 1/3 and 2/3), then I suggest it might be worth keeping this three-commit structure in the main branch (i.e. not accepting as a merge commit, but just pushing the tip of this branch to master to accept the changes and auto-close the PR), so that it keeps the reference commit where it's easy to see the changes made between PeCoffInit.c and OcPeCoffFixup.c.

@mikebeaton
Copy link
Contributor Author

Worth pointing out that the functionality I've implemented seems to overlap somewhat (but not quite enough, I think) with this unused functionality: https://github.com/acidanthera/OpenCorePkg/pull/498/files#diff-a9f15dff840fe93b2f4cad53afc58083d8b3d8638439812968501119926b88a5R913-R917

Docs/Configuration.tex Outdated Show resolved Hide resolved
@vit9696
Copy link
Contributor

vit9696 commented Nov 2, 2023

Code looks perfectly correct to me.

@mikebeaton mikebeaton force-pushed the legacy-efi branch 2 times, most recently from cff6bee to db6f6c1 Compare November 2, 2023 21:39
@mikebeaton
Copy link
Contributor Author

mikebeaton commented Nov 2, 2023

Code looks perfectly correct to me.

Good code design, obviously! ;) Thank you, though.

@vit9696 vit9696 merged commit 5f15e83 into acidanthera:master Nov 3, 2023
11 checks passed
kokowski pushed a commit to kokowski/OpenCorePkg that referenced this pull request Nov 20, 2023
@mikebeaton mikebeaton deleted the legacy-efi branch April 29, 2024 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

LegacyBoot no longer loads IA32 10.4/10.5 after 0.8.8
2 participants