illumos-gate-1681 Cdiff usr/src/pkg/manifests/developer-dtrace.mf

Print this page

1681 support for BUILD64=# no longer works


*** 19,32 ****
  # CDDL HEADER END
  #
  
  #
  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- #
- 
- #
  # Copyright (c) 2012 by Delphix. All rights reserved.
  #
  
  set name=pkg.fmri value=pkg:/developer/dtrace@$(PKGVERS)
  set name=pkg.description value="Dynamic Tracing (DTrace) Clients"
  set name=pkg.summary value="DTrace Clients"
--- 19,30 ----
  # CDDL HEADER END
  #
  
  #
  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  # Copyright (c) 2012 by Delphix. All rights reserved.
+ # Copyright 2014 Andrew Stormont.
  #
  
  set name=pkg.fmri value=pkg:/developer/dtrace@$(PKGVERS)
  set name=pkg.description value="Dynamic Tracing (DTrace) Clients"
  set name=pkg.summary value="DTrace Clients"
*** 37,59 ****
  dir path=usr/demo
  dir path=usr/demo/dtrace
  dir path=usr/include
  dir path=usr/include/sys
  dir path=usr/lib
! dir path=usr/lib/$(ARCH64)
  dir path=usr/lib/devfsadm group=sys
  dir path=usr/lib/devfsadm/linkmod group=sys
  dir path=usr/lib/dtrace
  dir path=usr/lib/dtrace/64
  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/lib/mdb/raw group=sys
! dir path=usr/lib/mdb/raw/$(ARCH64) group=sys
  dir path=usr/sbin
  dir path=usr/sbin/$(ARCH32)
! dir path=usr/sbin/$(ARCH64)
  dir path=usr/share
  dir path=usr/share/lib
  dir path=usr/share/lib/java group=sys
  dir path=usr/share/lib/java/javadoc group=other
  dir path=usr/share/lib/java/javadoc/dtrace group=other
--- 35,57 ----
  dir path=usr/demo
  dir path=usr/demo/dtrace
  dir path=usr/include
  dir path=usr/include/sys
  dir path=usr/lib
! $(BUILD64)dir path=usr/lib/$(ARCH64)
  dir path=usr/lib/devfsadm group=sys
  dir path=usr/lib/devfsadm/linkmod group=sys
  dir path=usr/lib/dtrace
  dir path=usr/lib/dtrace/64
  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/lib/mdb/raw group=sys
! $(BUILD64)dir path=usr/lib/mdb/raw/$(ARCH64) group=sys
  dir path=usr/sbin
  dir path=usr/sbin/$(ARCH32)
! $(BUILD64)dir path=usr/sbin/$(ARCH64)
  dir path=usr/share
  dir path=usr/share/lib
  dir path=usr/share/lib/java group=sys
  dir path=usr/share/lib/java/javadoc group=other
  dir path=usr/share/lib/java/javadoc/dtrace group=other
*** 176,188 ****
  file path=usr/include/sys/fasttrap.h
  file path=usr/include/sys/fasttrap_impl.h
  file path=usr/include/sys/fasttrap_isa.h
  file path=usr/include/sys/lockstat.h
  file path=usr/include/sys/sdt.h
! file path=usr/lib/$(ARCH64)/libdtrace.so.1
! file path=usr/lib/$(ARCH64)/libdtrace_jni.so.1
! file path=usr/lib/$(ARCH64)/llib-ldtrace.ln
  file path=usr/lib/devfsadm/linkmod/SUNW_dtrace_link.so group=sys
  file path=usr/lib/dtrace/64/drti.o mode=0444
  file path=usr/lib/dtrace/64/libdtrace_forceload.so mode=0555
  file path=usr/lib/dtrace/drti.o mode=0444
  file path=usr/lib/dtrace/errno.d mode=0444
--- 174,186 ----
  file path=usr/include/sys/fasttrap.h
  file path=usr/include/sys/fasttrap_impl.h
  file path=usr/include/sys/fasttrap_isa.h
  file path=usr/include/sys/lockstat.h
  file path=usr/include/sys/sdt.h
! $(BUILD64)file path=usr/lib/$(ARCH64)/libdtrace.so.1
! $(BUILD64)file path=usr/lib/$(ARCH64)/libdtrace_jni.so.1
! $(BUILD64)file path=usr/lib/$(ARCH64)/llib-ldtrace.ln
  file path=usr/lib/devfsadm/linkmod/SUNW_dtrace_link.so group=sys
  file path=usr/lib/dtrace/64/drti.o mode=0444
  file path=usr/lib/dtrace/64/libdtrace_forceload.so mode=0555
  file path=usr/lib/dtrace/drti.o mode=0444
  file path=usr/lib/dtrace/errno.d mode=0444
