Skip to content

Commit

Permalink
6396 remove SVM
Browse files Browse the repository at this point in the history
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
  • Loading branch information
Yuri Pankov authored and hrosenfeld committed Jan 11, 2017
1 parent a593473 commit 5f10ef6
Show file tree
Hide file tree
Showing 464 changed files with 261 additions and 266,647 deletions.
1 change: 0 additions & 1 deletion exception_lists/check_rtime
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ STAB ^platform/.*/MACH(kernel)/unix$

# Files that are allowed undefined references
UNDEF_REF ^usr/lib/libnisdb\.so\.2$
UNDEF_REF ^usr/snadm/lib/libsvm\.so\.1$

# Objects allowed to have unused dependencies
UNUSED_DEPS ^usr/lib/picl/plugins/ # require devtree dependencies
Expand Down
1 change: 1 addition & 0 deletions exception_lists/closed-bins
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
./usr/has
./usr/has/bin
./usr/has/bin/patch
./usr/include/sys/lvm
./usr/include/sys/pcmcia
./usr/include/sys/usb/clients/hwarc
./usr/include/sys/uwb
Expand Down
16 changes: 4 additions & 12 deletions exception_lists/packaging
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
# 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>
# Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
# Copyright 2016 Nexenta Systems, Inc.
#

#
Expand Down Expand Up @@ -299,15 +299,6 @@ usr/include/sys/ontrap.h
usr/include/sys/sysmsg_impl.h
usr/include/sys/vlan.h
#
# These files are installed in the proto area so lvm can use
# them during the build process.
#
lib/llib-lmeta
lib/llib-lmeta.ln
usr/include/sdssc.h
usr/lib/llib-lmeta
usr/lib/llib-lmeta.ln
#
# non-public pci header
#
usr/include/sys/pci_impl.h
Expand Down Expand Up @@ -716,9 +707,10 @@ usr/include/sys/kiconv_utf8_gb2312.h
usr/include/sys/kiconv_utf8_hkscs.h
usr/include/sys/kiconv_utf8_uhc.h
#
# At this time, the ttydefs.cleanup file is only useful on sun4u systems
# At this time, the directory and its contents
# are only useful on sun4u systems
#
etc/flash/postdeployment/ttydefs.cleanup i386
etc/flash/postdeployment i386
#
# This header file is shared only between the power commands and
# ppm/srn modules # and should not be in any package
Expand Down
5 changes: 2 additions & 3 deletions usr/src/Makefile.lint
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
#
# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2012 by Delphix. All rights reserved.
# Copyright 2015 Nexenta Systems, Inc. All rights reserved.
# Copyright 2015 Garrett D'Amore <garrett@damore.org>
# Copyright 2016 Nexenta Systems, Inc.
#

# include global definitions
include Makefile.master
Expand Down Expand Up @@ -193,7 +194,6 @@ COMMON_SUBDIRS = \
cmd/logins \
cmd/ls \
cmd/luxadm \
cmd/lvm \
cmd/mailwrapper \
cmd/makekey \
cmd/mdb \
Expand Down Expand Up @@ -450,7 +450,6 @@ COMMON_SUBDIRS = \
lib/libzfs_jni \
lib/libzonecfg \
lib/libzoneinfo \
lib/lvm \
lib/madv \
lib/mpss \
lib/nametoaddr \
Expand Down
13 changes: 1 addition & 12 deletions usr/src/Targetdirs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved.
# Copyright (c) 2013 RackTop Systems.
# Copyright 2014 Garrett D'Amore <garrett@damore.org>
# Copyright 2014 Nexenta Systems, Inc. All rights reserved.
# Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
# Copyright 2016 Nexenta Systems, Inc.
#

