1681 support for BUILD64=# no longer works

          --- old/usr/src/pkg/manifests/system-file-system-zfs-tests.mf
          +++ new/usr/src/pkg/manifests/system-file-system-zfs-tests.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 (c) 2012 by Delphix. All rights reserved.
       25 +# Copyright 2014 Andrew Stormont.
  25   26  #
  26   27  
  27   28  set name=pkg.fmri value=pkg:/system/file-system/zfs/tests@$(PKGVERS)
  28   29  set name=pkg.description value="ZFS test commands"
  29   30  set name=pkg.summary value="ZFS unbundled utilities"
  30   31  set name=info.classification \
  31   32      value=org.opensolaris.category.2008:Development/System
  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=usr group=sys
  37   38  dir path=usr/bin
  38   39  $(i386_ONLY)dir path=usr/bin/$(ARCH32)
  39      -dir path=usr/bin/$(ARCH64)
       40 +$(BUILD64)dir path=usr/bin/$(ARCH64)
  40   41  dir path=usr/include
  41   42  dir path=usr/include/sys
  42   43  dir path=usr/include/sys/fs
  43   44  dir path=usr/lib
  44   45  dir path=usr/lib/devfsadm group=sys
  45   46  dir path=usr/lib/devfsadm/linkmod group=sys
  46   47  dir path=usr/sbin
  47   48  $(i386_ONLY)dir path=usr/sbin/$(ARCH32)
  48      -dir path=usr/sbin/$(ARCH64)
       49 +$(BUILD64)dir path=usr/sbin/$(ARCH64)
  49   50  driver name=zut perms="* 0666 root sys"
  50   51  file path=kernel/drv/$(ARCH64)/zut group=sys
  51   52  $(i386_ONLY)file path=kernel/drv/zut group=sys
  52   53  file path=kernel/drv/zut.conf group=sys
  53   54  $(i386_ONLY)file path=usr/bin/$(ARCH32)/zlook mode=0555
  54   55  $(i386_ONLY)file path=usr/bin/$(ARCH32)/ztest mode=0555
  55      -file path=usr/bin/$(ARCH64)/zlook mode=0555
  56      -file path=usr/bin/$(ARCH64)/ztest mode=0555
       56 +$(BUILD64)file path=usr/bin/$(ARCH64)/zlook mode=0555
       57 +$(BUILD64)file path=usr/bin/$(ARCH64)/ztest mode=0555
  57   58  file path=usr/include/sys/fs/zut.h
  58   59  file path=usr/lib/devfsadm/linkmod/SUNW_zut_link.so group=sys
  59   60  $(i386_ONLY)file path=usr/sbin/$(ARCH32)/zhack mode=0555
  60   61  $(i386_ONLY)file path=usr/sbin/$(ARCH32)/zinject mode=0555
  61      -file path=usr/sbin/$(ARCH64)/zhack mode=0555
  62      -file path=usr/sbin/$(ARCH64)/zinject mode=0555
       62 +$(BUILD64)file path=usr/sbin/$(ARCH64)/zhack mode=0555
       63 +$(BUILD64)file path=usr/sbin/$(ARCH64)/zinject mode=0555
  63   64  hardlink path=usr/bin/zlook target=../../usr/lib/isaexec
  64   65  hardlink path=usr/bin/ztest target=../../usr/lib/isaexec
  65   66  hardlink path=usr/sbin/zhack target=../../usr/lib/isaexec
  66   67  hardlink path=usr/sbin/zinject target=../../usr/lib/isaexec
  67   68  legacy pkg=SUNWonzfs desc="ZFS test commands" name="ZFS unbundled utilities"
  68   69  legacy pkg=SUNWonzfsr desc="ZFS test driver" name="ZFS unbundled driver"
  69   70  license cr_Sun license=cr_Sun
  70   71  license lic_CDDL license=lic_CDDL
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX