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.

Sign up for GitHub

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

Jump to bottom

Fix SBOM glibc, gcc and bootjdk settings #3447

Merged
merged 28 commits into from
Aug 9, 2023
Merged

Fix SBOM glibc, gcc and bootjdk settings #3447

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 •
edited
Loading

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
Fix SBOM glibc and gcc version info
d198af5 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Ensure SBOM BOOTJDK is full version including build
2681d93 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
b1cfc6b 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard andrew-m-leonard self-assigned this Aug 4, 2023
@andrew-m-leonard
Fix SBOM glibc and gcc version info
26a2c71 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
4dc6265 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
b2bf0b7 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
bc5e8ec 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard andrew-m-leonard marked this pull request as draft August 4, 2023 13:13
@andrew-m-leonard
Fix SBOM glibc and gcc version info
6867572 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
7b10688 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
b4400d0 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
aa3c5fa 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
8ffcab7 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
1d376eb 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
b95d6ac 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
af70b81 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
059934f 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
gdams
gdams reviewed Aug 6, 2023
View reviewed changes
sbin/build.sh Outdated Show resolved Hide resolved
gdams
gdams reviewed Aug 6, 2023
View reviewed changes
sbin/build.sh Outdated Show resolved Hide resolved
@andrew-m-leonard
Fix SBOM glibc and gcc version info
0c8ea5e 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
43e8380 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
4450a58 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
7f89b81 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
b38d1ae 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
6c7a3bd 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
7dcb0a1 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
09f9335 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
5ed912f 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
9fbc441 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
dca42e7 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Fix SBOM glibc and gcc version info
3862423 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@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
@sxa sxa mentioned this pull request Oct 3, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gdams gdams gdams approved these changes

@karianna karianna karianna approved these changes

@sxa sxa Awaiting requested review from sxa

Assignees

@andrew-m-leonard andrew-m-leonard

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

SBOM json missing some reproducible required fields
3 participants
@andrew-m-leonard @karianna @gdams