Skip to content

Commit 09aab46

Browse files
steelhead31steelhead31
committed
Fix Issue With Debian Package Determinism
1 parent 9b75b6c commit 09aab46

File tree

30 files changed

+121
-0
lines changed

30 files changed

+121
-0
lines changed

‎linux/jdk/debian/src/main/packaging/temurin/11/debian/rules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ override_dh_auto_clean:
2626
override_dh_auto_test:
2727
override_dh_auto_build:
2828
override_dh_strip:
29+
# Don't let dh_strip_nondeterminism rewrite JDK jars/jmods used by jlink
30+
# https://github.com/adoptium/installer/issues/1274
31+
override_dh_strip_nondeterminism:
32+
dh_strip_nondeterminism -Xjrt-fs.jar -Xjmods -X$(jvm_home)/$(jvm_dir)
2933
override_dh_auto_install:
3034
# Download and verify checksum of JDK
3135
wget --progress=dot:mega -O jdk.tar.gz $($(DEB_HOST_ARCH)_tarball_url)

‎linux/jdk/debian/src/main/packaging/temurin/17/debian/rules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ override_dh_auto_clean:
2828
override_dh_auto_test:
2929
override_dh_auto_build:
3030
override_dh_strip:
31+
# Don't let dh_strip_nondeterminism rewrite JDK jars/jmods used by jlink
32+
# https://github.com/adoptium/installer/issues/1274
33+
override_dh_strip_nondeterminism:
34+
dh_strip_nondeterminism -Xjrt-fs.jar -Xjmods -X$(jvm_home)/$(jvm_dir)
3135
override_dh_auto_install:
3236
# Download and verify checksum of JDK
3337
wget --progress=dot:mega -O jdk.tar.gz $($(DEB_HOST_ARCH)_tarball_url)

‎linux/jdk/debian/src/main/packaging/temurin/19/debian/rules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ override_dh_auto_clean:
2626
override_dh_auto_test:
2727
override_dh_auto_build:
2828
override_dh_strip:
29+
# Don't let dh_strip_nondeterminism rewrite JDK jars/jmods used by jlink
30+
# https://github.com/adoptium/installer/issues/1274
31+
override_dh_strip_nondeterminism:
32+
dh_strip_nondeterminism -Xjrt-fs.jar -Xjmods -X$(jvm_home)/$(jvm_dir)
2933
override_dh_auto_install:
3034
# Download and verify checksum of JDK
3135
wget --progress=dot:mega -O jdk.tar.gz $($(DEB_HOST_ARCH)_tarball_url)

‎linux/jdk/debian/src/main/packaging/temurin/20/debian/rules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ override_dh_auto_clean:
2020
override_dh_auto_test:
2121
override_dh_auto_build:
2222
override_dh_strip:
23+
# Don't let dh_strip_nondeterminism rewrite JDK jars/jmods used by jlink
24+
# https://github.com/adoptium/installer/issues/1274
25+
override_dh_strip_nondeterminism:
26+
dh_strip_nondeterminism -Xjrt-fs.jar -Xjmods -X$(jvm_home)/$(jvm_dir)
2327
override_dh_auto_install:
2428
# Download and verify checksum of JDK
2529
wget --progress=dot:mega -O jdk.tar.gz $($(DEB_HOST_ARCH)_tarball_url)

‎linux/jdk/debian/src/main/packaging/temurin/21/debian/rules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ override_dh_auto_clean:
2626
override_dh_auto_test:
2727
override_dh_auto_build:
2828
override_dh_strip:
29+
# Don't let dh_strip_nondeterminism rewrite JDK jars/jmods used by jlink
30+
# https://github.com/adoptium/installer/issues/1274
31+
override_dh_strip_nondeterminism:
32+
dh_strip_nondeterminism -Xjrt-fs.jar -Xjmods -X$(jvm_home)/$(jvm_dir)
2933
override_dh_auto_install:
3034
# Download and verify checksum of JDK
3135
wget --progress=dot:mega -O jdk.tar.gz $($(DEB_HOST_ARCH)_tarball_url)

