illumos-gate-1681 Cdiff usr/src/pkg/manifests/storage-stmf.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:/storage/stmf@$(PKGVERS)
  set name=pkg.description \
      value="Sun Common Multiprotocol SCSI Target device drivers"
*** 46,59 ****
  dir path=usr/demo/comstar
  dir path=usr/demo/comstar/bin
  dir path=usr/include
  dir path=usr/include/sys
  dir path=usr/lib
! dir path=usr/lib/$(ARCH64)
  dir path=usr/lib/mdb group=sys
  dir path=usr/lib/mdb/kvm group=sys
! dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
  dir path=usr/sbin
  dir path=usr/share/man
  dir path=usr/share/man/man1m
  dir path=usr/share/man/man3lib
  dir path=usr/share/man/man3stmf
--- 47,60 ----
  dir path=usr/demo/comstar
  dir path=usr/demo/comstar/bin
  dir path=usr/include
  dir path=usr/include/sys
  dir path=usr/lib
! $(BUILD64)dir path=usr/lib/$(ARCH64)
  dir path=usr/lib/mdb group=sys
  dir path=usr/lib/mdb/kvm group=sys
! $(BUILD64)dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
  dir path=usr/sbin
  dir path=usr/share/man
  dir path=usr/share/man/man1m
  dir path=usr/share/man/man3lib
  dir path=usr/share/man/man3stmf
*** 95,113 ****
  file path=usr/include/sys/lpif.h
  file path=usr/include/sys/portif.h
  file path=usr/include/sys/stmf.h
  file path=usr/include/sys/stmf_defines.h
  file path=usr/include/sys/stmf_ioctl.h
! file path=usr/lib/$(ARCH64)/libstmf.so.1
! file path=usr/lib/$(ARCH64)/libstmfproxy.so.1
! file path=usr/lib/$(ARCH64)/llib-lstmf.ln
  file path=usr/lib/libstmf.so.1
  file path=usr/lib/libstmfproxy.so.1
  file path=usr/lib/llib-lstmf
  file path=usr/lib/llib-lstmf.ln
! file path=usr/lib/mdb/kvm/$(ARCH64)/stmf.so group=sys mode=0555
! file path=usr/lib/mdb/kvm/$(ARCH64)/stmf_sbd.so group=sys mode=0555
  $(i386_ONLY)file path=usr/lib/mdb/kvm/stmf.so group=sys mode=0555
  $(i386_ONLY)file path=usr/lib/mdb/kvm/stmf_sbd.so group=sys mode=0555
  file path=usr/sbin/sbdadm mode=0555
  file path=usr/sbin/stmfadm mode=0555
  file path=usr/share/man/man1m/sbdadm.1m
--- 96,114 ----
  file path=usr/include/sys/lpif.h
  file path=usr/include/sys/portif.h
  file path=usr/include/sys/stmf.h
  file path=usr/include/sys/stmf_defines.h
  file path=usr/include/sys/stmf_ioctl.h
! $(BUILD64)file path=usr/lib/$(ARCH64)/libstmf.so.1
! $(BUILD64)file path=usr/lib/$(ARCH64)/libstmfproxy.so.1
! $(BUILD64)file path=usr/lib/$(ARCH64)/llib-lstmf.ln
  file path=usr/lib/libstmf.so.1
  file path=usr/lib/libstmfproxy.so.1
  file path=usr/lib/llib-lstmf
  file path=usr/lib/llib-lstmf.ln
! $(BUILD64)file path=usr/lib/mdb/kvm/$(ARCH64)/stmf.so group=sys mode=0555
! $(BUILD64)file path=usr/lib/mdb/kvm/$(ARCH64)/stmf_sbd.so group=sys mode=0555
  $(i386_ONLY)file path=usr/lib/mdb/kvm/stmf.so group=sys mode=0555
  $(i386_ONLY)file path=usr/lib/mdb/kvm/stmf_sbd.so group=sys mode=0555
  file path=usr/sbin/sbdadm mode=0555
  file path=usr/sbin/stmfadm mode=0555
  file path=usr/share/man/man1m/sbdadm.1m
*** 159,170 ****
  legacy pkg=SUNWstmfu \
      desc="Sun Common Multiprotocol SCSI Target Libraries and Tools" \
      name="Sun Common Multiprotocol SCSI Target Libraries and Tools"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! link path=usr/lib/$(ARCH64)/libstmf.so target=libstmf.so.1
! link path=usr/lib/$(ARCH64)/libstmfproxy.so target=libstmfproxy.so.1
  link path=usr/lib/libstmf.so target=libstmf.so.1
  link path=usr/lib/libstmfproxy.so target=libstmfproxy.so.1
  link path=usr/share/man/man3stmf/stmfGetLuProp.3stmf \
      target=stmfSetLuProp.3stmf
  link path=usr/share/man/man3stmf/stmfModifyLuByFname.3stmf \
--- 160,171 ----
  legacy pkg=SUNWstmfu \
      desc="Sun Common Multiprotocol SCSI Target Libraries and Tools" \
      name="Sun Common Multiprotocol SCSI Target Libraries and Tools"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! $(BUILD64)link path=usr/lib/$(ARCH64)/libstmf.so target=libstmf.so.1
! $(BUILD64)link path=usr/lib/$(ARCH64)/libstmfproxy.so target=libstmfproxy.so.1
  link path=usr/lib/libstmf.so target=libstmf.so.1
  link path=usr/lib/libstmfproxy.so target=libstmfproxy.so.1
  link path=usr/share/man/man3stmf/stmfGetLuProp.3stmf \
      target=stmfSetLuProp.3stmf
  link path=usr/share/man/man3stmf/stmfModifyLuByFname.3stmf \