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 incorrect jdkbinary JDK folder directory when run from Rebuild_Same_JDK_Reproducibility_Test #4032

Closed
wants to merge 10 commits into from
9 changes: 8 additions & 1 deletion tooling/reproducible/linux_repro_build_compare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@

# This script examines the given SBOM metadata file, and then builds the exact same binary
# and then compares with the supplied TARBALL_PARAM.
# SBOM_PARAM : One of:
# URL of SBOM metadata json file
# Path to SBOM metadata json file
# JDK_PARAM : One of:
# URL of JDK tarball
# Path to JDK tarball file
# Local directory that contains the given expanded "jdk-V.0.M+B" JDK folder

set -e

Expand Down Expand Up @@ -188,7 +195,7 @@ elif [[ $JDK_PARAM =~ tar.gz ]]; then
tar xpfz "$JDK_PARAM" --strip-components=1 -C "$PWD/jdk-${TEMURIN_VERSION}"
else
# Local jdk dir
cp -R "${JDK_PARAM}"/* "${sourceJDK}"
cp -R "${JDK_PARAM}/jdk-${TEMURIN_VERSION}"/* "${sourceJDK}"
fi

echo "Rebuild args for makejdk_any_platform.sh are: $TEMURIN_BUILD_ARGS"
Expand Down
Loading