‎linux/jdk/debian/src/main/packaging/temurin/22/debian/rules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ override_dh_auto_clean:
2626
override_dh_auto_test:
2727
override_dh_auto_build:
2828
override_dh_strip:
29+
# Don't let dh_strip_nondeterminism rewrite JDK jars/jmods used by jlink
30+
# https://github.com/adoptium/installer/issues/1274
31+
override_dh_strip_nondeterminism:
32+
dh_strip_nondeterminism -Xjrt-fs.jar -Xjmods -X$(jvm_home)/$(jvm_dir)
2933
override_dh_auto_install:
3034
# Download and verify checksum of JDK
3135
wget --progress=dot:mega -O jdk.tar.gz $($(DEB_HOST_ARCH)_tarball_url)

‎linux/jdk/debian/src/main/packaging/temurin/23/debian/rules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ override_dh_auto_clean:
2727
override_dh_auto_test:
2828
override_dh_auto_build:
2929
override_dh_strip:
30+
# Don't let dh_strip_nondeterminism rewrite JDK jars/jmods used by jlink
31+
# https://github.com/adoptium/installer/issues/1274
32+
override_dh_strip_nondeterminism:
33+
dh_strip_nondeterminism -Xjrt-fs.jar -Xjmods -X$(jvm_home)/$(jvm_dir)
3034
override_dh_auto_install:
3135
# Download and verify checksum of JDK
3236
wget --progress=dot:mega -O jdk.tar.gz $($(DEB_HOST_ARCH)_tarball_url)

‎linux/jdk/debian/src/main/packaging/temurin/8/debian/rules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ override_dh_auto_clean:
2525
override_dh_auto_test:
2626
override_dh_auto_build:
2727
override_dh_strip:
28+
# Don't let dh_strip_nondeterminism rewrite JDK jars/jmods used by jlink
29+
# https://github.com/adoptium/installer/issues/1274
30+
override_dh_strip_nondeterminism:
31+
dh_strip_nondeterminism -Xjrt-fs.jar -Xjmods -X$(jvm_home)/$(jvm_dir)
2832
override_dh_auto_install:
2933
# Download and verify checksum of JDK
3034
wget --progress=dot:mega -O jdk.tar.gz $($(DEB_HOST_ARCH)_tarball_url)

‎linux/jre/debian/src/main/packaging/temurin/11/debian/rules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ override_dh_auto_clean:
2626
override_dh_auto_test:
2727
override_dh_auto_build:
2828
override_dh_strip:
29+
# Don't let dh_strip_nondeterminism rewrite JDK jars/jmods used by jlink
30+
# https://github.com/adoptium/installer/issues/1274
31+
override_dh_strip_nondeterminism:
32+
dh_strip_nondeterminism -Xjrt-fs.jar -Xjmods -X$(jvm_home)/$(jvm_dir)
2933
override_dh_auto_install:
3034
# Download and verify checksum of JRE
3135
wget --progress=dot:mega -O jre.tar.gz $($(DEB_HOST_ARCH)_tarball_url)

‎linux/jre/debian/src/main/packaging/temurin/17/debian/rules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ override_dh_auto_clean:
2828
override_dh_auto_test:
2929
override_dh_auto_build:
3030
override_dh_strip:
31+
# Don't let dh_strip_nondeterminism rewrite JDK jars/jmods used by jlink
32+
# https://github.com/adoptium/installer/issues/1274
33+
override_dh_strip_nondeterminism:
34+
dh_strip_nondeterminism -Xjrt-fs.jar -Xjmods -X$(jvm_home)/$(jvm_dir)
3135
override_dh_auto_install:
3236
# Download and verify checksum of JRE
3337
wget --progress=dot:mega -O jre.tar.gz $($(DEB_HOST_ARCH)_tarball_url)

0 commit comments

Comments
 (0)