illumos-gate-1681 Cdiff usr/src/pkg/manifests/service-hal.mf

Print this page

1681 support for BUILD64=# no longer works


*** 20,29 ****
--- 20,30 ----
  #
  
  #
  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+ # Copyright 2014 Andrew Stormont.
  #
  
  set name=pkg.fmri value=pkg:/service/hal@$(PKGVERS)
  set name=pkg.description \
      value="Hardware Abstraction Layer, HAL (freedesktop.org)"
*** 54,65 ****
  dir path=lib/svc/manifest/network group=sys variant.opensolaris.zone=global
  dir path=lib/svc/manifest/system group=sys variant.opensolaris.zone=global
  dir path=lib/svc/method variant.opensolaris.zone=global
  dir path=usr group=sys
  dir path=usr/lib
! dir path=usr/lib/$(ARCH64)
! dir path=usr/lib/$(ARCH64)/pkgconfig group=other
  dir path=usr/lib/hal
  dir path=usr/lib/hal/sunos
  dir path=usr/lib/pkgconfig group=other
  dir path=usr/sbin
  dir path=usr/share
--- 55,66 ----
  dir path=lib/svc/manifest/network group=sys variant.opensolaris.zone=global
  dir path=lib/svc/manifest/system group=sys variant.opensolaris.zone=global
  dir path=lib/svc/method variant.opensolaris.zone=global
  dir path=usr group=sys
  dir path=usr/lib
! $(BUILD64)dir path=usr/lib/$(ARCH64)
! $(BUILD64)dir path=usr/lib/$(ARCH64)/pkgconfig group=other
  dir path=usr/lib/hal
  dir path=usr/lib/hal/sunos
  dir path=usr/lib/pkgconfig group=other
  dir path=usr/sbin
  dir path=usr/share
*** 112,127 ****
  file path=lib/svc/manifest/system/hal.xml group=sys mode=0444 \
      variant.opensolaris.zone=global
  file path=lib/svc/method/svc-hal mode=0555 variant.opensolaris.zone=global
  file path=lib/svc/method/svc-network-discovery mode=0555 \
      variant.opensolaris.zone=global
! file path=usr/lib/$(ARCH64)/libhal-storage.so.1.0.0
! file path=usr/lib/$(ARCH64)/libhal.so.1.0.0
! file path=usr/lib/$(ARCH64)/llib-lhal-storage.ln
! file path=usr/lib/$(ARCH64)/llib-lhal.ln
! file path=usr/lib/$(ARCH64)/pkgconfig/hal-storage.pc
! file path=usr/lib/$(ARCH64)/pkgconfig/hal.pc
  file path=usr/lib/hal/hal-functions mode=0555
  file path=usr/lib/hal/hal-is-caller-privileged mode=0555
  file path=usr/lib/hal/hal-storage-cleanup-all-mountpoints mode=0555
  file path=usr/lib/hal/hal-storage-cleanup-mountpoint mode=0555
  file path=usr/lib/hal/hal-storage-closetray mode=0555
--- 113,128 ----
  file path=lib/svc/manifest/system/hal.xml group=sys mode=0444 \
      variant.opensolaris.zone=global
  file path=lib/svc/method/svc-hal mode=0555 variant.opensolaris.zone=global
  file path=lib/svc/method/svc-network-discovery mode=0555 \
      variant.opensolaris.zone=global
! $(BUILD64)file path=usr/lib/$(ARCH64)/libhal-storage.so.1.0.0
! $(BUILD64)file path=usr/lib/$(ARCH64)/libhal.so.1.0.0
! $(BUILD64)file path=usr/lib/$(ARCH64)/llib-lhal-storage.ln
! $(BUILD64)file path=usr/lib/$(ARCH64)/llib-lhal.ln
! $(BUILD64)file path=usr/lib/$(ARCH64)/pkgconfig/hal-storage.pc
! $(BUILD64)file path=usr/lib/$(ARCH64)/pkgconfig/hal.pc
  file path=usr/lib/hal/hal-functions mode=0555
  file path=usr/lib/hal/hal-is-caller-privileged mode=0555
  file path=usr/lib/hal/hal-storage-cleanup-all-mountpoints mode=0555
  file path=usr/lib/hal/hal-storage-cleanup-mountpoint mode=0555
  file path=usr/lib/hal/hal-storage-closetray mode=0555
*** 183,197 ****
      desc="Hardware Abstraction Layer, HAL (freedesktop.org) (Root)" \
      name="Hardware Abstraction Layer (Root)"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
  license usr/src/cmd/hal/LICENSE license=usr/src/cmd/hal/LICENSE
! link path=usr/lib/$(ARCH64)/libhal-storage.so target=./libhal-storage.so.1.0.0
! link path=usr/lib/$(ARCH64)/libhal-storage.so.1 \
      target=./libhal-storage.so.1.0.0
! link path=usr/lib/$(ARCH64)/libhal.so target=./libhal.so.1.0.0
! link path=usr/lib/$(ARCH64)/libhal.so.1 target=./libhal.so.1.0.0
  link path=usr/lib/libhal-storage.so target=./libhal-storage.so.1.0.0
  link path=usr/lib/libhal-storage.so.1 target=./libhal-storage.so.1.0.0
  link path=usr/lib/libhal.so target=./libhal.so.1.0.0
  link path=usr/lib/libhal.so.1 target=./libhal.so.1.0.0
  link path=usr/share/man/man1m/hal-find-by-capability.1m target=hal-find.1m
--- 184,199 ----
      desc="Hardware Abstraction Layer, HAL (freedesktop.org) (Root)" \
      name="Hardware Abstraction Layer (Root)"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
  license usr/src/cmd/hal/LICENSE license=usr/src/cmd/hal/LICENSE
! $(BUILD64)link path=usr/lib/$(ARCH64)/libhal-storage.so \
      target=./libhal-storage.so.1.0.0
! $(BUILD64)link path=usr/lib/$(ARCH64)/libhal-storage.so.1 \
!     target=./libhal-storage.so.1.0.0
! $(BUILD64)link path=usr/lib/$(ARCH64)/libhal.so target=./libhal.so.1.0.0
! $(BUILD64)link path=usr/lib/$(ARCH64)/libhal.so.1 target=./libhal.so.1.0.0
  link path=usr/lib/libhal-storage.so target=./libhal-storage.so.1.0.0
  link path=usr/lib/libhal-storage.so.1 target=./libhal-storage.so.1.0.0
  link path=usr/lib/libhal.so target=./libhal.so.1.0.0
  link path=usr/lib/libhal.so.1 target=./libhal.so.1.0.0
  link path=usr/share/man/man1m/hal-find-by-capability.1m target=hal-find.1m