changeset 60031:1bee69801aee jdk-15+10

8238912: Update devkit for linux-aarch64 Reviewed-by: erikj
author mikael
date Wed, 12 Feb 2020 09:44:53 -0800
parents 10e939d362fc
children 7ef41e83066b
files make/conf/jib-profiles.js make/devkit/Tools.gmk
diffstat 2 files changed, 28 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/make/conf/jib-profiles.js	Wed Feb 12 08:25:35 2020 -0800
+++ b/make/conf/jib-profiles.js	Wed Feb 12 09:44:53 2020 -0800
@@ -974,7 +974,7 @@
         solaris_x64: "SS12u4-Solaris11u1+1.0",
         solaris_sparcv9: "SS12u6-Solaris11u3+1.0",
         windows_x64: "VS2017-15.9.16+1.0",
-        linux_aarch64: "gcc8.2.0-Fedora27+1.0",
+        linux_aarch64: "gcc8.3.0-OL7.6+1.0",
         linux_arm: "gcc8.2.0-Fedora27+1.0",
         linux_ppc64le: "gcc8.2.0-Fedora27+1.0",
         linux_s390x: "gcc8.2.0-Fedora27+1.0"
@@ -1004,9 +1004,17 @@
         ? input.get("gnumake", "install_path") + "/cygwin/bin"
         : input.get("gnumake", "install_path") + "/bin");
 
-    var dependencies = {
-
-        boot_jdk: {
+    if (input.build_cpu == 'aarch64') {
+	boot_jdk = {
+            organization: common.organization,
+            ext: "tar.gz",
+            module: "jdk-linux_aarch64",
+            revision: "13+1.0",
+            configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
+            environment_path: common.boot_jdk_home + "/bin"
+	}
+    } else {
+	boot_jdk = {
             server: "jpg",
             product: "jdk",
             version: common.boot_jdk_version,
@@ -1015,7 +1023,11 @@
                 + boot_jdk_platform + "_bin" + boot_jdk_ext,
             configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
             environment_path: common.boot_jdk_home + "/bin"
-        },
+	}
+    }
+
+    var dependencies = {
+        boot_jdk: boot_jdk,
 
         devkit: {
             organization: common.organization,
--- a/make/devkit/Tools.gmk	Wed Feb 12 08:25:35 2020 -0800
+++ b/make/devkit/Tools.gmk	Wed Feb 12 09:44:53 2020 -0800
@@ -51,9 +51,17 @@
 
 $(info ARCH=$(ARCH))
 
+KERNEL_HEADERS_RPM := kernel-headers
+
 ifeq ($(BASE_OS), OL)
-  BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/
-  LINUX_VERSION := OL6.4
+  ifeq ($(ARCH), aarch64)
+    BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL7/6/base/$(ARCH)/
+    LINUX_VERSION := OL7.6
+    KERNEL_HEADERS_RPM := kernel-uek-headers
+  else
+    BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/
+    LINUX_VERSION := OL6.4
+  endif
 else ifeq ($(BASE_OS), Fedora)
   DEFAULT_OS_VERSION := 27
   ifeq ($(BASE_OS_VERSION), )
@@ -118,7 +126,7 @@
 
 # RPMs used by all BASE_OS
 RPM_LIST := \
-    kernel-headers \
+    $(KERNEL_HEADERS_RPM) \
     glibc glibc-headers glibc-devel \
     cups-libs cups-devel \
     libX11 libX11-devel \