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

Prevent jdk11+ from running external sign.sh as already signed during… #4083

Merged
merged 3 commits into from
Dec 11, 2024

Conversation

andrew-m-leonard
Copy link
Contributor

@andrew-m-leonard andrew-m-leonard commented Dec 10, 2024

Fixes #3997 and #4057

Eclipse Temurin jdk-11+ Windows & Mac signing is performed internally during the jmod build, if sign_build is called after the build, we end up with "duplicate" Signatures, and for jdk-24+ the JDK runtime is modified causing a runtime failure due to the new jlink runtime verification.

This PR ensure for Eclipse Temurin signing, only jdk8u signs everything, and for jdk-11+ ONLY Contents/MacOS/libjli.dylib is signed, which is the bundle executable entry point which has to be signed post-bundle build.

@github-actions github-actions bot added jenkins Issues that enhance or fix our jenkins server installer Issues that relate to our installer jobs or installer repo labels Dec 10, 2024
@andrew-m-leonard andrew-m-leonard self-assigned this Dec 10, 2024
@merks
Copy link

merks commented Dec 11, 2024

I'm looking forward to this being fixed in 24+27...

Given two reviewers are required to merge this fix, assigning an additional reviewer would be a good thing. 😬

@andrew-m-leonard
Copy link
Contributor Author

I'm looking forward to this being fixed in 24+27...

Given two reviewers are required to merge this fix, assigning an additional reviewer would be a good thing. 😬

@merks hi, i'm hoping to get this merged today. I then need to do some separate work to build jdk24 which has now branched from mainstream jdk(head(25)) upstream, hopeful I can get that done in the next day too.

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks OK to me. Thanks for tracking this libjli.dylib issue down in the MacOS folder!

sign.sh Outdated Show resolved Hide resolved
Co-authored-by: Severin Gehwolf <[email protected]>
@andrew-m-leonard andrew-m-leonard merged commit 71311f8 into adoptium:master Dec 11, 2024
15 of 26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
installer Issues that relate to our installer jobs or installer repo jenkins Issues that enhance or fix our jenkins server
Projects
None yet
4 participants