1681 support for BUILD64=# no longer works

          --- old/usr/src/pkg/manifests/service-storage-removable-media.mf
          +++ new/usr/src/pkg/manifests/service-storage-removable-media.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   24  # Copyright 2013 Garrett D'Amore <garrett@damore.org>
       25 +# Copyright 2014 Andrew Stormont.
  25   26  #
  26   27  
  27   28  set name=pkg.fmri value=pkg:/service/storage/removable-media@$(PKGVERS)
  28   29  set name=pkg.description value="Storage media management library"
  29   30  set name=pkg.summary value="Storage media management 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
  34   35  dir path=lib/svc
  35   36  dir path=lib/svc/manifest group=sys
  36   37  dir path=lib/svc/manifest/network group=sys
  37   38  dir path=lib/svc/manifest/network/rpc group=sys
  38   39  dir path=usr group=sys
  39   40  dir path=usr/lib
  40      -dir path=usr/lib/$(ARCH64)
       41 +$(BUILD64)dir path=usr/lib/$(ARCH64)
  41   42  dir path=usr/lib/smedia
  42      -dir path=usr/lib/smedia/$(ARCH64)
       43 +$(BUILD64)dir path=usr/lib/smedia/$(ARCH64)
  43   44  dir path=usr/share/man/man1m
  44   45  file path=lib/svc/manifest/network/rpc/smserver.xml group=sys mode=0444
  45      -file path=usr/lib/$(ARCH64)/libsmedia.so.1
  46      -file path=usr/lib/$(ARCH64)/llib-lsmedia.ln
       46 +$(BUILD64)file path=usr/lib/$(ARCH64)/libsmedia.so.1
       47 +$(BUILD64)file path=usr/lib/$(ARCH64)/llib-lsmedia.ln
  47   48  file path=usr/lib/libsmedia.so.1
  48   49  file path=usr/lib/llib-lsmedia
  49   50  file path=usr/lib/llib-lsmedia.ln
  50      -file path=usr/lib/smedia/$(ARCH64)/sm_blkdev.so.1 mode=0555
  51      -file path=usr/lib/smedia/$(ARCH64)/sm_fd.so.1 mode=0555
  52      -file path=usr/lib/smedia/$(ARCH64)/sm_scsi.so.1 mode=0555
       51 +$(BUILD64)file path=usr/lib/smedia/$(ARCH64)/sm_blkdev.so.1 mode=0555
       52 +$(BUILD64)file path=usr/lib/smedia/$(ARCH64)/sm_fd.so.1 mode=0555
       53 +$(BUILD64)file path=usr/lib/smedia/$(ARCH64)/sm_scsi.so.1 mode=0555
  53   54  file path=usr/lib/smedia/rpc.smserverd mode=0555
  54   55  file path=usr/lib/smedia/sm_blkdev.so.1 mode=0555
  55   56  file path=usr/lib/smedia/sm_fd.so.1 mode=0555
  56   57  file path=usr/lib/smedia/sm_scsi.so.1 mode=0555
  57   58  file path=usr/share/man/man1m/rpc.smserverd.1m
  58   59  legacy pkg=SUNWsmedia desc="Storage media management library" \
  59   60      name="Storage media management library"
  60   61  legacy pkg=SUNWsmediar desc="Storage media management library (Root)" \
  61   62      name="Storage media management library (Root)"
  62   63  license cr_Sun license=cr_Sun
  63   64  license lic_CDDL license=lic_CDDL
  64      -link path=usr/lib/$(ARCH64)/libsmedia.so target=./libsmedia.so.1
       65 +$(BUILD64)link path=usr/lib/$(ARCH64)/libsmedia.so target=./libsmedia.so.1
  65   66  link path=usr/lib/libsmedia.so target=./libsmedia.so.1
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX