OS-4335 ipadm_door_call should work in a branded zone without chroot
OS-4336 ipmgmtd should work in a branded zone without chroot
Reviewed by: Robert Mustacchi <rm@joyent.com>

          --- old/usr/src/cmd/cmd-inet/lib/ipmgmtd/Makefile
          +++ new/usr/src/cmd/cmd-inet/lib/ipmgmtd/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  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
       22 +# Copyright 2015 Joyent, Inc.
  22   23  #
  23   24  
  24   25  # Needed for ROOTFS_LIBDIR definition
  25   26  include         ../../../../lib/Makefile.lib
  26   27  
  27   28  PROG=           ipmgmtd
  28      -OBJS=           ipmgmt_main.o ipmgmt_door.o ipmgmt_persist.o ipmgmt_util.o
       29 +OBJS=           ipmgmt_main.o ipmgmt_door.o ipmgmt_persist.o ipmgmt_util.o \
       30 +                ipmgmt_path.o
  29   31  SRCS=           $(OBJS:.o=.c)
  30   32  SVCMETHOD=      net-ipmgmt
  31   33  MANIFEST=       network-ipmgmt.xml
  32   34  CFGFILES=       ipadm.conf
  33   35  
  34   36  # Needed for ROOTETC definition
  35   37  include         ../../../Makefile.cmd
  36   38  
  37   39  ROOTCFGDIR=             $(ROOTETC)/ipadm
  38   40  ROOTCFGFILES=           $(CFGFILES:%=$(ROOTCFGDIR)/%)

  39   41  ROOTMANIFESTDIR=        $(ROOTSVCNETWORK)
  40   42  
  41   43  CERRWARN += -_gcc=-Wno-switch
  42   44  CERRWARN += -_gcc=-Wno-uninitialized
  43   45  
  44   46  $(ROOTCFGFILES) := OWNER= ipadm
  45   47  $(ROOTCFGFILES) := GROUP= sys
  46   48  $(ROOTCFGFILES) := FILEMODE= 644
  47   49  
  48   50  ROOTCMDDIR=     $(ROOTFS_LIBDIR)/inet
  49   51  
  50   52  LDLIBS += -lipadm -lnvpair -lsecdb -lnsl -lumem -lscf
  51   53  
  52   54  #
  53   55  # Instrument ipmgmtd with CTF data to ease debugging.
  54   56  #
  55   57  CTFCONVERT_HOOK = && $(CTFCONVERT_O)
  56   58  CTFMERGE_HOOK = && $(CTFMERGE) -L VERSION -o $@ $(OBJS)
  57   59  $(OBJS) := CFLAGS += $(CTF_FLAGS)
  58   60  
  59   61  .KEEP_STATE:
  60   62  
  61   63  .PARALLEL:
  62   64  
  63   65  all: $(PROG)
  64   66  
  65   67  $(PROG): $(OBJS)
  66   68          $(LINK.c) -o $@ $(OBJS) $(LDLIBS) $(CTFMERGE_HOOK)
  67   69          $(POST_PROCESS)
  68   70  
  69   71  install: $(ROOTCMD) $(ROOTMANIFEST) $(ROOTSVCMETHOD) $(ROOTCFGDIR) \
  70   72          $(ROOTCFGFILES)
  71   73  
  72   74  check:  $(SRCS) $(HEADERS) $(CHKMANIFEST)
  73   75          $(CSTYLE) -cpP $(SRCS) $(HEADERS)
  74   76  
  75   77  $(ROOTCMD): $(PROG)
  76   78  
  77   79  clean:
  78   80          $(RM) $(OBJS)
  79   81  
  80   82  lint:   lint_SRCS
  81   83  
  82   84  $(ROOTCFGDIR):
  83   85          $(INS.dir)
  84   86  
  85   87  $(ROOTCFGDIR)/%: $(ROOTCFGDIR) %
  86   88          $(INS.file)
  87   89  
  88   90  include         ../../../Makefile.targ

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX