Skip to content

Commit

Permalink
Metadata Directly In SBOM (adoptium#4122)
Browse files Browse the repository at this point in the history
* add wsl option

* unnecessary echo

* breaking, but just Andrew's change

* move to --wsl option

* add message to readme

* add to man page

* add configure.txt

* Update build.sh

add space to trigger build

* snake case new props
  • Loading branch information
Scanteianu authored Feb 11, 2025
1 parent a858651 commit d017e2c
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion sbin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1121,6 +1121,11 @@ generateSBoM() {
addSBOMComponentPropertyFromFile "${javaHome}" "${classpath}" "${sbomJson}" "${componentName}" "makejdk_any_platform_args" "${BUILD_CONFIG[WORKSPACE_DIR]}/config/makejdk-any-platform.args"
# Add make_command_args JDK Component Property
addSBOMComponentPropertyFromFile "${javaHome}" "${classpath}" "${sbomJson}" "${componentName}" "make_command_args" "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[TARGET_DIR]}/metadata/makeCommandArg.txt"
# Add CONFIGURE_ARGS property
addSBOMComponentProperty "${javaHome}" "${classpath}" "${sbomJson}" "${componentName}" "configure_args" "${CONFIGURE_ARGS}"
# Add configure.txt JDK Component Property
addSBOMComponentPropertyFromFile "${javaHome}" "${classpath}" "${sbomJson}" "${componentName}" "configure_txt" "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[TARGET_DIR]}/metadata/configure.txt"

done


Expand All @@ -1137,7 +1142,7 @@ generateSBoM() {
local openjdkSrcDir="${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/${BUILD_CONFIG[OPENJDK_SOURCE_DIR]}"

# strace analysis needs to know the bootJDK and optional local DevKit/Toolchain, as these versions will
# be present in the analysis and not necessarily installed as packages
# be present in the analysis and not necessarily installed as packages
local devkit_path=$(getConfigureArgPath "--with-devkit")
local cc_path=$(getCCFromSpecGmk)
if [[ -n "${cc_path}" ]]; then
Expand Down

0 comments on commit d017e2c

Please sign in to comment.