From a4aaa136d4b00ad736eae15625ae75ed444886ac Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Fri, 30 Nov 2018 14:40:33 -0500 Subject: [PATCH] start shipping ctfconvert & ctfmerge in /usr/bin --- exception_lists/packaging | 6 ------ usr/src/pkg/manifests/developer-debug-ctf.mf | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/exception_lists/packaging b/exception_lists/packaging index 351195a3c7..dcfd97d2bb 100644 --- a/exception_lists/packaging +++ b/exception_lists/packaging @@ -587,12 +587,6 @@ usr/lib/amd64/libdwarf.so i386 usr/lib/libdwarf.so # -# We're not quite ready to ship ctfconvert and ctfmerge -# -usr/bin/ctfconvert -usr/bin/ctfmerge - -# # libsff is private # usr/include/libsff.h diff --git a/usr/src/pkg/manifests/developer-debug-ctf.mf b/usr/src/pkg/manifests/developer-debug-ctf.mf index 30485f3284..41e4a1be5e 100644 --- a/usr/src/pkg/manifests/developer-debug-ctf.mf +++ b/usr/src/pkg/manifests/developer-debug-ctf.mf @@ -24,8 +24,10 @@ dir path=usr/bin dir path=usr/share dir path=usr/share/man dir path=usr/share/man/man1 +file path=usr/bin/ctfconvert mode=0555 file path=usr/bin/ctfdiff mode=0555 file path=usr/bin/ctfdump mode=0555 +file path=usr/bin/ctfmerge mode=0555 file path=usr/share/man/man1/ctfdiff.1 file path=usr/share/man/man1/ctfdump.1 license cr_Sun license=cr_Sun -- 2.11.4.GIT