gentoo auto-resync : 22:08:2024 - 14:52:55

3 files changed, 30 insertions, 10 deletions

diff --git a/dev-debug/dtrace/Manifest b/dev-debug/dtrace/Manifest
index bc2bcd3cd97c..4cdc8ebf56b4 100644
--- a/dev-debug/dtrace/Manifest
+++ b/dev-debug/dtrace/Manifest
@@ -1,5 +1,5 @@
 AUX dtprobed.init 209 BLAKE2B f97bd2c0c681697becc2c6c7f87b8fdf779251d0473dd440bf30f0c3ce95e26e24b2496a2e8de4ff33a9ffc8a05e5bc64d066969dd7e4458ea65d2d10ae61723 SHA512 12a8e07747d8a8c3456675ea88060656dad2b594abc69daa15384abab4d11ea888d88287f921a095cad84f2e254dc858ea50e29f5e17b663f7b6be25dcbfd7b5
 DIST dtrace-2.0.1.1.tar.gz 1435524 BLAKE2B 761a931b9d871e9316f11ebe960f6bbfd3c16a82cf1cdd9ae5d69b22e0d8cea8d4b3924c960b7915f8843ce1e5c37bd257a52f1ce346957002b0ab00e59306fb SHA512 15809f2bc996bac9bd6cbb2b03eaa9a0c6a2aea9404642280f14d75b7d6feaec31b5d2c16915255cd202006cdff7835f578c042b087605708a9eb935407f1b95
-EBUILD dtrace-2.0.1.1-r1.ebuild 4799 BLAKE2B 7bcd3b79931978bdd51bc77045c3f99dcdf37681a5fbe8b96f95188603569ed603e1d4ac443aab230da8f7aff3254aa7b4e4c8bd28b19007c5c4426dbf9da0db SHA512 336788a61c481e00c168177b6575bce694f9c7ff2ed917937b34f429c21d0a59e775fdc2e9632e6d8d4a3eb53826f18e0fcda9d2f850cb006cd8bce97e8d847a
-EBUILD dtrace-9999.ebuild 4799 BLAKE2B 7bcd3b79931978bdd51bc77045c3f99dcdf37681a5fbe8b96f95188603569ed603e1d4ac443aab230da8f7aff3254aa7b4e4c8bd28b19007c5c4426dbf9da0db SHA512 336788a61c481e00c168177b6575bce694f9c7ff2ed917937b34f429c21d0a59e775fdc2e9632e6d8d4a3eb53826f18e0fcda9d2f850cb006cd8bce97e8d847a
+EBUILD dtrace-2.0.1.1-r1.ebuild 5168 BLAKE2B af2d6673272863b757b3961b156eeb8e10054214678442e7a3a70fdbf53bee7062dc8a836e67d45921924047a23781904dbcb06caaad376e8a96971a4022102f SHA512 78ad6c5e42df5777db059792a9520944a42bef5c5fd17170b5947eb372e5981d2f5e3542612fd20a97d79d398d19dbb64296b38ab55a8aabeca016a1c6c0b841
+EBUILD dtrace-9999.ebuild 5168 BLAKE2B af2d6673272863b757b3961b156eeb8e10054214678442e7a3a70fdbf53bee7062dc8a836e67d45921924047a23781904dbcb06caaad376e8a96971a4022102f SHA512 78ad6c5e42df5777db059792a9520944a42bef5c5fd17170b5947eb372e5981d2f5e3542612fd20a97d79d398d19dbb64296b38ab55a8aabeca016a1c6c0b841
 MISC metadata.xml 647 BLAKE2B 4166a7a430a3cfa4967960edf9cc13673bc38b3b610669e13869d9ad0b99eaa643e31a7e07df964b1fb1b071aa437bd687de10968266a4d9b54fb04f5a3ce240 SHA512 19a73dac88ad46ae296698cd45b416fe08a75d666440518d913b78631bf11ae53087801e13936d6218f0c3b2083694acfafa5dca12ec9d5fd7fc4e2252d3deb3
diff --git a/dev-debug/dtrace/dtrace-2.0.1.1-r1.ebuild b/dev-debug/dtrace/dtrace-2.0.1.1-r1.ebuild
index f084535e5911..250c9ddd9755 100644
--- a/dev-debug/dtrace/dtrace-2.0.1.1-r1.ebuild
+++ b/dev-debug/dtrace/dtrace-2.0.1.1-r1.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="UPL-1.0"
 SLOT="0"
-IUSE="install-tests systemd"
+IUSE="systemd install-tests"
 
 # XXX: right now, we auto-adapt to whether multilibs are present:
 # should we force them to be? how?
