1681 support for BUILD64=# no longer works

          --- old/usr/src/pkg/manifests/storage-avs-remote-mirror.mf
          +++ new/usr/src/pkg/manifests/storage-avs-remote-mirror.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:/storage/avs/remote-mirror@$(PKGVERS)
  33   34  set name=pkg.description \

  34   35      value="Remote Mirror copy software provides replication across IP networks"
  35   36  set name=pkg.summary value="Sun StorageTek Availability Suite Remote Mirror"
  36   37  set name=info.classification \
  37   38      value=org.opensolaris.category.2008:System/Hardware
  38   39  set name=variant.arch value=$(ARCH)
  39   40  dir path=etc group=sys
  40   41  dir path=etc/init.d group=sys
  41   42  dir path=kernel group=sys
  42   43  dir path=kernel/kmdb group=sys
  43   44  dir path=kernel/kmdb/$(ARCH64) group=sys
  44   45  dir path=lib
  45   46  dir path=lib/svc
  46   47  dir path=lib/svc/manifest group=sys
  47   48  dir path=lib/svc/manifest/system group=sys
  48   49  dir path=lib/svc/method
  49   50  dir path=usr group=sys
  50   51  dir path=usr/bin
  51   52  dir path=usr/cluster group=sys
  52   53  dir path=usr/cluster/lib
  53   54  dir path=usr/cluster/lib/dscfg
  54   55  dir path=usr/cluster/lib/dscfg/start

  55   56  dir path=usr/cluster/lib/dscfg/stop
  56   57  dir path=usr/cluster/sbin group=other
  57   58  dir path=usr/kernel group=sys
  58   59  dir path=usr/kernel/drv group=sys
  59   60  dir path=usr/kernel/drv/$(ARCH64) group=sys
  60   61  dir path=usr/kernel/misc group=sys
  61   62  dir path=usr/kernel/misc/$(ARCH64) group=sys
  62   63  dir path=usr/lib
  63   64  dir path=usr/lib/mdb group=sys
  64   65  dir path=usr/lib/mdb/kvm group=sys
  65      -dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
       66 +$(BUILD64)dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
  66   67  dir path=usr/sbin
  67   68  dir path=usr/share/man
  68   69  dir path=usr/share/man/man1m
  69   70  dir path=usr/share/man/man4
  70   71  driver name=rdc devlink=type=ddi_pseudo;name=rdc\t\D perms="* 0666 root sys" \
  71   72      privs=sys_config privs=sys_devices
  72   73  file path=etc/init.d/rdc mode=0744
  73   74  file path=etc/init.d/rdc.cluster mode=0744
  74   75  file path=etc/init.d/rdcfinish mode=0744
  75   76  file path=kernel/kmdb/$(ARCH64)/rdc group=sys mode=0555

  76   77  $(i386_ONLY)file path=kernel/kmdb/rdc group=sys mode=0555
  77   78  file path=lib/svc/manifest/system/nws_rdc.xml group=sys mode=0444
  78   79  file path=lib/svc/manifest/system/nws_rdcsyncd.xml group=sys mode=0444
  79   80  file path=usr/bin/sndradm mode=0555
  80   81  file path=usr/bin/sndrboot mode=0555
  81   82  file path=usr/bin/sndrd mode=0555
  82   83  file path=usr/bin/sndrsyncd mode=0555

  83   84  file path=usr/cluster/sbin/rdc mode=0744
  84   85  file path=usr/kernel/drv/$(ARCH64)/rdc group=sys
  85   86  file path=usr/kernel/drv/$(ARCH64)/rdcsrv group=sys
  86   87  file path=usr/kernel/drv/$(ARCH64)/rdcstub group=sys
  87   88  $(i386_ONLY)file path=usr/kernel/drv/rdc group=sys
  88   89  file path=usr/kernel/drv/rdc.conf group=sys \
  89   90      original_name=SUNWrdc:usr/kernel/drv/rdc.conf preserve=true
  90   91  $(i386_ONLY)file path=usr/kernel/drv/rdcsrv group=sys
  91   92  $(i386_ONLY)file path=usr/kernel/drv/rdcstub group=sys
  92   93  file path=usr/lib/librdc.so.1
  93      -file path=usr/lib/mdb/kvm/$(ARCH64)/rdc.so group=sys mode=0555
       94 +$(BUILD64)file path=usr/lib/mdb/kvm/$(ARCH64)/rdc.so group=sys mode=0555
  94   95  $(i386_ONLY)file path=usr/lib/mdb/kvm/rdc.so group=sys mode=0555
  95   96  file path=usr/share/man/man1m/sndradm.1m
  96   97  file path=usr/share/man/man1m/sndrd.1m
  97   98  file path=usr/share/man/man1m/sndrsyncd.1m
  98   99  file path=usr/share/man/man4/rdc.cf.4
  99  100  file path=usr/share/man/man4/sndr.4
 100  101  hardlink path=lib/svc/method/svc-rdc target=../../../etc/init.d/rdc
 101  102  hardlink path=lib/svc/method/svc-rdcsyncd target=../../../etc/init.d/rdcfinish
 102  103  hardlink path=usr/kernel/misc/$(ARCH64)/rdcsrv \
 103  104      target=../../drv/$(ARCH64)/rdcsrv

 104  105  hardlink path=usr/kernel/misc/$(ARCH64)/rdcstub \
 105  106      target=../../drv/$(ARCH64)/rdcstub
 106  107  $(i386_ONLY)hardlink path=usr/kernel/misc/rdcsrv target=../drv/rdcsrv
 107  108  $(i386_ONLY)hardlink path=usr/kernel/misc/rdcstub target=../drv/rdcstub
 108  109  hardlink path=usr/lib/sndrd target=../bin/sndrd
 109  110  hardlink path=usr/lib/sndrsyncd target=../bin/sndrsyncd
 110  111  hardlink path=usr/sbin/sndradm target=../bin/sndradm
 111  112  hardlink path=usr/sbin/sndrboot target=../bin/sndrboot
 112  113  legacy pkg=SUNWrdcr \
 113  114      desc="Remote Mirror copy software provides replication across IP networks" \
 114  115      name="Sun StorageTek Availability Suite Remote Mirror (root)"
 115  116  legacy pkg=SUNWrdcu \
 116  117      desc="Remote Mirror copy software provides replication across IP networks" \
 117  118      name="Sun StorageTek Availability Suite Remote Mirror (usr)"
 118  119  license cr_Sun license=cr_Sun
 119  120  license lic_CDDL license=lic_CDDL
 120  121  link path=usr/cluster/lib/dscfg/start/10rdc target=../../../sbin/rdc
 121  122  link path=usr/cluster/lib/dscfg/stop/15rdc target=../../../sbin/rdc

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX