Skip to content

Commit aa4ef80

Browse files
committed
8238912: Update devkit for linux-aarch64
Reviewed-by: erikj
1 parent 5c3a015 commit aa4ef80

File tree

2 files changed

+28
-8
lines changed

2 files changed

+28
-8
lines changed

make/conf/jib-profiles.js

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,7 @@ var getJibProfilesDependencies = function (input, common) {
974974
solaris_x64: "SS12u4-Solaris11u1+1.0",
975975
solaris_sparcv9: "SS12u6-Solaris11u3+1.0",
976976
windows_x64: "VS2017-15.9.16+1.0",
977-
linux_aarch64: "gcc8.2.0-Fedora27+1.0",
977+
linux_aarch64: "gcc8.3.0-OL7.6+1.0",
978978
linux_arm: "gcc8.2.0-Fedora27+1.0",
979979
linux_ppc64le: "gcc8.2.0-Fedora27+1.0",
980980
linux_s390x: "gcc8.2.0-Fedora27+1.0"
@@ -1004,9 +1004,17 @@ var getJibProfilesDependencies = function (input, common) {
10041004
? input.get("gnumake", "install_path") + "/cygwin/bin"
10051005
: input.get("gnumake", "install_path") + "/bin");
10061006

1007-
var dependencies = {
1008-
1009-
boot_jdk: {
1007+
if (input.build_cpu == 'aarch64') {
1008+
boot_jdk = {
1009+
organization: common.organization,
1010+
ext: "tar.gz",
1011+
module: "jdk-linux_aarch64",
1012+
revision: "13+1.0",
1013+
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
1014+
environment_path: common.boot_jdk_home + "/bin"
1015+
}
1016+
} else {
1017+
boot_jdk = {
10101018
server: "jpg",
10111019
product: "jdk",
10121020
version: common.boot_jdk_version,
@@ -1015,7 +1023,11 @@ var getJibProfilesDependencies = function (input, common) {
10151023
+ boot_jdk_platform + "_bin" + boot_jdk_ext,
10161024
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
10171025
environment_path: common.boot_jdk_home + "/bin"
1018-
},
1026+
}
1027+
}
1028+
1029+
var dependencies = {
1030+
boot_jdk: boot_jdk,
10191031

10201032
devkit: {
10211033
organization: common.organization,

make/devkit/Tools.gmk

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,17 @@ endif
5151

5252
$(info ARCH=$(ARCH))
5353

54+
KERNEL_HEADERS_RPM := kernel-headers
55+
5456
ifeq ($(BASE_OS), OL)
55-
BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/
56-
LINUX_VERSION := OL6.4
57+
ifeq ($(ARCH), aarch64)
58+
BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL7/6/base/$(ARCH)/
59+
LINUX_VERSION := OL7.6
60+
KERNEL_HEADERS_RPM := kernel-uek-headers
61+
else
62+
BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/
63+
LINUX_VERSION := OL6.4
64+
endif
5765
else ifeq ($(BASE_OS), Fedora)
5866
DEFAULT_OS_VERSION := 27
5967
ifeq ($(BASE_OS_VERSION), )
@@ -118,7 +126,7 @@ GDB := http://ftp.gnu.org/gnu/gdb/${gdb_ver}.tar.xz
118126

119127
# RPMs used by all BASE_OS
120128
RPM_LIST := \
121-
kernel-headers \
129+
$(KERNEL_HEADERS_RPM) \
122130
glibc glibc-headers glibc-devel \
123131
cups-libs cups-devel \
124132
libX11 libX11-devel \

0 commit comments

Comments
 (0)