@@ -85,12 +85,22 @@ pkg_pretend() {
 	CONFIG_CHECK+=" ~CUSE"
 
 	# Tracing
-	CONFIG_CHECK+=" ~FTRACE_SYSCALLS ~UPROBE_EVENTS ~DYNAMIC_FTRACE ~FUNCTION_TRACER"
+	CONFIG_CHECK+=" ~TRACING"
+	CONFIG_CHECK+=" ~UPROBES ~UPROBE_EVENTS"
+	CONFIG_CHECK+=" ~FTRACE ~FTRACE_SYSCALLS ~DYNAMIC_FTRACE ~FUNCTION_TRACER"
 	CONFIG_CHECK+=" ~FPROBE"
+	# DTrace can fallback to kprobes for fbt but people often want them off
+	# for security and newer kernels work fine with BPF for that, so
+	# let's omit it. kprobes are slower and scale poorly.
 
 	# https://gcc.gnu.org/PR84052
 	CONFIG_CHECK+=" !GCC_PLUGIN_RANDSTRUCT"
 
+	if use install-tests ; then
+		# See test/modules
+		CONFIG_CHECK+=" ~EXT4_FS ~ISO9660_FS ~NFS_FS ~RDS ~TUN"
+	fi
+
 	check_extra_config
 }
 
@@ -161,8 +171,6 @@ pkg_postinst() {
 
 	# TODO: Restart it on upgrade? (it will carry across its own persistent state)
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		einfo "See https://wiki.gentoo.org/wiki/DTrace for getting started."
-
 		# TODO: Make this more intelligent wrt comparison
 		if systemd_is_booted ; then
 			einfo "Restart the DTrace 'dtprobed' service after upgrades:"
@@ -172,6 +180,8 @@ pkg_postinst() {
 			einfo " /etc/init.d/dtprobed restart"
 		fi
 	else
+		einfo "See https://wiki.gentoo.org/wiki/DTrace for getting started."
+
 		if systemd_is_booted ; then
 			einfo "Enable and start the DTrace 'dtprobed' service with:"
 			einfo " systemctl enable --now dtprobed"
diff --git a/dev-debug/dtrace/dtrace-9999.ebuild b/dev-debug/dtrace/dtrace-9999.ebuild
index f084535e5911..250c9ddd9755 100644
--- a/dev-debug/dtrace/dtrace-9999.ebuild
+++ b/dev-debug/dtrace/dtrace-9999.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="UPL-1.0"
 SLOT="0"
-IUSE="install-tests systemd"
+IUSE="systemd install-tests"
 
 # XXX: right now, we auto-adapt to whether multilibs are present:
 # should we force them to be? how?
@@ -85,12 +85,22 @@ pkg_pretend() {
 	CONFIG_CHECK+=" ~CUSE"
 
 	# Tracing
-	CONFIG_CHECK+=" ~FTRACE_SYSCALLS ~UPROBE_EVENTS ~DYNAMIC_FTRACE ~FUNCTION_TRACER"
+	CONFIG_CHECK+=" ~TRACING"
+	CONFIG_CHECK+=" ~UPROBES ~UPROBE_EVENTS"
+	CONFIG_CHECK+=" ~FTRACE ~FTRACE_SYSCALLS ~DYNAMIC_FTRACE ~FUNCTION_TRACER"
 	CONFIG_CHECK+=" ~FPROBE"
+	# DTrace can fallback to kprobes for fbt but people often want them off
+	# for security and newer kernels work fine with BPF for that, so
+	# let's omit it. kprobes are slower and scale poorly.
 
 	# https://gcc.gnu.org/PR84052
 	CONFIG_CHECK+=" !GCC_PLUGIN_RANDSTRUCT"
 
+	if use install-tests ; then
+		# See test/modules
+		CONFIG_CHECK+=" ~EXT4_FS ~ISO9660_FS ~NFS_FS ~RDS ~TUN"
+	fi
+
 	check_extra_config
 }
 
@@ -161,8 +171,6 @@ pkg_postinst() {
 
 	# TODO: Restart it on upgrade? (it will carry across its own persistent state)
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		einfo "See https://wiki.gentoo.org/wiki/DTrace for getting started."
-
 		# TODO: Make this more intelligent wrt comparison
 		if systemd_is_booted ; then
 			einfo "Restart the DTrace 'dtprobed' service after upgrades:"
@@ -172,6 +180,8 @@ pkg_postinst() {
 			einfo " /etc/init.d/dtprobed restart"
 		fi
 	else
+		einfo "See https://wiki.gentoo.org/wiki/DTrace for getting started."
+
 		if systemd_is_booted ; then
 			einfo "Enable and start the DTrace 'dtprobed' service with:"
 			einfo " systemctl enable --now dtprobed"