diff --git a/debian/changelog b/debian/changelog index b1f48bb..5afd21a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +java-common (0.72-ok4) yangtze; urgency=medium + + * if arch =rv64g default-java dh_link to openjdk*-riscv64 + + -- root Thu, 14 Mar 2024 10:27:36 +0000 + java-common (0.72-ok3) yangtze; urgency=medium * Add support for rv64g. diff --git a/debian/rules b/debian/rules index 000b88f..509290c 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,10 @@ jhl_provides = java-runtime-headless, java2-runtime-headless, $(shell seq --form jdk_provides = java-sdk, java2-sdk, $(shell seq --format java%.f-sdk --separator ', ' 5 $(java_default_version)) jdkhl_provides = java-sdk-headless, java2-sdk-headless, $(shell seq --format java%.f-sdk-headless --separator ', ' 5 $(java_default_version)) +arch=$(DEB_HOST_ARCH) +ifeq ($(DEB_HOST_ARCH),rv64g) +arch=riscv64 +endif %: dh $@ @@ -20,7 +24,7 @@ override_dh_link: dh_link # Link /usr/lib/jvm/default-java to the default JRE - dh_link -pdefault-jre-headless usr/lib/jvm/java-1.$(java_default_version).0-openjdk-$(DEB_HOST_ARCH) usr/lib/jvm/default-java + dh_link -pdefault-jre-headless usr/lib/jvm/java-1.$(java_default_version).0-openjdk-$(arch) usr/lib/jvm/default-java # Link to the JDK documentation dh_link -pdefault-jdk-doc /usr/share/doc/openjdk-$(java_default_version)-doc/api usr/share/doc/default-jre-headless/api