Print this page
1681 support for BUILD64=# no longer works

Split Close
Expand all
Collapse all
          --- old/usr/src/pkg/manifests/service-hal.mf
          +++ new/usr/src/pkg/manifests/service-hal.mf
↓ open down ↓ 14 lines elided ↑ open up ↑
  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 2012 Nexenta Systems, Inc. All rights reserved.
       25 +# Copyright 2014 Andrew Stormont.
  25   26  #
  26   27  
  27   28  set name=pkg.fmri value=pkg:/service/hal@$(PKGVERS)
  28   29  set name=pkg.description \
  29   30      value="Hardware Abstraction Layer, HAL (freedesktop.org)"
  30   31  set name=pkg.summary value="Hardware Abstraction Layer"
  31   32  set name=info.classification \
  32   33      value=org.opensolaris.category.2008:System/Hardware
  33   34  set name=variant.arch value=$(ARCH)
  34   35  dir path=etc group=sys variant.opensolaris.zone=global
↓ open down ↓ 14 lines elided ↑ open up ↑
  49   50  dir path=etc/hal/fdi/preprobe/20thirdparty variant.opensolaris.zone=global
  50   51  dir path=etc/hal/fdi/preprobe/30user variant.opensolaris.zone=global
  51   52  dir path=lib variant.opensolaris.zone=global
  52   53  dir path=lib/svc variant.opensolaris.zone=global
  53   54  dir path=lib/svc/manifest group=sys variant.opensolaris.zone=global
  54   55  dir path=lib/svc/manifest/network group=sys variant.opensolaris.zone=global
  55   56  dir path=lib/svc/manifest/system group=sys variant.opensolaris.zone=global
  56   57  dir path=lib/svc/method variant.opensolaris.zone=global
  57   58  dir path=usr group=sys
  58   59  dir path=usr/lib
  59      -dir path=usr/lib/$(ARCH64)
  60      -dir path=usr/lib/$(ARCH64)/pkgconfig group=other
       60 +$(BUILD64)dir path=usr/lib/$(ARCH64)
       61 +$(BUILD64)dir path=usr/lib/$(ARCH64)/pkgconfig group=other
  61   62  dir path=usr/lib/hal
  62   63  dir path=usr/lib/hal/sunos
  63   64  dir path=usr/lib/pkgconfig group=other
  64   65  dir path=usr/sbin
  65   66  dir path=usr/share
  66   67  dir path=usr/share/lib
  67   68  dir path=usr/share/lib/xml group=sys
  68   69  dir path=usr/share/lib/xml/dtd group=sys
  69   70  dir path=usr/share/man
  70   71  dir path=usr/share/man/man1m
↓ open down ↓ 36 lines elided ↑ open up ↑
 107  108      variant.opensolaris.zone=global
 108  109  file path=etc/hal/fdi/preprobe/10osvendor/20-printers.fdi mode=0444 \
 109  110      variant.opensolaris.zone=global
 110  111  file path=lib/svc/manifest/network/network-discovery.xml group=sys mode=0444 \
 111  112      variant.opensolaris.zone=global
 112  113  file path=lib/svc/manifest/system/hal.xml group=sys mode=0444 \
 113  114      variant.opensolaris.zone=global
 114  115  file path=lib/svc/method/svc-hal mode=0555 variant.opensolaris.zone=global
 115  116  file path=lib/svc/method/svc-network-discovery mode=0555 \
 116  117      variant.opensolaris.zone=global
 117      -file path=usr/lib/$(ARCH64)/libhal-storage.so.1.0.0
 118      -file path=usr/lib/$(ARCH64)/libhal.so.1.0.0
 119      -file path=usr/lib/$(ARCH64)/llib-lhal-storage.ln
 120      -file path=usr/lib/$(ARCH64)/llib-lhal.ln
 121      -file path=usr/lib/$(ARCH64)/pkgconfig/hal-storage.pc
 122      -file path=usr/lib/$(ARCH64)/pkgconfig/hal.pc
      118 +$(BUILD64)file path=usr/lib/$(ARCH64)/libhal-storage.so.1.0.0
      119 +$(BUILD64)file path=usr/lib/$(ARCH64)/libhal.so.1.0.0
      120 +$(BUILD64)file path=usr/lib/$(ARCH64)/llib-lhal-storage.ln
      121 +$(BUILD64)file path=usr/lib/$(ARCH64)/llib-lhal.ln
      122 +$(BUILD64)file path=usr/lib/$(ARCH64)/pkgconfig/hal-storage.pc
      123 +$(BUILD64)file path=usr/lib/$(ARCH64)/pkgconfig/hal.pc
 123  124  file path=usr/lib/hal/hal-functions mode=0555
 124  125  file path=usr/lib/hal/hal-is-caller-privileged mode=0555
 125  126  file path=usr/lib/hal/hal-storage-cleanup-all-mountpoints mode=0555
 126  127  file path=usr/lib/hal/hal-storage-cleanup-mountpoint mode=0555
 127  128  file path=usr/lib/hal/hal-storage-closetray mode=0555
 128  129  file path=usr/lib/hal/hal-storage-eject mode=0555
 129  130  file path=usr/lib/hal/hal-storage-mount mode=0555
 130  131  file path=usr/lib/hal/hal-storage-unmount mode=0555
 131  132  file path=usr/lib/hal/hal-storage-zpool-export mode=0555
 132  133  file path=usr/lib/hal/hal-storage-zpool-import mode=0555
↓ open down ↓ 45 lines elided ↑ open up ↑
 178  179  file path=usr/share/man/man4/fdi.4
 179  180  file path=usr/share/man/man5/hal.5
 180  181  legacy pkg=SUNWhal desc="Hardware Abstraction Layer, HAL (freedesktop.org)" \
 181  182      name="Hardware Abstraction Layer"
 182  183  legacy pkg=SUNWhalr \
 183  184      desc="Hardware Abstraction Layer, HAL (freedesktop.org) (Root)" \
 184  185      name="Hardware Abstraction Layer (Root)"
 185  186  license cr_Sun license=cr_Sun
 186  187  license lic_CDDL license=lic_CDDL
 187  188  license usr/src/cmd/hal/LICENSE license=usr/src/cmd/hal/LICENSE
 188      -link path=usr/lib/$(ARCH64)/libhal-storage.so target=./libhal-storage.so.1.0.0
 189      -link path=usr/lib/$(ARCH64)/libhal-storage.so.1 \
      189 +$(BUILD64)link path=usr/lib/$(ARCH64)/libhal-storage.so \
 190  190      target=./libhal-storage.so.1.0.0
 191      -link path=usr/lib/$(ARCH64)/libhal.so target=./libhal.so.1.0.0
 192      -link path=usr/lib/$(ARCH64)/libhal.so.1 target=./libhal.so.1.0.0
      191 +$(BUILD64)link path=usr/lib/$(ARCH64)/libhal-storage.so.1 \
      192 +    target=./libhal-storage.so.1.0.0
      193 +$(BUILD64)link path=usr/lib/$(ARCH64)/libhal.so target=./libhal.so.1.0.0
      194 +$(BUILD64)link path=usr/lib/$(ARCH64)/libhal.so.1 target=./libhal.so.1.0.0
 193  195  link path=usr/lib/libhal-storage.so target=./libhal-storage.so.1.0.0
 194  196  link path=usr/lib/libhal-storage.so.1 target=./libhal-storage.so.1.0.0
 195  197  link path=usr/lib/libhal.so target=./libhal.so.1.0.0
 196  198  link path=usr/lib/libhal.so.1 target=./libhal.so.1.0.0
 197  199  link path=usr/share/man/man1m/hal-find-by-capability.1m target=hal-find.1m
 198  200  link path=usr/share/man/man1m/hal-find-by-property.1m target=hal-find.1m
 199  201  link path=usr/share/man/man1m/hal-set-property.1m target=hal-get-property.1m
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX