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

Fix SBOM glibc, gcc and bootjdk settings #3447

Merged
merged 28 commits into from
Aug 9, 2023

Conversation

andrew-m-leonard
Copy link
Contributor

@andrew-m-leonard andrew-m-leonard commented Aug 4, 2023

Fixes #3445

Currently GLIBC is not being detected correctly.
Bootjdk is also missing the "+build".

  • Fixed various grep/sed and invocation issues with getting GLIBC settings from features.h, and ensure works on all platforms.
  • Updated to detect libc type from the build configuration, and then handle MUSL or GLIBC accordingly.
  • Fixed Bootjdk detect to find btto jdk location from the build configuration, and then obtain the java.runtime.version.

@andrew-m-leonard andrew-m-leonard self-assigned this Aug 4, 2023
@andrew-m-leonard andrew-m-leonard marked this pull request as draft August 4, 2023 13:13
sbin/build.sh Outdated Show resolved Hide resolved
sbin/build.sh Outdated Show resolved Hide resolved
@andrew-m-leonard andrew-m-leonard marked this pull request as ready for review August 9, 2023 09:31
@karianna karianna merged commit 25c3f1f into adoptium:master Aug 9, 2023
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

SBOM json missing some reproducible required fields
3 participants