#
Expand Down Expand Up @@ -260,7 +260,6 @@ DIRS= \
/usr/lib/class/SDC \
/usr/lib/class/TS \
/usr/lib/crypto \
/usr/lib/drv \
/usr/lib/elfedit \
/usr/lib/fm \
/usr/lib/font \
Expand Down Expand Up @@ -329,8 +328,6 @@ DIRS= \
/usr/share/lib/xml/dtd \
/usr/share/man \
/usr/share/src \
/usr/snadm \
/usr/snadm/lib \
/usr/ucb \
$(MACH32_DIRS) \
/usr/ucblib \
Expand Down Expand Up @@ -874,8 +871,6 @@ $(ROOT)/usr/lib/libmd.so.1:= REALPATH=../../lib/libmd.so.1
$(ROOT)/usr/lib/libmd.so:= REALPATH=../../lib/libmd.so.1
$(ROOT)/usr/lib/libmd5.so.1:= REALPATH=../../lib/libmd5.so.1
$(ROOT)/usr/lib/libmd5.so:= REALPATH=../../lib/libmd5.so.1
$(ROOT)/usr/lib/libmeta.so.1:= REALPATH=../../lib/libmeta.so.1
$(ROOT)/usr/lib/libmeta.so:= REALPATH=../../lib/libmeta.so.1
$(ROOT)/usr/lib/libmp.so.1:= REALPATH=../../lib/libmp.so.1
$(ROOT)/usr/lib/libmp.so.2:= REALPATH=../../lib/libmp.so.2
$(ROOT)/usr/lib/libmp.so:= REALPATH=../../lib/libmp.so.2
Expand Down Expand Up @@ -995,8 +990,6 @@ $(ROOT)/usr/lib/llib-lm:= REALPATH=../../lib/llib-lm
$(ROOT)/usr/lib/llib-lm.ln:= REALPATH=../../lib/llib-lm.ln
$(ROOT)/usr/lib/llib-lmd5.ln:= REALPATH=../../lib/llib-lmd5.ln
$(ROOT)/usr/lib/llib-lmd5:= REALPATH=../../lib/llib-lmd5
$(ROOT)/usr/lib/llib-lmeta.ln:= REALPATH=../../lib/llib-lmeta.ln
$(ROOT)/usr/lib/llib-lmeta:= REALPATH=../../lib/llib-lmeta
$(ROOT)/usr/lib/llib-lnsl.ln:= REALPATH=../../lib/llib-lnsl.ln
$(ROOT)/usr/lib/llib-lnsl:= REALPATH=../../lib/llib-lnsl
$(ROOT)/usr/lib/llib-lnvpair.ln:= REALPATH=../../lib/llib-lnvpair.ln
Expand Down Expand Up @@ -1505,8 +1498,6 @@ SYM.USRLIB= \
/usr/lib/libmd.so.1 \
/usr/lib/libmd5.so \
/usr/lib/libmd5.so.1 \
/usr/lib/libmeta.so \
/usr/lib/libmeta.so.1 \
/usr/lib/libmp.so \
/usr/lib/libmp.so.1 \
/usr/lib/libmp.so.2 \
Expand Down Expand Up @@ -1624,8 +1615,6 @@ SYM.USRLIB= \
/usr/lib/llib-lm.ln \
/usr/lib/llib-lmd5 \
/usr/lib/llib-lmd5.ln \
/usr/lib/llib-lmeta \
/usr/lib/llib-lmeta.ln \
/usr/lib/llib-lnsl \
/usr/lib/llib-lnsl.ln \
/usr/lib/llib-lnvpair \
Expand Down
6 changes: 3 additions & 3 deletions usr/src/cmd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@
# CDDL HEADER END
#

#
# Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright 2015 Nexenta Systems, Inc. All rights reserved.
# Copyright 2016 Joyent, Inc.
# Copyright (c) 2012 by Delphix. All rights reserved.
# Copyright (c) 2013 DEY Storage Systems, Inc. All rights reserved.
# Copyright 2014 Garrett D'Amore <garrett@damore.org>
# Copyright 2016 Toomas Soome <tsoome@me.com>
# Copyright 2016 Nexenta Systems, Inc.
#

include ../Makefile.master

Expand Down Expand Up @@ -248,7 +250,6 @@ COMMON_SUBDIRS= \
look \
ls \
luxadm \
lvm \
mach \
mail \
mailwrapper \
Expand Down Expand Up @@ -619,7 +620,6 @@ MSGSUBDIRS= \
logins \
ls \
luxadm \
lvm \
mailx \
make \
man \
Expand Down
9 changes: 3 additions & 6 deletions usr/src/cmd/Makefile.check
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@
# CDDL HEADER END
#

#
# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright 2014 Garrett D'Amore <garrett@damore.org>
# Copyright 2016 Nexenta Systems, Inc.
#

include ../Makefile.master

Expand Down Expand Up @@ -118,12 +121,6 @@ MANIFEST_SUBDIRS= \
krb5/kwarn \
krb5/slave \
lp/cmd/lpsched \
lvm/rpc.mdcommd \
lvm/rpc.metad \
lvm/rpc.metamedd \
lvm/rpc.metamhd \
lvm/md_monitord \
lvm/util \
picl/picld \
pools/poold \
print/bsd-sysv-commands \
Expand Down
6 changes: 3 additions & 3 deletions usr/src/cmd/boot/bootadm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
#
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# Copyright 2011 Nexenta Systems, Inc. All rights reserved.
#
# Copyright 2016 Toomas Soome <tsoome@me.com>
# Copyright 2016 Nexenta Systems, Inc.
#

PROG= bootadm
Expand All @@ -43,7 +43,7 @@ POFILE= bootadm_cmd.po

LDLIBS_i386= -lfdisk
LDLIBS += -lficl-sys -lpkcs11 -lcryptoutil -lnvpair -lgen -ladm -lefi
LDLIBS += -lscf -lz -lbe -lzfs $(LDLIBS_$(MACH))
LDLIBS += -lz -lbe -lzfs $(LDLIBS_$(MACH))

# Writing into string literals is incorrect. We need to match gcc's
# behavior, which causes us to take SIGSEGV on such a write.
Expand Down
Loading

0 comments on commit 5f10ef6

Please sign in to comment.