downgraded Java17 to Java8 (8.72.0.17-ca-jre8.0.382) because of

incompatibilities in HMIPServer to run with Java versions > 8 (see #2470)
jens-maus · Oct 16, 2023 · d13f15e · d13f15e
1 parent 1310bc0
commit d13f15e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/buildroot-external/overlay/base/etc/init.d/S62HMServer b/buildroot-external/overlay/base/etc/init.d/S62HMServer
@@ -161,7 +161,7 @@ start() {
 
   # get the architecture
   ARCH=$(uname -m)
-  JAVAOPT="--add-opens java.base/sun.nio.ch=ALL-UNNAMED"
+  JAVAOPT=""
 
   # calculate the maximum used heap size (-Xmx) depending on the
   # total amount of RAM we have (use max. 25%) - use multiple of 128MB

diff --git a/buildroot-external/package/java-azul/java-azul.hash b/buildroot-external/package/java-azul/java-azul.hash
@@ -1,6 +1,6 @@
 # Locally computed
 sha256  4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726  LICENSE
-sha256  b1dbefe290685d2199422d9d510c62ce30a486492e3232800f2ac50718b61090  zulu17.44.53-ca-jre17.0.8.1-linux_x64.tar.gz
-sha256  6de706f2ede9c68b456ad5e8d7260fc9472e18f5d1636cdb3c8edcb700396671  zulu17.44.53-ca-jre17.0.8.1-linux_i686.tar.gz
-sha256  be2d6d9e96dba06a4f495544f35db05c022e49d4794977cdff8cd443312640e5  zulu17.44.53-ca-jre17.0.8.1-linux_aarch32hf.tar.gz
-sha256  1b2086420b2c1c87a3bc4e0aa8bfc34b05fdf32fc784cd463fd82b0efd30fa9d  zulu17.44.53-ca-jre17.0.8.1-linux_aarch64.tar.gz
+sha256  f32945e430d791bc9b7313b34a69c54f9f913ae875c2d101c0ad86c3a30c55e5  zulu8.72.0.17-ca-jre8.0.382-linux_x64.tar.gz
+sha256  4f107722b0797fc6294207309d38608f12f1c7357b7e0625949332465f55eaeb  zulu8.72.0.17-ca-jre8.0.382-linux_i686.tar.gz
+sha256  500dfd12e5a890490ba4b0ab9a58a4bc28dd87444acc35c64d3214c722a89c03  zulu8.72.0.17-ca-jre8.0.382-linux_aarch32hf.tar.gz
+sha256  34033ca70e3d0d955e2e6da1a1573e6aa05cdb8acc519209780b9ea28f9e4b47  zulu8.72.0.17-ca-jre8.0.382-linux_aarch64.tar.gz
diff --git a/buildroot-external/package/java-azul/java-azul.mk b/buildroot-external/package/java-azul/java-azul.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-JAVA_AZUL_VERSION = 17.44.53-ca-jre17.0.8.1
+JAVA_AZUL_VERSION = 8.72.0.17-ca-jre8.0.382
 ifeq ($(call qstrip,$(BR2_ARCH)),arm)
 JAVA_AZUL_SOURCE = zulu$(JAVA_AZUL_VERSION)-linux_aarch32hf.tar.gz
 JAVA_AZUL_SITE = https://cdn.azul.com/zulu-embedded/bin
 else ifeq ($(call qstrip,$(BR2_ARCH)),aarch64)
 JAVA_AZUL_SOURCE = zulu$(JAVA_AZUL_VERSION)-linux_aarch64.tar.gz
-JAVA_AZUL_SITE = https://cdn.azul.com/zulu/bin
+JAVA_AZUL_SITE = https://cdn.azul.com/zulu-embedded/bin
 else ifeq ($(call qstrip,$(BR2_ARCH)),i686)
 JAVA_AZUL_SOURCE = zulu$(JAVA_AZUL_VERSION)-linux_i686.tar.gz
 JAVA_AZUL_SITE = https://cdn.azul.com/zulu/bin
@@ -25,9 +25,9 @@ JAVA_AZUL_DEPENDENCIES = fontconfig dejavu liberation
 define JAVA_AZUL_INSTALL_TARGET_CMDS
 	$(INSTALL) -d -m 0755 $(TARGET_DIR)/opt/java-azul
 	cp -a $(@D)/bin $(TARGET_DIR)/opt/java-azul/
-	cp -a $(@D)/conf $(TARGET_DIR)/opt/java-azul/
+	#cp -a $(@D)/conf $(TARGET_DIR)/opt/java-azul/
 	cp -a $(@D)/lib $(TARGET_DIR)/opt/java-azul/
-	cp -a $(@D)/legal $(TARGET_DIR)/opt/java-azul/
+	#cp -a $(@D)/legal $(TARGET_DIR)/opt/java-azul/
 	cp -a $(@D)/DISCLAIMER $(TARGET_DIR)/opt/java-azul/
 	rm -f $(TARGET_DIR)/opt/java
 	ln -s java-azul $(TARGET_DIR)/opt/java

diff --git a/scripts/update-java-azul.sh b/scripts/update-java-azul.sh
@@ -36,4 +36,4 @@ sed -i "s/${BR_PACKAGE_NAME}_VERSION = .*/${BR_PACKAGE_NAME}_VERSION = ${ID}/g"
 updateHash zulu x64
 updateHash zulu i686
 updateHash zulu-embedded aarch32hf
-updateHash zulu aarch64
+updateHash zulu-embedded aarch64