*** 206,227 ****
  file path=usr/lib/dtrace/unistd.d mode=0444
  file path=usr/lib/libdtrace.so.1
  file path=usr/lib/libdtrace_jni.so.1
  file path=usr/lib/llib-ldtrace
  file path=usr/lib/llib-ldtrace.ln
! file path=usr/lib/mdb/kvm/$(ARCH64)/dtrace.so group=sys mode=0555
  $(i386_ONLY)file path=usr/lib/mdb/kvm/dtrace.so group=sys mode=0555
! file path=usr/lib/mdb/raw/$(ARCH64)/dof.so group=sys mode=0555
  file path=usr/lib/mdb/raw/dof.so group=sys mode=0555
  file path=usr/sbin/$(ARCH32)/dtrace mode=0555
  $(i386_ONLY)file path=usr/sbin/$(ARCH32)/intrstat mode=0555
  $(i386_ONLY)file path=usr/sbin/$(ARCH32)/lockstat mode=0555
  $(i386_ONLY)file path=usr/sbin/$(ARCH32)/plockstat mode=0555
! file path=usr/sbin/$(ARCH64)/dtrace mode=0555
! file path=usr/sbin/$(ARCH64)/intrstat mode=0555
! file path=usr/sbin/$(ARCH64)/lockstat mode=0555
! file path=usr/sbin/$(ARCH64)/plockstat mode=0555
  file path=usr/share/lib/java/dtrace.jar group=sys
  file path=usr/share/lib/java/javadoc/dtrace/api/allclasses-frame.html \
      group=other
  file path=usr/share/lib/java/javadoc/dtrace/api/allclasses-noframe.html \
      group=other
--- 204,225 ----
  file path=usr/lib/dtrace/unistd.d mode=0444
  file path=usr/lib/libdtrace.so.1
  file path=usr/lib/libdtrace_jni.so.1
  file path=usr/lib/llib-ldtrace
  file path=usr/lib/llib-ldtrace.ln
! $(BUILD64)file path=usr/lib/mdb/kvm/$(ARCH64)/dtrace.so group=sys mode=0555
  $(i386_ONLY)file path=usr/lib/mdb/kvm/dtrace.so group=sys mode=0555
! $(BUILD64)file path=usr/lib/mdb/raw/$(ARCH64)/dof.so group=sys mode=0555
  file path=usr/lib/mdb/raw/dof.so group=sys mode=0555
  file path=usr/sbin/$(ARCH32)/dtrace mode=0555
  $(i386_ONLY)file path=usr/sbin/$(ARCH32)/intrstat mode=0555
  $(i386_ONLY)file path=usr/sbin/$(ARCH32)/lockstat mode=0555
  $(i386_ONLY)file path=usr/sbin/$(ARCH32)/plockstat mode=0555
! $(BUILD64)file path=usr/sbin/$(ARCH64)/dtrace mode=0555
! $(BUILD64)file path=usr/sbin/$(ARCH64)/intrstat mode=0555
! $(BUILD64)file path=usr/sbin/$(ARCH64)/lockstat mode=0555
! $(BUILD64)file path=usr/sbin/$(ARCH64)/plockstat mode=0555
  file path=usr/share/lib/java/dtrace.jar group=sys
  file path=usr/share/lib/java/javadoc/dtrace/api/allclasses-frame.html \
      group=other
  file path=usr/share/lib/java/javadoc/dtrace/api/allclasses-noframe.html \
      group=other
*** 653,661 ****
  hardlink path=usr/sbin/plockstat target=../../usr/lib/isaexec
  legacy pkg=SUNWdtrc desc="Dynamic Tracing (DTrace) Clients" \
      name="DTrace Clients"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! link path=usr/lib/$(ARCH64)/libdtrace.so target=libdtrace.so.1
! link path=usr/lib/$(ARCH64)/libdtrace_jni.so target=libdtrace_jni.so.1
  link path=usr/lib/libdtrace.so target=libdtrace.so.1
  link path=usr/lib/libdtrace_jni.so target=libdtrace_jni.so.1
--- 651,660 ----
  hardlink path=usr/sbin/plockstat target=../../usr/lib/isaexec
  legacy pkg=SUNWdtrc desc="Dynamic Tracing (DTrace) Clients" \
      name="DTrace Clients"
  license cr_Sun license=cr_Sun
  license lic_CDDL license=lic_CDDL
! $(BUILD64)link path=usr/lib/$(ARCH64)/libdtrace.so target=libdtrace.so.1
! $(BUILD64)link path=usr/lib/$(ARCH64)/libdtrace_jni.so \
!     target=libdtrace_jni.so.1
  link path=usr/lib/libdtrace.so target=libdtrace.so.1
  link path=usr/lib/libdtrace_jni.so target=libdtrace_jni.so.1