1681 support for BUILD64=# no longer works

          --- old/usr/src/pkg/manifests/system-fru-id.mf
          +++ new/usr/src/pkg/manifests/system-fru-id.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 value=pkg:/system/fru-id@$(PKGVERS)
  27   28  set name=pkg.description value="FRU ID prtfru command and libfru library"
  28   29  set name=pkg.summary value="FRU ID Utility and Library"
  29   30  set name=info.classification \
  30   31      value="org.opensolaris.category.2008:System/Administration and Configuration"
  31   32  set name=variant.arch value=$(ARCH)
  32   33  dir path=usr group=sys
  33   34  dir path=usr/lib
  34      -dir path=usr/lib/$(ARCH64)
       35 +$(BUILD64)dir path=usr/lib/$(ARCH64)
  35   36  $(sparc_ONLY)dir path=usr/sbin
  36   37  dir path=usr/share/man/man1m
  37      -file path=usr/lib/$(ARCH64)/libfru.so.1
  38      -$(sparc_ONLY)file path=usr/lib/$(ARCH64)/libfrupicl.so.1
  39      -file path=usr/lib/$(ARCH64)/libfruraw.so.1
  40      -file path=usr/lib/$(ARCH64)/libfrureg.so.1
  41      -file path=usr/lib/$(ARCH64)/libfruutils.so.1
  42      -file path=usr/lib/$(ARCH64)/libnvfru.so.1
       38 +$(BUILD64)file path=usr/lib/$(ARCH64)/libfru.so.1
       39 +$(sparc_BUILD64)file path=usr/lib/$(ARCH64)/libfrupicl.so.1
       40 +$(BUILD64)file path=usr/lib/$(ARCH64)/libfruraw.so.1
       41 +$(BUILD64)file path=usr/lib/$(ARCH64)/libfrureg.so.1
       42 +$(BUILD64)file path=usr/lib/$(ARCH64)/libfruutils.so.1
       43 +$(BUILD64)file path=usr/lib/$(ARCH64)/libnvfru.so.1
  43   44  file path=usr/lib/libfru.so.1
  44   45  $(sparc_ONLY)file path=usr/lib/libfrupicl.so.1
  45   46  $(sparc_ONLY)file path=usr/lib/libfrupicltree.so.1
  46   47  file path=usr/lib/libfruraw.so.1
  47   48  file path=usr/lib/libfrureg.so.1
  48   49  file path=usr/lib/libfruutils.so.1
  49   50  file path=usr/lib/libnvfru.so.1
  50   51  $(sparc_ONLY)file path=usr/sbin/prtfru mode=0755
  51   52  file path=usr/share/man/man1m/prtfru.1m
  52   53  legacy pkg=SUNWfruid desc="FRU ID prtfru command and libfru library" \
  53   54      name="FRU ID Utility and Library (Usr)"
  54   55  license cr_Sun license=cr_Sun
  55   56  license lic_CDDL license=lic_CDDL
  56      -link path=usr/lib/$(ARCH64)/libfru.so target=./libfru.so.1
  57      -$(sparc_ONLY)link path=usr/lib/$(ARCH64)/libfrupicl.so \
       57 +$(BUILD64)link path=usr/lib/$(ARCH64)/libfru.so target=./libfru.so.1
       58 +$(sparc_BUILD64)link path=usr/lib/$(ARCH64)/libfrupicl.so \
  58   59      target=./libfrupicl.so.1
  59      -link path=usr/lib/$(ARCH64)/libfruraw.so target=./libfruraw.so.1
  60      -link path=usr/lib/$(ARCH64)/libfrureg.so target=./libfrureg.so.1
  61      -link path=usr/lib/$(ARCH64)/libfruutils.so target=./libfruutils.so.1
  62      -link path=usr/lib/$(ARCH64)/libnvfru.so target=./libnvfru.so.1
       60 +$(BUILD64)link path=usr/lib/$(ARCH64)/libfruraw.so target=./libfruraw.so.1
       61 +$(BUILD64)link path=usr/lib/$(ARCH64)/libfrureg.so target=./libfrureg.so.1
       62 +$(BUILD64)link path=usr/lib/$(ARCH64)/libfruutils.so target=./libfruutils.so.1
       63 +$(BUILD64)link path=usr/lib/$(ARCH64)/libnvfru.so target=./libnvfru.so.1
  63   64  link path=usr/lib/libfru.so target=./libfru.so.1
  64   65  $(sparc_ONLY)link path=usr/lib/libfrupicl.so target=./libfrupicl.so.1
  65   66  $(sparc_ONLY)link path=usr/lib/libfrupicltree.so target=./libfrupicltree.so.1
  66   67  link path=usr/lib/libfruraw.so target=./libfruraw.so.1
  67   68  link path=usr/lib/libfrureg.so target=./libfrureg.so.1
  68   69  link path=usr/lib/libfruutils.so target=./libfruutils.so.1
  69   70  link path=usr/lib/libnvfru.so target=./libnvfru.so.1
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX