From c9dce7f204f54e2856eb21e3447377689cff7ffb Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Mon, 4 Sep 2023 15:27:21 +0100 Subject: [PATCH 1/3] Ensure CCache disabled for all reproducible jdk-17 & jdk-19+ builds Signed-off-by: Andrew Leonard --- sbin/build.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sbin/build.sh b/sbin/build.sh index 7595af3c2..e1ed66277 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -100,9 +100,8 @@ configureReproducibleBuildParameter() { then # TZ issue: https://github.com/adoptium/temurin-build/issues/3075 export TZ=UTC - # Use release date and disable CCache( remove --enable-ccache if exist) - addConfigureArg "--with-source-date=version" " --disable-ccache" - CONFIGURE_ARGS="${CONFIGURE_ARGS//--enable-ccache/}" + # Use release date + addConfigureArg "--with-source-date=" "version" else # Use BUILD_TIMESTAMP date @@ -120,6 +119,11 @@ configureReproducibleBuildParameter() { # Use supplied date addConfigureArg "--with-hotspot-build-time=" "'${BUILD_CONFIG[BUILD_TIMESTAMP]}'" fi + + # disable CCache (remove --enable-ccache if exist) + addConfigureArg "--disable-ccache" + CONFIGURE_ARGS="${CONFIGURE_ARGS//--enable-ccache/}" + # Ensure reproducible and comparable binary with a unique build user identifier addConfigureArg "--with-build-user=" "admin" if [ "${BUILD_CONFIG[OS_KERNEL_NAME]}" == "aix" ]; then From 4b063ac6e8b4519bc25ad08b7be2531aa3f1f1c3 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Mon, 4 Sep 2023 15:37:35 +0100 Subject: [PATCH 2/3] Ensure TZ is UTC for all reproducible jdk-17 & jdk-19+ builds Signed-off-by: Andrew Leonard --- sbin/build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sbin/build.sh b/sbin/build.sh index e1ed66277..7b951a418 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -98,8 +98,6 @@ configureReproducibleBuildParameter() { # Enable reproducible builds implicitly with --with-source-date if [ "${BUILD_CONFIG[RELEASE]}" == "true" ] then - # TZ issue: https://github.com/adoptium/temurin-build/issues/3075 - export TZ=UTC # Use release date addConfigureArg "--with-source-date=" "version" else @@ -120,6 +118,9 @@ configureReproducibleBuildParameter() { addConfigureArg "--with-hotspot-build-time=" "'${BUILD_CONFIG[BUILD_TIMESTAMP]}'" fi + # TZ issue: https://github.com/adoptium/temurin-build/issues/3075 + export TZ=UTC + # disable CCache (remove --enable-ccache if exist) addConfigureArg "--disable-ccache" CONFIGURE_ARGS="${CONFIGURE_ARGS//--enable-ccache/}" From 8e07e5b6df50c0a29b35b0738ed12f9f059daa68 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Mon, 4 Sep 2023 15:43:00 +0100 Subject: [PATCH 3/3] Ensure CCache disabled for all reproducible jdk-17 & jdk-19+ builds Signed-off-by: Andrew Leonard --- sbin/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/build.sh b/sbin/build.sh index 7b951a418..b27bf8c14 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -122,7 +122,7 @@ configureReproducibleBuildParameter() { export TZ=UTC # disable CCache (remove --enable-ccache if exist) - addConfigureArg "--disable-ccache" + addConfigureArg "--disable-ccache" "" CONFIGURE_ARGS="${CONFIGURE_ARGS//--enable-ccache/}" # Ensure reproducible and comparable binary with a unique build user identifier