diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-08-29 12:14:30 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-08-29 12:14:30 +0000 |
| commit | 1ecb6f51f460bf7d1554e2f44731ab4f47ec97e4 (patch) | |
| tree | 75ec438a234458c7d2084dc18850098c090662a4 /exception_lists | |
| parent | 57b471aeb372d625bad5f7340300b0d5f2d7d7f7 (diff) | |
| parent | b982c112ede0da29fbc4152cdc6690d85ddf7207 (diff) | |
| download | illumos-joyent-1ecb6f51f460bf7d1554e2f44731ab4f47ec97e4.tar.gz | |
[illumos-gate merge]
commit b982c112ede0da29fbc4152cdc6690d85ddf7207
9775 format: number of sectors is reported one less in case of GPT
commit 570479901769888c6a35dcd8d94242a926d0bd87
9699 loader: biosdisk should prefer smaller (safer) sectors value from INT13
commit 322e343b7c538c565d91cb11d00fbe6266834e28
9766 loader: 'mbi' may be used uninitialized
commit 522e4551ca5d7b72fe4d4af1ff92521ab19842c7
9764 loader.efi: 'efi_mmap' is used uninitialized
commit 69aea4bf4584b2d60ef94da59897ec363890af57
9765 pkgadd has no Z option
commit ba93fbafc5df33b7aeb99adb3b9a918afc3e7143
9756 tests: badseg.c error: variable 'rc' set but not used
commit fec4bdb512708a1a9c886ed7f84ce353ec85b486
9767 loader: linux.c unused variable 'mem'
commit 500cf85b0395b6835818b6248681bbbc27563dc1
9762 Split the custr functions into their own library
commit f8e0ecf7cceff807dcd13fe031936e1ff28193e3
9742 libi386: Add workaround for HP BIOS issues
Conflicts:
usr/src/lib/libcustr/common/llib-lcustr
usr/src/lib/libcustr/Makefile.com
usr/src/cmd/mailx/Makefile
exception_lists/packaging
Diffstat (limited to 'exception_lists')
| -rw-r--r-- | exception_lists/packaging | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/exception_lists/packaging b/exception_lists/packaging index 792adaf9df..877d57f389 100644 --- a/exception_lists/packaging +++ b/exception_lists/packaging @@ -27,6 +27,7 @@ # Copyright 2018 Nexenta Systems, Inc. # Copyright 2017 Toomas Soome <tsoome@me.com> # Copyright 2017 RackTop Systems. +# Copyright 2018, Joyent, Inc. # # @@ -948,10 +949,10 @@ usr/include/sys/ipmi.h sparc # # libsaveargs is private # -usr/include/saveargs.h i386 -usr/lib/amd64/libsaveargs.so i386 +usr/include/saveargs.h i386 +usr/lib/amd64/libsaveargs.so i386 usr/lib/amd64/libstandsaveargs.so i386 -usr/lib/amd64/llib-lsaveargs.ln i386 +usr/lib/amd64/llib-lsaveargs.ln i386 # # libpcidb is private @@ -1006,3 +1007,15 @@ usr/include/vmmapi.h usr/platform/i86pc/include/sys/vmm.h usr/platform/i86pc/include/sys/vmm_impl.h usr/platform/i86pc/include/sys/vmm_instruction_emul.h + +# +# libcustr is private +# +usr/include/libcustr.h +lib/amd64/libcustr.so i386 +lib/amd64/llib-lcustr.ln i386 +lib/sparcv9/libcustr.so sparc +lib/sparcv9/llib-lcustr.ln sparc +lib/libcustr.so +lib/llib-lcustr +lib/llib-lcustr.ln |