From d017e2c38ecf8117ba62471652e069b67376e19c Mon Sep 17 00:00:00 2001 From: Daniel Scanteianu Date: Tue, 11 Feb 2025 13:21:06 +0000 Subject: [PATCH] Metadata Directly In SBOM (#4122) * 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 --- sbin/build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sbin/build.sh b/sbin/build.sh index 59e7e8269..8652296f4 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -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 @@ -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