9250 remove xpv related code from bootadm

          --- old/usr/src/cmd/boot/bootadm/Makefile
          +++ new/usr/src/cmd/boot/bootadm/Makefile

   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   23  # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  23   24  # Use is subject to license terms.
  24   25  #
  25   26  # Copyright 2016 Toomas Soome <tsoome@me.com>
  26      -# Copyright 2016 Nexenta Systems, Inc.
       27 +# Copyright 2018 Nexenta Systems, Inc.
  27   28  #
  28   29  
  29   30  PROG= bootadm
  30   31  
  31   32  SBINLINKS= $(PROG)
  32   33  
  33      -OBJS= bootadm.o bootadm_upgrade.o bootadm_hyper.o bootadm_digest.o \
  34      -        bootadm_loader.o
       34 +OBJS=   bootadm.o \
       35 +        bootadm_digest.o \
       36 +        bootadm_loader.o \
       37 +        bootadm_upgrade.o
  35   38  SRCS = $(OBJS:.o=.c)
  36   39  POFILES= $(OBJS:%.o=%.po)
  37   40  
  38   41  include ../Makefile.com
  39   42  
  40   43  POFILE= bootadm_cmd.po
  41   44  
  42   45  .KEEP_STATE:
  43   46  
  44   47  LDLIBS_i386= -lfdisk

  45   48  LDLIBS += -lficl-sys -lmd -lcryptoutil -lnvpair -lgen -ladm -lefi
  46   49  LDLIBS += -lz -lbe -lzfs -lofmt $(LDLIBS_$(MACH))
  47   50  
  48   51  # Writing into string literals is incorrect.  We need to match gcc's
  49   52  # behavior, which causes us to take SIGSEGV on such a write.
  50   53  CFLAGS +=       $(XSTRCONST)
  51   54  CPPFLAGS +=     -D_FILE_OFFSET_BITS=64
  52   55  CPPFLAGS +=     -I$(SRC)/uts/common -I$(SRC)/common -I$(SRC)/common/ficl
  53   56  
  54   57  CSTD=   $(CSTD_GNU99)
  55   58  
  56   59  LINTFLAGS += -erroff=E_INCONS_ARG_DECL2
  57   60  LINTFLAGS += -erroff=E_INCONS_VAL_TYPE_DECL2
  58   61  LINTFLAGS += -erroff=E_NAME_DEF_NOT_USED2
  59   62  
  60   63  all: $(PROG)
  61   64  
  62   65  $(PROG): $(OBJS) bootadm.h
  63   66          $(LINK.c) -o $@ $(OBJS) $(LDLIBS)
  64   67          $(POST_PROCESS)
  65   68  
  66   69  install: all $(ROOTSBINPROG) .WAIT $(ROOTUSRSBINLINKS)
  67   70  
  68   71  $(POFILE): $(POFILES)
  69   72          $(RM) $@
  70   73          $(CAT) $(POFILES) > $@
  71   74  
  72   75  clean:
  73   76          -$(RM) $(OBJS) $(POFILE) $(POFILES)
  74   77  
  75   78  lint:   lint_SRCS
  76   79  
  77   80  include ../Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX