NEX-9559 remove nza-closed cruft
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
Reviewed by: Steve Peng <steve.peng@nexenta.com>
NEX-5272 KRRP: replicate snapshot properties
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Alexey Komarov <alexey.komarov@nexenta.com>
Reviewed by: Alex Aizman <alex.aizman@nexenta.com>
2605 want to resume interrupted zfs send
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Paul Dagnelie <pcd@delphix.com>
Reviewed by: Richard Elling <Richard.Elling@RichardElling.com>
Reviewed by: Xin Li <delphij@freebsd.org>
Reviewed by: Arne Jansen <sensille@gmx.net>
Approved by: Dan McDonald <danmcd@omniti.com>
OS-103 handle CoS descriptor persistent references across vdev operations
Moved closed ZFS files to open repo, changed Makefiles accordingly
Removed unneeded weak symbols
re #8279 rb3915 need a mechanism to notify NMS about ZFS config changes (Opened code)
Bug 11205: add missing libzfs_closed_stubs.c to fix opensource-only build.
ZFS plus work: special vdevs, cos, cos/vdev properties

          --- old/usr/src/lib/libzfs/Makefile.com
          +++ new/usr/src/lib/libzfs/Makefile.com

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.

  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  #
  22   22  # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  23   23  # Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com>
  24   24  # Copyright (c) 2011, 2016 by Delphix. All rights reserved.
       25 +# Copyright 2016 Nexenta Systems, Inc. All rights reserved.
  25   26  #
  26   27  
  27   28  LIBRARY= libzfs.a
  28   29  VERS= .1
  29   30  
  30   31  OBJS_SHARED=                    \
  31   32          zfeature_common.o       \
       33 +        zfs_sendrecv.o          \
  32   34          zfs_comutil.o           \
  33   35          zfs_deleg.o             \
  34   36          zfs_fletcher.o          \
  35   37          zfs_namecheck.o         \
  36   38          zfs_prop.o              \
  37   39          zpool_prop.o            \
  38      -        zprop_common.o
       40 +        zprop_common.o          \
       41 +        cos_prop.o              \
       42 +        vdev_prop.o
  39   43  
  40   44  OBJS_COMMON=                    \
  41   45          libzfs_changelist.o     \
  42   46          libzfs_config.o         \
  43   47          libzfs_dataset.o        \
  44   48          libzfs_diff.o           \
  45   49          libzfs_fru.o            \
  46   50          libzfs_import.o         \
  47   51          libzfs_iter.o           \
  48   52          libzfs_mount.o          \

  49   53          libzfs_pool.o           \
  50   54          libzfs_sendrecv.o       \
  51   55          libzfs_status.o         \
  52   56          libzfs_util.o
  53   57  
  54   58  OBJECTS= $(OBJS_COMMON) $(OBJS_SHARED)
  55   59  
  56   60  include ../../Makefile.lib
  57   61  
  58   62  # libzfs must be installed in the root filesystem for mount(1M)
  59   63  include ../../Makefile.rootfs

  60   64  
  61   65  LIBS=   $(DYNLIB) $(LINTLIB)
  62   66  
  63   67  SRCDIR =        ../common
  64   68  
  65   69  INCS += -I$(SRCDIR)
  66   70  INCS += -I../../../uts/common/fs/zfs
  67   71  INCS += -I../../../common/zfs
  68   72  INCS += -I../../libc/inc
  69   73  
  70      -CSTD=   $(CSTD_GNU99)
       74 +CSTD=           $(CSTD_GNU99)
  71   75  C99LMODE=       -Xc99=%all
  72   76  LDLIBS +=       -lc -lm -ldevid -lgen -lnvpair -luutil -lavl -lefi \
  73   77          -ladm -lidmap -ltsol -lmd -lumem -lzfs_core -lcmdutils
  74   78  CPPFLAGS +=     $(INCS) -D_LARGEFILE64_SOURCE=1 -D_REENTRANT
  75   79  $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
  76   80  
  77   81  # There's no lint library for zlib, so only include this when building
  78   82  $(DYNLIB) := LDLIBS +=  -lz
  79   83  
  80   84  LINTFLAGS +=    -erroff=E_STATIC_UNUSED

  81   85  LINTFLAGS64 +=  -erroff=E_STATIC_UNUSED
  82   86  
  83   87  SRCS=   $(OBJS_COMMON:%.o=$(SRCDIR)/%.c)        \
  84   88          $(OBJS_SHARED:%.o=$(SRC)/common/zfs/%.c)
  85   89  $(LINTLIB) := SRCS=     $(SRCDIR)/$(LINTSRC)
  86   90  
  87   91  .KEEP_STATE:
  88   92  
  89   93  all: $(LIBS)
  90   94  
  91   95  lint: lintcheck
  92   96  
  93   97  pics/%.o: ../../../common/zfs/%.c
  94   98          $(COMPILE.c) -o $@ $<
  95   99          $(POST_PROCESS_O)
  96  100  
  97  101  include ../../Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX