diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-09-26 13:27:55 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-09-26 13:27:55 +0000 |
commit | 0264fb65b613e5b2c44f273fa48b26bebe491074 (patch) | |
tree | a375b79dd7543bcf0571578b2189d37168c37c57 /exception_lists | |
parent | d21e83058c8edeb1becd9202380d088cb056f0c4 (diff) | |
parent | f76886de6cd6914424d9f6c25bd9d93d87889269 (diff) | |
download | illumos-joyent-0264fb65b613e5b2c44f273fa48b26bebe491074.tar.gz |
[illumos-gate merge]
commit f76886de6cd6914424d9f6c25bd9d93d87889269
7402 Create tunable to ignore hole_birth feature
commit 5bdf86e2a288d6c81a0bcc50a98699f52557bab6
7401 loader.4th is missing newline
commit ed4e7a6a5cbc5e8986dc649ad54435210487b102
7340 receive manual origin should override automatic origin
commit b021ac0b78f8df3d9c421783d9a323723df84925
7337 inherit_001_pos occasionally times out
commit c166b69d29138aed7a415fe7cef698e54c6ae945
7254 ztest failed assertion in ztest_dataset_dirobj_verify: dirobjs + 1 == usedobjs
commit 754998c8d410b7b7ddefbfa4de310a030e0c7ce1
7253 ztest failure: dsl_destroy_head(name) == 0 (0x10 == 0x0), file ../ztest.c, line 3235
commit 4220fdc152e5dfec9a1dd51452175295f3684689
7398 zfs test zfs_get_005_neg does not work as expected
commit d5f26ad8122c3762fb16413a17bfb497db86a782
5142 libzfs support raidz root pool (loader project)
commit c8811bd3e2427dddbac6c05a59cfe117d8fea370
5120 zfs should allow large block/gzip/raidz boot pool (loader project)
commit 12e3fba22ec759e9dd8f9564fad79541275b2aa5
6709 manual pages need to be updated for loader (loader project)
commit fa0c327afe484fa5ff164fb81ff93715dd6573f8
6706 disable grub menu management in bootadm (loader project)
6707 disable grub menu management in libbe (loader project)
commit 9abc7a578aecf9064f46563361e8f856b4bdc35e
6705 halt: replace grub_get_boot_args with be_get_boot_args (loader project)
commit a6424c753d6e2f0f04fb65b11e9f9c04445ccbae
6704 svc.startd: replace grub_get_boot_args with be_get_boot_args (loader project)
commit c262cbbc8301f7c884fd4800056ee51ba75d931c
6703 update bootadm to support loader configuration (loader project)
6708 update eeprom for loader (loader project)
commit ce3cb817f67103796b730fd322174dddefd9a9a8
6702 libbe should support x86 installboot command (loader project)
commit 0c946d80993858b7b1314e0b31773e48500e03fb
6701 add installboot to i386 platform (loader project)
commit 1386b601c0c7f5c89a9325b8a1e34037304e8119
6700 remove installboot script from i386 platform (loader project)
commit f5e5a2c4965aa1013184568ca3140cdcba93e44b
6699 be_get_boot_args interface implementation in libbe (loader project)
commit 199767f8919635c4928607450d9e0abb932109ce
5061 freebsd boot loader integration (loader project)
commit 0cc5983c8a077e6396dc7c492ee928b40bf0fed1
6698 freebsd btxld port for illumos (loader project)
commit afc2ba1deb75b323afde536f2dd18bcafdaa308d
6185 want ficl scripting engine in illumos (loader project)
Conflicts:
exception_lists/cstyle
exception_lists/hdrchk
exception_lists/copyright
Diffstat (limited to 'exception_lists')
-rw-r--r-- | exception_lists/copyright | 8 | ||||
-rw-r--r-- | exception_lists/cstyle | 7 | ||||
-rw-r--r-- | exception_lists/hdrchk | 3 | ||||
-rw-r--r-- | exception_lists/keywords | 1 | ||||
-rw-r--r-- | exception_lists/manlint | 14 | ||||
-rw-r--r-- | exception_lists/mapfilechk | 2 | ||||
-rw-r--r-- | exception_lists/packaging | 12 |
7 files changed, 47 insertions, 0 deletions
diff --git a/exception_lists/copyright b/exception_lists/copyright index 8f880434b0..cd5c8bb8da 100644 --- a/exception_lists/copyright +++ b/exception_lists/copyright @@ -54,6 +54,7 @@ usr/src/cmd/acpi/common/utmath.c usr/src/cmd/acpi/common/utnonansi.c usr/src/cmd/acpi/common/utprint.c usr/src/cmd/acpi/common/utxferror.c +usr/src/boot/* usr/src/cmd/cmd-inet/usr.bin/dns-sd/ClientCommon.c usr/src/cmd/cmd-inet/usr.bin/dns-sd/ClientCommon.h usr/src/cmd/cmd-inet/usr.bin/dns-sd/dns-sd.c @@ -96,6 +97,7 @@ usr/src/common/bzip2/bzlib.c usr/src/common/bzip2/decompress.c usr/src/common/bzip2/bzlib_private.h usr/src/common/bzip2/huffman.c +usr/src/common/ficl/* usr/src/grub/grub-0.97/stage2/Makefile.am usr/src/grub/grub-0.97/stage2/builtins.c usr/src/grub/grub-0.97/stage2/disk_io.c @@ -381,6 +383,12 @@ usr/src/lib/libsmbfs/smb/spnego.c usr/src/lib/libsmbfs/smb/spnegoparse.[ch] usr/src/test/zfs-tests/tests/functional/history/*Z usr/src/test/zfs-tests/tests/functional/history/*txt +usr/src/tools/btxld/btx.h +usr/src/tools/btxld/btxld.8 +usr/src/tools/btxld/btxld.c +usr/src/tools/btxld/elfh.c +usr/src/tools/btxld/elfh.h +usr/src/tools/btxld/imgact_aout.h usr/src/uts/intel/nsmb/ioc_check.ref usr/src/uts/intel/os/splashimage.xpm usr/src/uts/common/gssapi/mechs/krb5/crypto/block_size.c diff --git a/exception_lists/cstyle b/exception_lists/cstyle index ee2f46b317..8d817de4f3 100644 --- a/exception_lists/cstyle +++ b/exception_lists/cstyle @@ -18,6 +18,7 @@ usr/src/cmd/acpi/common/utmath.c usr/src/cmd/acpi/common/utnonansi.c usr/src/cmd/acpi/common/utprint.c usr/src/cmd/acpi/common/utxferror.c +usr/src/boot/* usr/src/cmd/cmd-inet/usr.bin/dns-sd/ClientCommon.[ch] usr/src/cmd/cmd-inet/usr.bin/dns-sd/dns-sd.c usr/src/cmd/cmd-inet/usr.lib/mdnsd/CryptoAlg.[ch] @@ -166,6 +167,7 @@ usr/src/cmd/mandoc/term_ps.c usr/src/cmd/mandoc/term.c usr/src/cmd/mandoc/term.h usr/src/cmd/mandoc/tree.c +usr/src/common/ficl/ficltokens.h usr/src/common/bzip2/bzlib.h usr/src/common/bzip2/crctable.c usr/src/common/bzip2/randtable.c @@ -775,6 +777,11 @@ usr/src/lib/libsmbfs/smb/derparse.h usr/src/lib/libsmbfs/smb/spnego.c usr/src/lib/libsmbfs/smb/spnegoparse.c usr/src/lib/libsmbfs/smb/spnegoparse.h +usr/src/tools/btxld/btx.h +usr/src/tools/btxld/btxld.c +usr/src/tools/btxld/elfh.c +usr/src/tools/btxld/elfh.h +usr/src/tools/btxld/imgact_aout.h usr/src/uts/common/gssapi/gssapi.h usr/src/uts/common/gssapi/mechs/krb5/crypto/block_size.c usr/src/uts/common/gssapi/mechs/krb5/crypto/checksum_length.c diff --git a/exception_lists/hdrchk b/exception_lists/hdrchk index c0ef890aa7..14ee0af149 100644 --- a/exception_lists/hdrchk +++ b/exception_lists/hdrchk @@ -2,6 +2,7 @@ usr/src/cmd/acpi/acpidump/acpidump.h usr/src/cmd/acpi/acpixtract/acpixtract.h usr/src/cmd/acpi/acpixtract/axmain.h usr/src/cmd/acpi/acpixtract/axutils.h +usr/src/boot/* usr/src/cmd/cmd-inet/usr.bin/dns-sd/ClientCommon.h usr/src/cmd/cmd-inet/usr.lib/mdnsd/CryptoAlg.h usr/src/cmd/cmd-inet/usr.lib/mdnsd/DNSCommon.h @@ -55,6 +56,7 @@ usr/src/cmd/mandoc/roff_int.h usr/src/cmd/mandoc/roff.h usr/src/cmd/mandoc/tag.h usr/src/cmd/mandoc/term.h +usr/src/common/ficl/ficltokens.h usr/src/grub/grub-0.97/stage2/shared.h usr/src/lib/libdwarf/common/cmplrs/dwarf_addr_finder.h usr/src/lib/libdwarf/common/config.h @@ -228,6 +230,7 @@ usr/src/lib/librstp/common/vector.h usr/src/lib/libsmbfs/netsmb/spnego.h usr/src/lib/libsmbfs/smb/derparse.h usr/src/lib/libsmbfs/smb/spnegoparse.h +usr/src/tools/btxld/* usr/src/uts/common/gssapi/mechs/krb5/include/aes_s2k.h usr/src/uts/common/gssapi/mechs/krb5/include/auth_con.h usr/src/uts/common/gssapi/mechs/krb5/include/cksumtypes.h diff --git a/exception_lists/keywords b/exception_lists/keywords index f0be882342..6037b93c21 100644 --- a/exception_lists/keywords +++ b/exception_lists/keywords @@ -25,6 +25,7 @@ # syntax: glob +usr/src/boot/* usr/src/cmd/cmd-inet/usr.bin/dns-sd/dns-sd.c usr/src/cmd/boot/common/bblk_einfo.c usr/src/cmd/localedef/data/zh_CN.UTF-8.src diff --git a/exception_lists/manlint b/exception_lists/manlint new file mode 100644 index 0000000000..f6ced61996 --- /dev/null +++ b/exception_lists/manlint @@ -0,0 +1,14 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# +# +# Copyright 2016 Toomas Soome <tsoome@me.com> +# +usr/src/boot/* diff --git a/exception_lists/mapfilechk b/exception_lists/mapfilechk index d7898d1a26..621d57e1f4 100644 --- a/exception_lists/mapfilechk +++ b/exception_lists/mapfilechk @@ -20,6 +20,7 @@ # # +# Copyright 2016 Toomas Soome <tsoome@me.com> # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # @@ -36,6 +37,7 @@ syntax: glob exception_lists/mapfilechk +usr/src/boot/* usr/src/cmd/lp/filter/postscript/font/devpost/charlib/* usr/src/cmd/mdb/common/kmdb/mapfile_skel usr/src/cmd/sgs/libconv/common/map.msg diff --git a/exception_lists/packaging b/exception_lists/packaging index d3619714ec..b406d8e42f 100644 --- a/exception_lists/packaging +++ b/exception_lists/packaging @@ -24,6 +24,7 @@ # Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved. # Copyright 2014 Garrett D'Amore <garrett@damore.org> # Copyright 2014 Nexenta Systems, Inc. All rights reserved. +# Copyright 2016 Toomas Soome <tsoome@me.com> # # @@ -984,3 +985,14 @@ usr/lib/llib-lpcidb.ln # debugging program for libadutils # usr/bin/test-getdc +# +# libficl-sys is private +# +usr/include/ficllocal.h +usr/lib/amd64/llib-lficl-sys.ln i386 +usr/lib/amd64/libficl-sys.so i386 +usr/lib/sparcv9/llib-lficl-sys.ln sparc +usr/lib/sparcv9/libficl-sys.so sparc +usr/lib/llib-lficl-sys +usr/lib/llib-lficl-sys.ln +usr/lib/libficl-sys.so |