1681 support for BUILD64=# no longer works

          --- old/usr/src/pkg/manifests/service-storage-fibre-channel-fc-fabric.mf
          +++ new/usr/src/pkg/manifests/service-storage-fibre-channel-fc-fabric.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.
  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 +# Copyright 2014 Andrew Stormont.
  24   25  #
  25   26  
  26   27  set name=pkg.fmri \
  27   28      value=pkg:/service/storage/fibre-channel/fc-fabric@$(PKGVERS)
  28   29  set name=pkg.description value="Provides the fp plug-in library of libcfgadm."
  29   30  set name=pkg.summary value="fp cfgadm plug-in library"
  30   31  set name=info.classification \
  31   32      value=org.opensolaris.category.2008:System/Libraries
  32   33  set name=variant.arch value=$(ARCH)
  33   34  dir path=lib variant.opensolaris.zone=global
  34   35  dir path=lib/svc variant.opensolaris.zone=global
  35   36  dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global
  36   37  dir path=lib/svc/manifest/system group=sys variant.opensolaris.zone=global
  37   38  dir path=lib/svc/manifest/system/device group=sys \
  38   39      variant.opensolaris.zone=global
  39   40  dir path=lib/svc/method variant.opensolaris.zone=global
  40   41  dir path=usr group=sys
  41   42  dir path=usr/lib
  42   43  dir path=usr/lib/cfgadm
  43      -dir path=usr/lib/cfgadm/$(ARCH64)
       44 +$(BUILD64)dir path=usr/lib/cfgadm/$(ARCH64)
  44   45  file path=lib/svc/manifest/system/device/devices-fc-fabric.xml group=sys \
  45   46      mode=0444 variant.opensolaris.zone=global
  46   47  file path=lib/svc/method/fc-fabric mode=0555 variant.opensolaris.zone=global
  47      -file path=usr/lib/cfgadm/$(ARCH64)/fp.so.1
       48 +$(BUILD64)file path=usr/lib/cfgadm/$(ARCH64)/fp.so.1
  48   49  file path=usr/lib/cfgadm/fp.so.1
  49   50  legacy pkg=SUNWcfpl desc="Provides the fp plug-in library of libcfgadm." \
  50   51      name="fp cfgadm plug-in library"
  51   52  legacy pkg=SUNWcfplr \
  52   53      desc="Provides support for fp plug-in library of libcfgadm." \
  53   54      name="fp cfgadm plug-in library (root)"
  54   55  license cr_Sun license=cr_Sun
  55   56  license lic_CDDL license=lic_CDDL
  56      -link path=usr/lib/cfgadm/$(ARCH64)/fp.so target=fp.so.1
       57 +$(BUILD64)link path=usr/lib/cfgadm/$(ARCH64)/fp.so target=fp.so.1
  57   58  link path=usr/lib/cfgadm/fp.so target=fp.so.1
  58   59  depend fmri=system/storage/luxadm type=require
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX