diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-06-01 12:18:25 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-06-01 12:18:25 +0000 |
| commit | 2cd89e89ac1a548776ffbe235d053266d53e4696 (patch) | |
| tree | c800b250fe3d56c51f1cbffd633c7ecdd039e431 /manifest | |
| parent | cf8f973b34066e6223b547f7c3ae9de8e6244e69 (diff) | |
| parent | 91d7f85e02991954d1e1bd44673df567ad8dcc87 (diff) | |
| download | illumos-joyent-2cd89e89ac1a548776ffbe235d053266d53e4696.tar.gz | |
[illumos-gate merge]
commit 91d7f85e02991954d1e1bd44673df567ad8dcc87
5916 make libsqlite a real shared lib
commit e53cbaa96c466c221cfec0d1a481c6f75be6880d
5851 usr/lib/pool/poold has incorrect run path after 4719
commit d235eb05fe584753047218e3a6dd344d0154d19b
5708 rid usbser/Makefile of CERRWARN
commit 67a4bb8f9ad4c49e9aa9e21e2114a7c093c3a73a
5396 fix longjmp clobbering errors
commit bd0f709169e67f4bd34526e186a7c34f595f0d9b
1778 Assertion failed: rn->rn_nozpool == B_FALSE, file ../common/libzfs_import.c, line 1077, function zpool_open_func
commit 24218bebb460e4015fac2c9f2cec1902eddbcd7b
5946 zfs_ioc_space_snaps must check that firstsnap and lastsnap refer to snapshots
5945 zfs_ioc_send_space must ensure that fromsnap refers to a snapshot
Manifest changes:
Removed:
f usr/lib/libsqlite-native.o 0644 root bin
f usr/lib/libsqlite.o 0644 root bin
f usr/lib/smbsrv/libsqlite.so.1 0755 root bin
s usr/lib/smbsrv/libsqlite.so=libsqlite.so.1
Added:
f lib/libsqlite-sys.so.2.8.15 0755 root bin
Diffstat (limited to 'manifest')
| -rw-r--r-- | manifest | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -1424,6 +1424,7 @@ f lib/libsmartsshd.so.1 0755 root bin s lib/libsmartsshd.so=libsmartsshd.so.1 f lib/libsocket.so.1 0755 root bin s lib/libsocket.so=libsocket.so.1 +f lib/libsqlite-sys.so.2.8.15 0755 root bin f lib/libsysevent.so.1 0755 root bin s lib/libsysevent.so=libsysevent.so.1 f lib/libtermcap.so.1 0755 root bin @@ -6380,8 +6381,6 @@ s usr/lib/libsocket.so.1=../../lib/libsocket.so.1 s usr/lib/libsocket.so=../../lib/libsocket.so.1 f usr/lib/libsoftcrypto.so.1 0755 root bin s usr/lib/libsoftcrypto.so=libsoftcrypto.so.1 -f usr/lib/libsqlite-native.o 0644 root bin -f usr/lib/libsqlite.o 0644 root bin f usr/lib/libsrpt.so.1 0755 root bin s usr/lib/libsrpt.so=libsrpt.so.1 f usr/lib/libstanddisasm.so 0644 root bin @@ -9994,8 +9993,6 @@ f usr/lib/smbsrv/libsmb.so.1 0755 root bin s usr/lib/smbsrv/libsmb.so=libsmb.so.1 f usr/lib/smbsrv/libsmbns.so.1 0755 root bin s usr/lib/smbsrv/libsmbns.so=libsmbns.so.1 -f usr/lib/smbsrv/libsqlite.so.1 0755 root bin -s usr/lib/smbsrv/libsqlite.so=libsqlite.so.1 f usr/lib/smbsrv/smbd 0755 root bin d usr/lib/smedia 0755 root bin d usr/lib/smedia/amd64 0755 root bin |