In JDK-8162354 Jib was adjusted to use a different boot jdk for M7 sparcs. This fix need to be generalized slightly since it also applies to sparc chips with different letters in front of the 7.

Bug: https://bugs.openjdk.java.net/browse/JDK-8176271

Patch:

diff -r 4d29ee32d926 common/conf/jib-profiles.js
--- a/common/conf/jib-profiles.js
+++ b/common/conf/jib-profiles.js
@@ -391,7 +391,7 @@
     // on such hardware.
     if (input.build_cpu == "sparcv9") {
var cpu_brand = $EXEC("bash -c \"kstat -m cpu_info | grep brand | head -n1 | awk '{ print \$2 }'\"");
-       if (cpu_brand.trim() == 'SPARC-M7') {
+       if (cpu_brand.trim().match('SPARC-.7')) {
            boot_jdk_revision = "8u20";
            boot_jdk_subdirpart = "1.8.0_20";
        }

/Erik

Reply via email to