illumos-gate-1681 Wdiff usr/src/pkg/manifests/network-iscsi-target.mf

Print this page

1681 support for BUILD64=# no longer works

Split	Close
Expand all
Collapse all

          --- old/usr/src/pkg/manifests/network-iscsi-target.mf
          +++ new/usr/src/pkg/manifests/network-iscsi-target.mf

   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.

↓ open down ↓

14 lines elided

↑ open up ↑

  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   23  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  24   24  # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
       25 +# Copyright 2014 Andrew Stormont.
  25   26  #
  26   27  
  27   28  set name=pkg.fmri value=pkg:/network/iscsi/target@$(PKGVERS)
  28   29  set name=pkg.description value="Sun iSCSI COMSTAR Port Provider"
  29   30  set name=pkg.summary value="Sun iSCSI COMSTAR Port Provider"
  30   31  set name=info.classification \
  31   32      value=org.opensolaris.category.2008:System/Hardware
  32   33  set name=variant.arch value=$(ARCH)
  33   34  dir path=kernel group=sys
  34   35  dir path=kernel/drv group=sys

  35   36  dir path=kernel/drv/$(ARCH64) group=sys
  36   37  dir path=lib variant.opensolaris.zone=global
  37   38  dir path=lib/svc variant.opensolaris.zone=global

↓ open down ↓

3 lines elided

↑ open up ↑

  38   39  dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global
  39   40  dir path=lib/svc/manifest/network group=sys variant.opensolaris.zone=global
  40   41  dir path=lib/svc/manifest/network/iscsi group=sys \
  41   42      variant.opensolaris.zone=global
  42   43  dir path=lib/svc/method variant.opensolaris.zone=global
  43   44  dir path=usr group=sys
  44   45  dir path=usr/include
  45   46  dir path=usr/include/sys
  46   47  dir path=usr/include/sys/iscsit
  47   48  dir path=usr/lib
  48      -dir path=usr/lib/$(ARCH64)
       49 +$(BUILD64)dir path=usr/lib/$(ARCH64)
  49   50  dir path=usr/sbin
  50   51  dir path=usr/share/man/man1m
  51   52  dir path=usr/share/man/man3iscsit
  52   53  dir path=usr/share/man/man3lib
  53   54  driver name=iscsit perms="* 0600 root sys"
  54   55  file path=kernel/drv/$(ARCH64)/iscsit group=sys
  55   56  $(i386_ONLY)file path=kernel/drv/iscsit group=sys
  56   57  file path=kernel/drv/iscsit.conf group=sys
  57   58  file path=lib/svc/manifest/network/iscsi/iscsi-target.xml group=sys mode=0444 \
  58   59      variant.opensolaris.zone=global
  59   60  file path=lib/svc/method/iscsi-target mode=0555 \
  60   61      variant.opensolaris.zone=global
  61   62  file path=usr/include/libiscsit.h
  62   63  file path=usr/include/sys/iscsit/iscsit_common.h
  63      -file path=usr/lib/$(ARCH64)/libiscsit.so.1
  64      -file path=usr/lib/$(ARCH64)/llib-liscsit.ln
       64 +$(BUILD64)file path=usr/lib/$(ARCH64)/libiscsit.so.1
       65 +$(BUILD64)file path=usr/lib/$(ARCH64)/llib-liscsit.ln
  65   66  file path=usr/lib/libiscsit.so.1
  66   67  file path=usr/lib/llib-liscsit
  67   68  file path=usr/lib/llib-liscsit.ln
  68   69  file path=usr/sbin/itadm mode=0555
  69   70  file path=usr/share/man/man1m/itadm.1m
  70   71  file path=usr/share/man/man3iscsit/it_config_load.3iscsit
  71   72  file path=usr/share/man/man3iscsit/it_ini_create.3iscsit
  72   73  file path=usr/share/man/man3iscsit/it_portal_create.3iscsit
  73   74  file path=usr/share/man/man3iscsit/it_tgt_create.3iscsit
  74   75  file path=usr/share/man/man3iscsit/it_tpg_create.3iscsit
  75   76  file path=usr/share/man/man3lib/libiscsit.3lib
  76   77  legacy pkg=SUNWiscsitr desc="Sun iSCSI COMSTAR Port Provider" \
  77   78      name="Sun iSCSI COMSTAR Port Provider (root)"
  78   79  legacy pkg=SUNWiscsitu desc="Sun iSCSI COMSTAR Port Provider" \
  79   80      name="Sun iSCSI COMSTAR Port Provider"
  80   81  license cr_Sun license=cr_Sun
  81   82  license lic_CDDL license=lic_CDDL
  82      -link path=usr/lib/$(ARCH64)/libiscsit.so target=libiscsit.so.1
       83 +$(BUILD64)link path=usr/lib/$(ARCH64)/libiscsit.so target=libiscsit.so.1
  83   84  link path=usr/lib/libiscsit.so target=libiscsit.so.1
  84   85  link path=usr/share/man/man3iscsit/it_config_commit.3iscsit \
  85   86      target=it_config_load.3iscsit
  86   87  link path=usr/share/man/man3iscsit/it_config_free.3iscsit \
  87   88      target=it_config_load.3iscsit
  88   89  link path=usr/share/man/man3iscsit/it_config_setprop.3iscsit \
  89   90      target=it_config_load.3iscsit
  90   91  link path=usr/share/man/man3iscsit/it_ini_delete.3iscsit \
  91   92      target=it_ini_create.3iscsit
  92   93  link path=usr/share/man/man3iscsit/it_ini_free.3iscsit \

  93   94      target=it_ini_create.3iscsit
  94   95  link path=usr/share/man/man3iscsit/it_ini_setprop.3iscsit \
  95   96      target=it_ini_create.3iscsit
  96   97  link path=usr/share/man/man3iscsit/it_portal_delete.3iscsit \
  97   98      target=it_portal_create.3iscsit
  98   99  link path=usr/share/man/man3iscsit/it_tgt_delete.3iscsit \
  99  100      target=it_tgt_create.3iscsit
 100  101  link path=usr/share/man/man3iscsit/it_tgt_free.3iscsit \
 101  102      target=it_tgt_create.3iscsit
 102  103  link path=usr/share/man/man3iscsit/it_tgt_setprop.3iscsit \
 103  104      target=it_tgt_create.3iscsit
 104  105  link path=usr/share/man/man3iscsit/it_tpg_delete.3iscsit \
 105  106      target=it_tpg_create.3iscsit
 106  107  link path=usr/share/man/man3iscsit/it_tpg_free.3iscsit \
 107  108      target=it_tpg_create.3iscsit
 108  109  link path=usr/share/man/man3iscsit/it_tpgt_create.3iscsit \
 109  110      target=it_tgt_create.3iscsit
 110  111  link path=usr/share/man/man3iscsit/it_tpgt_delete.3iscsit \
 111  112      target=it_tgt_create.3iscsit
 112  113  link path=usr/share/man/man3iscsit/it_tpgt_free.3iscsit \
 113  114      target=it_tgt_create.3iscsit

↓ open down ↓

21 lines elided

↑ open up ↑

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX