1681 support for BUILD64=# no longer works

          --- old/usr/src/pkg/manifests/system-zones-brand-sn1.mf
          +++ new/usr/src/pkg/manifests/system-zones-brand-sn1.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/zones/brand/sn1@$(PKGVERS)
  27   28  set name=pkg.description value="Support for the Fake Solaris N-1 Brand"
  28   29  set name=pkg.summary value="Fake Solaris N-1 Brand"
  29   30  set name=info.classification \
  30   31      value=org.opensolaris.category.2008:System/Virtualization
  31   32  set name=variant.arch value=$(ARCH)
  32   33  dir path=etc group=sys
  33   34  dir path=etc/zones group=sys

  34   35  $(sparc_ONLY)dir path=platform group=sys
  35   36  $(sparc_ONLY)dir path=platform/sun4u group=sys
  36   37  $(sparc_ONLY)dir path=platform/sun4u/kernel group=sys
  37   38  $(sparc_ONLY)dir path=platform/sun4u/kernel/brand group=sys

  38   39  $(sparc_ONLY)dir path=platform/sun4u/kernel/brand/$(ARCH64) group=sys
  39   40  $(sparc_ONLY)dir path=platform/sun4v group=sys
  40   41  $(sparc_ONLY)dir path=platform/sun4v/kernel group=sys
  41   42  $(sparc_ONLY)dir path=platform/sun4v/kernel/brand group=sys
  42   43  $(sparc_ONLY)dir path=platform/sun4v/kernel/brand/$(ARCH64) group=sys
  43   44  dir path=usr group=sys
  44   45  $(i386_ONLY)dir path=usr/kernel group=sys
  45   46  $(i386_ONLY)dir path=usr/kernel/brand group=sys
  46   47  $(i386_ONLY)dir path=usr/kernel/brand/$(ARCH64) group=sys
  47   48  dir path=usr/lib
  48      -dir path=usr/lib/$(ARCH64)
       49 +$(BUILD64)dir path=usr/lib/$(ARCH64)
  49   50  dir path=usr/lib/brand
  50   51  dir path=usr/lib/brand/sn1 group=sys
  51      -dir path=usr/lib/brand/sn1/$(ARCH64)
       52 +$(BUILD64)dir path=usr/lib/brand/sn1/$(ARCH64)
  52   53  file path=etc/zones/SUNWsn1.xml mode=0444
  53   54  $(sparc_ONLY)file path=platform/sun4u/kernel/brand/$(ARCH64)/sn1_brand \
  54   55      group=sys mode=0755
  55   56  $(sparc_ONLY)file path=platform/sun4v/kernel/brand/$(ARCH64)/sn1_brand \
  56   57      group=sys mode=0755
  57   58  $(i386_ONLY)file path=usr/kernel/brand/$(ARCH64)/sn1_brand group=sys mode=0755
  58   59  $(i386_ONLY)file path=usr/kernel/brand/sn1_brand group=sys mode=0755
  59      -file path=usr/lib/$(ARCH64)/sn1_brand.so.1
  60      -file path=usr/lib/brand/sn1/$(ARCH64)/sn1_librtld_db.so.1
       60 +$(BUILD64)file path=usr/lib/$(ARCH64)/sn1_brand.so.1
       61 +$(BUILD64)file path=usr/lib/brand/sn1/$(ARCH64)/sn1_librtld_db.so.1
  61   62  file path=usr/lib/brand/sn1/config.xml mode=0444
  62   63  file path=usr/lib/brand/sn1/platform.xml mode=0444
  63   64  file path=usr/lib/brand/sn1/sn1_boot mode=0755
  64   65  file path=usr/lib/brand/sn1/sn1_librtld_db.so.1
  65   66  file path=usr/lib/sn1_brand.so.1
  66   67  legacy pkg=SUNWsn1rint desc="Support for the Fake Solaris N-1 Brand" \
  67   68      name="Fake Solaris N-1 Brand (Root)"
  68   69  legacy pkg=SUNWsn1uint desc="Support for the Fake Solaris N-1 Brand" \
  69   70      name="Fake Solaris N-1 Brand (Usr)"
  70   71  license cr_Sun license=cr_Sun
  71   72  license lic_CDDL license=lic_CDDL
  72      -link path=usr/lib/brand/sn1/64 target=$(ARCH64)
       73 +$(BUILD64)link path=usr/lib/brand/sn1/64 target=$(ARCH64)
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX