From 79ac3c12a714bcd3f2354c52d948aed9575c46d6 Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Sat, 19 Jun 2021 17:49:31 +0200 Subject: pkgbase: Put dtrace in its own package While dtrace is usefull some people might not want it. Differential Revision: https://reviews.freebsd.org/D30752 Sponsored by: Diablotin Systems --- cddl/lib/drti/Makefile | 1 + cddl/lib/libdtrace/Makefile | 1 + cddl/usr.sbin/dtrace/Makefile | 1 + cddl/usr.sbin/lockstat/Makefile | 1 + cddl/usr.sbin/plockstat/Makefile | 1 + release/packages/Makefile.package | 2 ++ share/dtrace/Makefile | 1 + 7 files changed, 8 insertions(+) diff --git a/cddl/lib/drti/Makefile b/cddl/lib/drti/Makefile index b38949d1d5fe..321352c7100c 100644 --- a/cddl/lib/drti/Makefile +++ b/cddl/lib/drti/Makefile @@ -2,6 +2,7 @@ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common +PACKAGE= dtrace SRCS= drti.c FILES= ${SRCS:R:S/$/.o/g} FILESOWN= ${LIBOWN} diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile index 45ca1692cf48..26ff06b46c40 100644 --- a/cddl/lib/libdtrace/Makefile +++ b/cddl/lib/libdtrace/Makefile @@ -3,6 +3,7 @@ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libgen/common +PACKAGE= dtrace LIB= dtrace SRCS= dt_aggregate.c \ dt_as.c \ diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile index f1248f419bee..d8510e62fb29 100644 --- a/cddl/usr.sbin/dtrace/Makefile +++ b/cddl/usr.sbin/dtrace/Makefile @@ -4,6 +4,7 @@ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace +PACKAGE= dtrace PROG= dtrace SRCS= dtrace.c BINDIR?= /usr/sbin diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile index 9b5886bf2061..a4bec42df367 100644 --- a/cddl/usr.sbin/lockstat/Makefile +++ b/cddl/usr.sbin/lockstat/Makefile @@ -2,6 +2,7 @@ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/lockstat +PACKAGE= dtrace PROG= lockstat SRCS= lockstat.c sym.c BINDIR?= /usr/sbin diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile index c267a2135c3b..22610870c846 100644 --- a/cddl/usr.sbin/plockstat/Makefile +++ b/cddl/usr.sbin/plockstat/Makefile @@ -2,6 +2,7 @@ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/plockstat +PACKAGE= dtrace PROG= plockstat SRCS= plockstat.c BINDIR?= /usr/sbin diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index dd7ce63d78a1..459dfdabf590 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -34,6 +34,8 @@ dma_COMMENT= DMA Mail Agent Utilities dma_DESC= DMA Mail Agent Utilities docs_COMMENT= Documentation docs_DESC= Documentation +dtrace_COMMENT= Dtrace Utilities +dtrace_DESC= Dtrace Utilities ee_COMMENT= Easy Editor Utilities ee_DESC= Easy Editor Utilities gdb_COMMENT= GDB Utilities diff --git a/share/dtrace/Makefile b/share/dtrace/Makefile index 95e0b4fee4e3..45b173565796 100644 --- a/share/dtrace/Makefile +++ b/share/dtrace/Makefile @@ -6,6 +6,7 @@ .include +PACKAGE= dtrace SCRIPTS= blocking \ disklatency \ disklatencycmd \ -- cgit v1.2.3