From b5f3f2e9feec007a8483b87f55aa69f517da868e Mon Sep 17 00:00:00 2001 From: panxuefeng Date: Wed, 2 Aug 2023 14:48:06 +0800 Subject: [PATCH] change loongson jdk download way remove set-boot-jdk.sh remove wget disable class validation install dependency --- download | 1 + java-1.8.0-openjdk.spec | 10 ++++++---- set-boot-jdk.sh | 5 ----- 3 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 set-boot-jdk.sh diff --git a/download b/download index 9e59ad9..a1e230a 100644 --- a/download +++ b/download @@ -1 +1,2 @@ e6158e3dc90222cf4685c9966992e977 openjdk-shenandoah-jdk8u-shenandoah-jdk8u372-b07-4curve.tar.xz +cb2a3885cf55f13058aaee2fc157a7e8 loongson8.1.15-fx-jdk8u372b07-linux-loongarch64.tar.gz diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 4e2d543..f7708af 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 # RPM conditionals so as to be able to dynamically produce # slowdebug/release builds. See: # http://rpm.org/user_doc/conditional_builds.html @@ -512,7 +512,7 @@ Source17: nss.fips.cfg.in Source18: TestTranslations.java # set loongson boot jdk -Source19: set-boot-jdk.sh +Source19: loongson8.1.15-fx-jdk8u372b07-linux-loongarch64.tar.gz # Disabled in portables #Source20: repackReproduciblePolycies.sh @@ -727,7 +727,7 @@ BuildRequires: unzip BuildRequires: java-%{buildjdkver}-openjdk-devel >= 1.7.0.151-2.6.11.3 %endif %ifarch loongarch64 -BuildRequires: wget +BuildRequires: javapackages-filesystem %endif # Zero-assembler build requirement %ifarch %{zero_arches} @@ -1258,7 +1258,7 @@ function packagejdk() { top_dir_abs_bootjdk=$(pwd)/%{top_level_dir_boot_jdk} mkdir -p ${top_dir_abs_bootjdk} pushd ${top_dir_abs_bootjdk} -sh %{SOURCE19} +tar -zxf %{SOURCE19} popd %endif @@ -1446,7 +1446,9 @@ grep 'JavaCallWrapper::JavaCallWrapper' gdb.out %endif # Check src.zip has all sources. See RHBZ#1130490 +%ifnarch loongarch64 jar -tf $JAVA_HOME/src.zip | grep 'sun.misc.Unsafe' +%endif # Check class files include useful debugging information $JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from" diff --git a/set-boot-jdk.sh b/set-boot-jdk.sh deleted file mode 100644 index 7ef99c6..0000000 --- a/set-boot-jdk.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -set -x -wget http://ftp.loongnix.cn/Java/openjdk8/loongson8.1.15-fx-jdk8u372b07-linux-loongarch64.tar.gz -tar -zxf loongson8.1.15-fx-jdk8u372b07-linux-loongarch64.tar.gz -rm loongson8.1.15-fx-jdk8u372b07-linux-loongarch64.tar.gz -- Gitee