summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/model/java.py1
-rw-r--r--meta/run/generate_java.py11
2 files changed, 11 insertions, 1 deletions
diff --git a/meta/model/java.py b/meta/model/java.py
index e5760f8bac..b941860726 100644
--- a/meta/model/java.py
+++ b/meta/model/java.py
@@ -23,6 +23,7 @@ class JavaRuntimeOS(StrEnum):
LinuxX86 = "linux-x86"
LinuxArm64 = "linux-arm64"
LinuxArm32 = "linux-arm32"
+ LinuxRiscv64 = "linux-riscv64"
WindowsX64 = "windows-x64"
WindowsX86 = "windows-x86"
WindowsArm64 = "windows-arm64"
diff --git a/meta/run/generate_java.py b/meta/run/generate_java.py
index b53fdcdd00..13e01a0496 100644
--- a/meta/run/generate_java.py
+++ b/meta/run/generate_java.py
@@ -56,6 +56,7 @@ MOJANG_OS_ARCHITECTURES = [
"x86",
"arm64",
"arm32",
+ "riscv64",
]
MOJANG_OS_ARCHITECTURE_TRANSLATIONS = {
@@ -66,6 +67,7 @@ MOJANG_OS_ARCHITECTURE_TRANSLATIONS = {
"aarch64": "arm64",
"x86_64": "x64",
"arm": "arm32",
+ "riscv64": "riscv64",
}
@@ -332,7 +334,13 @@ def main():
]
and major in [8, 17, 21, 25]
)
- or (runtime.runtime_os == JavaRuntimeOS.LinuxX86 and major in [17, 21, 25])
+ or (
+ runtime.runtime_os
+ in [
+ JavaRuntimeOS.LinuxX86,
+ JavaRuntimeOS.LinuxRiscv64
+ ]
+ and major in [17, 21, 25])
):
if major not in extra_mojang_javas:
extra_mojang_javas[major] = list[JavaRuntimeMeta]()
@@ -468,6 +476,7 @@ def main():
JavaRuntimeOS.WindowsArm32,
JavaRuntimeOS.LinuxArm32,
JavaRuntimeOS.LinuxArm64,
+ JavaRuntimeOS.LinuxRiscv64,
]:
for comp in [
MojangJavaComponent.JreLegacy,