1681 support for BUILD64=# no longer works

          --- old/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf
          +++ new/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.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  #
  27   28  # The default for payload-bearing actions in this package is to appear in the
  28   29  # global zone only.  See the include file for greater detail, as well as
  29   30  # information about overriding the defaults.
  30   31  #
  31   32  <include global_zone_only_component>
  32   33  set name=pkg.fmri value=pkg:/system/network/udapl/udapl-tavor@$(PKGVERS)
  33   34  set name=pkg.description value="Sun uDAPL provider for Tavor"

  34   35  set name=pkg.summary value="Sun uDAPL for Tavor (User)"
  35   36  set name=info.classification \

  36   37      value=org.opensolaris.category.2008:System/Hardware
  37   38  set name=variant.arch value=$(ARCH)
  38   39  dir path=etc group=sys
  39   40  dir path=etc/init.d group=sys
  40   41  dir path=etc/rc2.d group=sys
  41   42  dir path=kernel group=sys
  42   43  dir path=kernel/drv group=sys
  43   44  dir path=kernel/drv/$(ARCH64) group=sys
  44   45  dir path=usr group=sys
  45   46  dir path=usr/lib
  46      -dir path=usr/lib/$(ARCH64)
       47 +$(BUILD64)dir path=usr/lib/$(ARCH64)
  47   48  dir path=usr/share
  48   49  dir path=usr/share/dat group=sys
  49   50  driver name=daplt perms="* 0644 root sys"
  50   51  file path=etc/init.d/dodatadm.udaplt group=sys mode=0744 \
  51   52      original_name=SUNWudaplt:etc/init.d/dodatadm.udaplt preserve=true
  52   53  file path=kernel/drv/$(ARCH64)/daplt group=sys
  53   54  $(i386_ONLY)file path=kernel/drv/daplt group=sys
  54   55  file path=kernel/drv/daplt.conf group=sys
  55      -file path=usr/lib/$(ARCH64)/udapl_tavor.so.1
       56 +$(BUILD64)file path=usr/lib/$(ARCH64)/udapl_tavor.so.1
  56   57  file path=usr/lib/udapl_tavor.so.1
  57   58  file path=usr/share/dat/SUNWudaplt.conf group=sys mode=0644
  58   59  hardlink path=etc/rc2.d/S81dodatadm.udaplt \
  59   60      target=../../etc/init.d/dodatadm.udaplt
  60   61  legacy pkg=SUNWudapltr \
  61   62      desc="Sun uDAPL provider for Tavor driver and registration script" \
  62   63      name="Sun uDAPL for Tavor (Root)"
  63   64  legacy pkg=SUNWudapltu desc="Sun uDAPL provider for Tavor" \
  64   65      name="Sun uDAPL for Tavor (User)"
  65   66  license cr_Sun license=cr_Sun
  66   67  license lic_OSBL license=lic_OSBL
  67   68  license lic_OSBL_preamble license=lic_OSBL_preamble
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX