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

Print this page

1681 support for BUILD64=# no longer works


*** 19,28 ****
--- 19,29 ----
  # CDDL HEADER END
  #
  
  #
  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ # Copyright 2014 Andrew Stormont.
  #
  
  #
  # The default for payload-bearing actions in this package is to appear in the
  # global zone only.  See the include file for greater detail, as well as
*** 58,68 ****
  dir path=kernel/drv/$(ARCH64) group=sys
  #
  # lib dirs:
  #
  dir path=lib/fm variant.opensolaris.zone=__NODEFAULT
! dir path=lib/fm/$(ARCH64) variant.opensolaris.zone=__NODEFAULT
  #
  # Our service manifests are common to global and non-global zones
  #
  dir path=lib/svc/manifest/system group=sys \
      variant.opensolaris.zone=__NODEFAULT
--- 59,69 ----
  dir path=kernel/drv/$(ARCH64) group=sys
  #
  # lib dirs:
  #
  dir path=lib/fm variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)dir path=lib/fm/$(ARCH64) variant.opensolaris.zone=__NODEFAULT
  #
  # Our service manifests are common to global and non-global zones
  #
  dir path=lib/svc/manifest/system group=sys \
      variant.opensolaris.zone=__NODEFAULT
*** 85,101 ****
  dir path=usr group=sys variant.opensolaris.zone=__NODEFAULT
  dir path=usr/include
  dir path=usr/include/fm
  dir path=usr/lib variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm variant.opensolaris.zone=__NODEFAULT
! dir path=usr/lib/fm/$(ARCH64) variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm/dict variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm/eft
  dir path=usr/lib/fm/fmd variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm/fmd/plugins variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm/fmd/schemes variant.opensolaris.zone=__NODEFAULT
! dir path=usr/lib/fm/fmd/schemes/$(ARCH64) variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm/notify variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm/topo variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm/topo/maps variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm/topo/plugins variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/locale variant.opensolaris.zone=__NODEFAULT
--- 86,103 ----
  dir path=usr group=sys variant.opensolaris.zone=__NODEFAULT
  dir path=usr/include
  dir path=usr/include/fm
  dir path=usr/lib variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)dir path=usr/lib/fm/$(ARCH64) variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm/dict variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm/eft
  dir path=usr/lib/fm/fmd variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm/fmd/plugins variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm/fmd/schemes variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)dir path=usr/lib/fm/fmd/schemes/$(ARCH64) \
!     variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm/notify variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm/topo variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm/topo/maps variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/fm/topo/plugins variant.opensolaris.zone=__NODEFAULT
  dir path=usr/lib/locale variant.opensolaris.zone=__NODEFAULT
*** 266,278 ****
  file path=kernel/drv/fm.conf group=sys
  
  #
  # Some libraries need to be in lib for install
  #
! file path=lib/fm/$(ARCH64)/libfmevent.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! file path=lib/fm/$(ARCH64)/llib-lfmevent.ln \
      variant.opensolaris.zone=__NODEFAULT
  file path=lib/fm/libfmevent.so.1 variant.opensolaris.zone=__NODEFAULT
  file path=lib/fm/llib-lfmevent variant.opensolaris.zone=__NODEFAULT
  file path=lib/fm/llib-lfmevent.ln variant.opensolaris.zone=__NODEFAULT
  #
--- 268,280 ----
  file path=kernel/drv/fm.conf group=sys
  
  #
  # Some libraries need to be in lib for install
  #
! $(BUILD64)file path=lib/fm/$(ARCH64)/libfmevent.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=lib/fm/$(ARCH64)/llib-lfmevent.ln \
      variant.opensolaris.zone=__NODEFAULT
  file path=lib/fm/libfmevent.so.1 variant.opensolaris.zone=__NODEFAULT
  file path=lib/fm/llib-lfmevent variant.opensolaris.zone=__NODEFAULT
  file path=lib/fm/llib-lfmevent.ln variant.opensolaris.zone=__NODEFAULT
  #
*** 305,358 ****
  file path=usr/include/fm/topo_method.h
  file path=usr/include/fm/topo_mod.h
  #
  #       64-bit .so.1
  #
! file path=usr/lib/fm/$(ARCH64)/libdiagcode.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/$(ARCH64)/libdiskstatus.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/$(ARCH64)/libfmd_adm.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/$(ARCH64)/libfmd_agent.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/$(ARCH64)/libfmd_log.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/$(ARCH64)/libfmd_msg.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/$(ARCH64)/libfmd_snmp.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/$(ARCH64)/libfmnotify.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! $(sparc_ONLY)file path=usr/lib/fm/$(ARCH64)/libldom.so.1
! $(sparc_ONLY)file path=usr/lib/fm/$(ARCH64)/libmdesc.so.1
! file path=usr/lib/fm/$(ARCH64)/libseslog.so.1
! file path=usr/lib/fm/$(ARCH64)/libtopo.so.1 \
      variant.opensolaris.zone=__NODEFAULT
  #
  #       64-bit lint libraries
  #
! file path=usr/lib/fm/$(ARCH64)/llib-ldiagcode.ln \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/$(ARCH64)/llib-ldiskstatus.ln \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/$(ARCH64)/llib-lfmd_adm.ln \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/$(ARCH64)/llib-lfmd_agent.ln \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/$(ARCH64)/llib-lfmd_log.ln \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/$(ARCH64)/llib-lfmd_msg.ln \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/$(ARCH64)/llib-lfmd_snmp.ln \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/$(ARCH64)/llib-lfmnotify.ln \
      variant.opensolaris.zone=__NODEFAULT
! $(sparc_ONLY)file path=usr/lib/fm/$(ARCH64)/llib-lldom.ln
! $(sparc_ONLY)file path=usr/lib/fm/$(ARCH64)/llib-lmdesc.ln
! file path=usr/lib/fm/$(ARCH64)/llib-lseslog.ln
! file path=usr/lib/fm/$(ARCH64)/llib-ltopo.ln \
      variant.opensolaris.zone=__NODEFAULT
  #
  # Dictionaries, whether they are hardware-specific or not, are
  # common to both global and non-global zones.
  #
--- 307,360 ----
  file path=usr/include/fm/topo_method.h
  file path=usr/include/fm/topo_mod.h
  #
  #       64-bit .so.1
  #
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/libdiagcode.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/libdiskstatus.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/libfmd_adm.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/libfmd_agent.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/libfmd_log.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/libfmd_msg.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/libfmd_snmp.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/libfmnotify.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! $(sparc_BUILD64)file path=usr/lib/fm/$(ARCH64)/libldom.so.1
! $(sparc_BUILD64)file path=usr/lib/fm/$(ARCH64)/libmdesc.so.1
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/libseslog.so.1
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/libtopo.so.1 \
      variant.opensolaris.zone=__NODEFAULT
  #
  #       64-bit lint libraries
  #
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/llib-ldiagcode.ln \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/llib-ldiskstatus.ln \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/llib-lfmd_adm.ln \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/llib-lfmd_agent.ln \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/llib-lfmd_log.ln \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/llib-lfmd_msg.ln \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/llib-lfmd_snmp.ln \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/llib-lfmnotify.ln \
      variant.opensolaris.zone=__NODEFAULT
! $(sparc_BUILD64)file path=usr/lib/fm/$(ARCH64)/llib-lldom.ln
! $(sparc_BUILD64)file path=usr/lib/fm/$(ARCH64)/llib-lmdesc.ln
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/llib-lseslog.ln
! $(BUILD64)file path=usr/lib/fm/$(ARCH64)/llib-ltopo.ln \
      variant.opensolaris.zone=__NODEFAULT
  #
  # Dictionaries, whether they are hardware-specific or not, are
  # common to both global and non-global zones.
  #
*** 469,499 ****
  file path=usr/lib/fm/fmd/plugins/zfs-retire.conf
  file path=usr/lib/fm/fmd/plugins/zfs-retire.so mode=0555
  #
  # fmri scheme support: all are common to both global and non-global zones
  #
! file path=usr/lib/fm/fmd/schemes/$(ARCH64)/cpu.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/fmd/schemes/$(ARCH64)/dev.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/fmd/schemes/$(ARCH64)/fmd.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/fmd/schemes/$(ARCH64)/hc.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/fmd/schemes/$(ARCH64)/legacy-hc.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/fmd/schemes/$(ARCH64)/mem.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/fmd/schemes/$(ARCH64)/mod.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/fmd/schemes/$(ARCH64)/pkg.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/fmd/schemes/$(ARCH64)/svc.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/fmd/schemes/$(ARCH64)/sw.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! file path=usr/lib/fm/fmd/schemes/$(ARCH64)/zfs.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
  file path=usr/lib/fm/fmd/schemes/cpu.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
  file path=usr/lib/fm/fmd/schemes/dev.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
--- 471,501 ----
  file path=usr/lib/fm/fmd/plugins/zfs-retire.conf
  file path=usr/lib/fm/fmd/plugins/zfs-retire.so mode=0555
  #
  # fmri scheme support: all are common to both global and non-global zones
  #
! $(BUILD64)file path=usr/lib/fm/fmd/schemes/$(ARCH64)/cpu.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/fmd/schemes/$(ARCH64)/dev.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/fmd/schemes/$(ARCH64)/fmd.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/fmd/schemes/$(ARCH64)/hc.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/fmd/schemes/$(ARCH64)/legacy-hc.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/fmd/schemes/$(ARCH64)/mem.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/fmd/schemes/$(ARCH64)/mod.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/fmd/schemes/$(ARCH64)/pkg.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/fmd/schemes/$(ARCH64)/svc.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/fmd/schemes/$(ARCH64)/sw.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)file path=usr/lib/fm/fmd/schemes/$(ARCH64)/zfs.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
  file path=usr/lib/fm/fmd/schemes/cpu.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
  file path=usr/lib/fm/fmd/schemes/dev.so mode=0555 \
      variant.opensolaris.zone=__NODEFAULT
*** 870,915 ****
  license lic_CDDL license=lic_CDDL
  
  #
  # libraries .so symlinks in lib
  #
! link path=lib/fm/$(ARCH64)/libfmevent.so target=./libfmevent.so.1 \
      variant.opensolaris.zone=__NODEFAULT
  link path=lib/fm/libfmevent.so target=libfmevent.so.1 \
      variant.opensolaris.zone=__NODEFAULT
  
  #
  #       64-bit .so symlinks
  #
! link path=usr/lib/fm/$(ARCH64)/libdiagcode.so target=./libdiagcode.so.1 \
!     variant.opensolaris.zone=__NODEFAULT
! link path=usr/lib/fm/$(ARCH64)/libdiskstatus.so target=./libdiskstatus.so.1 \
!     variant.opensolaris.zone=__NODEFAULT
! link path=usr/lib/fm/$(ARCH64)/libfmd_adm.so target=./libfmd_adm.so.1 \
!     variant.opensolaris.zone=__NODEFAULT
! link path=usr/lib/fm/$(ARCH64)/libfmd_agent.so target=./libfmd_agent.so.1 \
!     variant.opensolaris.zone=__NODEFAULT
! link path=usr/lib/fm/$(ARCH64)/libfmd_log.so target=./libfmd_log.so.1 \
!     variant.opensolaris.zone=__NODEFAULT
! link path=usr/lib/fm/$(ARCH64)/libfmd_msg.so target=./libfmd_msg.so.1 \
!     variant.opensolaris.zone=__NODEFAULT
! link path=usr/lib/fm/$(ARCH64)/libfmd_snmp.so target=./libfmd_snmp.so.1 \
!     variant.opensolaris.zone=__NODEFAULT
! link path=usr/lib/fm/$(ARCH64)/libfmevent.so \
      target=../../../../lib/fm/$(ARCH64)/libfmevent.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! link path=usr/lib/fm/$(ARCH64)/libfmevent.so.1 \
      target=../../../../lib/fm/$(ARCH64)/libfmevent.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! link path=usr/lib/fm/$(ARCH64)/libfmnotify.so target=./libfmnotify.so.1 \
!     variant.opensolaris.zone=__NODEFAULT
! $(sparc_ONLY)link path=usr/lib/fm/$(ARCH64)/libldom.so target=libldom.so.1
! $(sparc_ONLY)link path=usr/lib/fm/$(ARCH64)/libmdesc.so target=libmdesc.so.1
! link path=usr/lib/fm/$(ARCH64)/libseslog.so target=./libseslog.so.1
! link path=usr/lib/fm/$(ARCH64)/libtopo.so target=libtopo.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! link path=usr/lib/fm/$(ARCH64)/llib-lfmevent.ln \
      target=../../../../lib/fm/$(ARCH64)/llib-lfmevent.ln
  #
  #       32-bit .so symlinks
  #
  link path=usr/lib/fm/libdiagcode.so target=libdiagcode.so.1 \
--- 872,918 ----
  license lic_CDDL license=lic_CDDL
  
  #
  # libraries .so symlinks in lib
  #
! $(BUILD64)link path=lib/fm/$(ARCH64)/libfmevent.so target=./libfmevent.so.1 \
      variant.opensolaris.zone=__NODEFAULT
  link path=lib/fm/libfmevent.so target=libfmevent.so.1 \
      variant.opensolaris.zone=__NODEFAULT
  
  #
  #       64-bit .so symlinks
  #
! $(BUILD64)link path=usr/lib/fm/$(ARCH64)/libdiagcode.so \
!     target=./libdiagcode.so.1 variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)link path=usr/lib/fm/$(ARCH64)/libdiskstatus.so \
!     target=./libdiskstatus.so.1 variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)link path=usr/lib/fm/$(ARCH64)/libfmd_adm.so \
!     target=./libfmd_adm.so.1 variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)link path=usr/lib/fm/$(ARCH64)/libfmd_agent.so \
!     target=./libfmd_agent.so.1 variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)link path=usr/lib/fm/$(ARCH64)/libfmd_log.so \
!     target=./libfmd_log.so.1 variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)link path=usr/lib/fm/$(ARCH64)/libfmd_msg.so \
!     target=./libfmd_msg.so.1 variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)link path=usr/lib/fm/$(ARCH64)/libfmd_snmp.so \
!     target=./libfmd_snmp.so.1 variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)link path=usr/lib/fm/$(ARCH64)/libfmevent.so \
      target=../../../../lib/fm/$(ARCH64)/libfmevent.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)link path=usr/lib/fm/$(ARCH64)/libfmevent.so.1 \
      target=../../../../lib/fm/$(ARCH64)/libfmevent.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)link path=usr/lib/fm/$(ARCH64)/libfmnotify.so \
!     target=./libfmnotify.so.1 variant.opensolaris.zone=__NODEFAULT
! $(sparc_BUILD64)link path=usr/lib/fm/$(ARCH64)/libldom.so target=libldom.so.1
! $(sparc_BUILD64)link path=usr/lib/fm/$(ARCH64)/libmdesc.so \
!     target=libmdesc.so.1
! $(BUILD64)link path=usr/lib/fm/$(ARCH64)/libseslog.so target=./libseslog.so.1
! $(BUILD64)link path=usr/lib/fm/$(ARCH64)/libtopo.so target=libtopo.so.1 \
      variant.opensolaris.zone=__NODEFAULT
! $(BUILD64)link path=usr/lib/fm/$(ARCH64)/llib-lfmevent.ln \
      target=../../../../lib/fm/$(ARCH64)/llib-lfmevent.ln
  #
  #       32-bit .so symlinks
  #
  link path=usr/lib/fm/libdiagcode.so target=libdiagcode.so.1 \