diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-09-21 11:43:51 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-09-21 11:43:51 +0000 |
| commit | de1c7a865adeab38b51e5c0db5058e61469b322c (patch) | |
| tree | 898a230006c801195b396aa68892d1296d8c549e /exception_lists | |
| parent | 69ac6c001ab11b88fdfc6b13fcc344154a268056 (diff) | |
| parent | 51396a8ee7fb52fe0ab33bfe7b4f495ad431904a (diff) | |
| download | illumos-joyent-de1c7a865adeab38b51e5c0db5058e61469b322c.tar.gz | |
[illumos-gate merge]
commit 51396a8ee7fb52fe0ab33bfe7b4f495ad431904a
13083 Enable gate builds with OpenJDK 11
commit fd147c98dbdbc9e5ac99fa51cb608e8eeb1f16f1
13168 reality should reflect the mac_prop_id_t comment
commit 3626423cd8fd36c60b866e625aff599f055c7dc3
13167 Update hwdata to 2020.9.15
Conflicts:
usr/src/cmd/dtrace/test/tst/common/java_api/Makefile
usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile
Diffstat (limited to 'exception_lists')
| -rw-r--r-- | exception_lists/cstyle | 7 | ||||
| -rw-r--r-- | exception_lists/hdrchk | 7 | ||||
| -rw-r--r-- | exception_lists/packaging.deps | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/exception_lists/cstyle b/exception_lists/cstyle index 9dc6d45d49..6aac16c2f7 100644 --- a/exception_lists/cstyle +++ b/exception_lists/cstyle @@ -84,6 +84,11 @@ usr/src/cmd/krb5/slave/kprop.c usr/src/cmd/krb5/slave/kprop.h usr/src/cmd/krb5/slave/kpropd.c usr/src/cmd/mandoc +usr/src/cmd/pools/poold/libjkstat/jkstat.h +usr/src/cmd/pools/poold/libjlgrp/jlgrp.h +usr/src/cmd/pools/poold/libjpool/jpool.h +usr/src/cmd/pools/poold/libjsyslog/jsyslog.h +usr/src/cmd/print/printmgr/com/sun/admin/pm/server/com_sun_admin_pm_server_DoPrinterNS.h usr/src/cmd/ttymon/sttyparse.c usr/src/common/ficl/ficltokens.h usr/src/common/bzip2/bzlib.h @@ -107,7 +112,9 @@ usr/src/grub/grub-0.97/stage2/moddiv.c usr/src/grub/grub-0.97/stage2/pc_slice.h usr/src/grub/grub-0.97/stage2/shared.h usr/src/grub/grub-0.97/stage2/stage1_5.c +usr/src/lib/libadt_jni/com/sun/audit/AuditSession.h usr/src/lib/libc/port/gen/arc4random_uniform.c +usr/src/lib/libdtrace_jni/java/native/LocalConsumer.h usr/src/lib/libdwarf/common/cmplrs/dwarf_addr_finder.h usr/src/lib/libdwarf/common/config.h usr/src/lib/libdwarf/common/dwarf_abbrev.c diff --git a/exception_lists/hdrchk b/exception_lists/hdrchk index 9440c114b5..1bc42f2411 100644 --- a/exception_lists/hdrchk +++ b/exception_lists/hdrchk @@ -23,9 +23,16 @@ usr/src/cmd/krb5/ldap_util/kdb5_ldap_util.h usr/src/cmd/krb5/slave/kprop.h usr/src/cmd/localedef/localedef.h usr/src/cmd/mandoc +usr/src/cmd/pools/poold/libjkstat/jkstat.h +usr/src/cmd/pools/poold/libjlgrp/jlgrp.h +usr/src/cmd/pools/poold/libjpool/jpool.h +usr/src/cmd/pools/poold/libjsyslog/jsyslog.h +usr/src/cmd/print/printmgr/com/sun/admin/pm/server/com_sun_admin_pm_server_DoPrinterNS.h usr/src/common/ficl/ficltokens.h usr/src/contrib usr/src/grub/grub-0.97/stage2/shared.h +usr/src/lib/libadt_jni/com/sun/audit/AuditSession.h +usr/src/lib/libdtrace_jni/java/native/LocalConsumer.h usr/src/lib/libdwarf/common/cmplrs/dwarf_addr_finder.h usr/src/lib/libdwarf/common/config.h usr/src/lib/libdwarf/common/dwarf_abbrev.h diff --git a/exception_lists/packaging.deps b/exception_lists/packaging.deps index 4df18a2f46..5673f33843 100644 --- a/exception_lists/packaging.deps +++ b/exception_lists/packaging.deps @@ -29,6 +29,7 @@ pkg:/print/cups pkg:/print/filter/ghostscript pkg:/release/name pkg:/runtime/java +pkg:/runtime/java/openjdk11 pkg:/runtime/java/openjdk8 pkg:/runtime/java/runtime64 pkg:/security/sudo |