Merge branch 'bpf-vendor-updates'

Author: natoscott

CHANGELOG

@@ -3070,7 +3070,7 @@ pcp-4.1.0 (15 June 2018)
 	- pmdabcc: match process name on /proc/$PID/comm
 	- pmdabcc: add process filtering in tracepoint/uprobe modules
 	- pmdabcc: fix tcplife with older/newer kernel/bcc
-	- pmdabcc: add USDT/dtrace hit count BPF/Python module
+	- pmdabcc: add USDT hit count BPF/Python module
 	- pmdabcc: add pid check/filter helpers, relax process check
 	- pmdabcc: introduce reserved ranges in bcc.conf
 	- pmdabcc: README and man page updates
@@ -4149,7 +4149,6 @@ pcp-3.10.8 (30 October 2015)
     - pmdaperfevent: add reference clock cycles for NHM and WSM
     - docs: added upgrade instructions to pmdaperfevent man page
     - containers: bindmount /dev/log for syslog messages
-    - build: fix FreeBSD 10.2 with dtrace probes auto-enabled
 
 pcp-3.10.7 (16 September 2015)
     - containers: added the pcp-pmie container
@@ -4960,7 +4959,7 @@ pcp-3.8.3 (9 September 2013)
     - Add an option allowing custom pmcd.hostname settings
     - Implement host access checking for unix domain sockets.
     - Man page updates, esp. to pmcd.1 re access controls.
-    - Add static probe support for pmcd probes (systemtap/dtrace)
+    - Add static probe support for pmcd probes (USDT)
     - Change pmGetContextHostName to be pmcd.hostname aware and thus
       able to report the correct remote hostname through a tunnel.
     - Update numerous tools to use pmGetContextHostName now.

CONTRIBUTING.md

@@ -128,19 +128,19 @@ commit of the remote repository.
 Example usage:
 ```
 # Vendor a new library
-git subtree add --prefix vendor/github.com/redis/hiredis \
-  https://github.com/redis/hiredis.git v1.0.0 --squash
+git subtree add --prefix vendor/github.com/libbpf/libbpf \
+  https://github.com/libbpf/libbpf.git v1.6.2 --squash
 
 # Pull changes from the remote repository
-git subtree pull --prefix vendor/github.com/redis/hiredis \
-  https://github.com/redis/hiredis.git v1.0.1 --squash
+git subtree pull --prefix vendor/github.com/libbpf/libbpf \
+  https://github.com/libbpf/libbpf.git v1.6.3 --squash
 
 # Push modifications of vendored sources to the remote repository
 # Note: the commit(s) are split automatically, i.e. if one commit modifies
 # both PCP and vendored sources, the commit pushed to the remote repository
 # only contains updated files from the vendored directory
-git subtree push --prefix vendor/github.com/redis/hiredis \
-  https://github.com/andreasgerstmayr/hiredis.git some-updates
+git subtree push --prefix vendor/github.com/libbpf/libbpf \
+  https://github.com/andreasgerstmayr/libbpf.git some-updates
 ```
 
 Example vendoring a subdirectory of a remote repository:

Makepkgs

@@ -283,30 +283,19 @@ then
     # For FreeBSD 10.4 and 11.3 it seems to fail when trying to build
     # Python and Python3 at the same time ... so skip Python(2)
     # For FreeBSD 13 I don't have Qt working
-    # For FreeBSD 14 cppcheck => Qt installed and dtrace/static probes
-    # is not working
+    # For FreeBSD 14 cppcheck => Qt installed
     #
     case `uname -r`
     in
 	9.3*)
 		# Bog-standard, just without python3
 		#
-		configopts="--sysconfdir=/etc --localstatedir=/var --with-python3=no --prefix=/usr"
-		;;
-	10.*|11.*)
-		# Bog-standard
-		#
-		configopts="--sysconfdir=/etc --localstatedir=/var --prefix=/usr"
+		configopts="--sysconfdir=/etc --localstatedir=/var --prefix=/usr --with-python3=no"
 		;;
 	13.*)
-		# Bog-standard, just without qt and static probes
-		#
-		configopts="--sysconfdir=/etc --localstatedir=/var --with-qt=no --with-static-probes=no --prefix=/usr"
-		;;
-	14.*)
-		# Bog-standard, just without static probes
+		# Bog-standard, just without Qt
 		#
-		configopts="--sysconfdir=/etc --localstatedir=/var --with-static-probes=no --prefix=/usr"
+		configopts="--sysconfdir=/etc --localstatedir=/var --prefix=/usr --with-qt=no"
 		;;
 	*)
 		# Bog-standard, as below ...

build/rpm/pcp.spec.in

@@ -79,9 +79,6 @@ BuildRequires: %{_lib}sasl-devel
 BuildRequires: cyrus-sasl-devel
 %endif
 %endif
-%if "@enable_probes@" == "true"
-BuildRequires: systemtap-sdt-devel
-%endif
 %if "@enable_qt@" == "true"
 BuildRequires: gcc-c++
 %endif
@@ -1487,16 +1484,7 @@ License: Apache-2.0 AND GPL-2.0-or-later
 Summary: Performance Co-Pilot (PCP) metrics from eBPF ELF modules
 URL: https://pcp.io
 Requires: pcp = @package_version@ pcp-libs = @package_version@
-%if 0%{?suse_version} >= 1600
-Requires: libbpf1
-%else
-%if %{defined sle_version} && 0%{?sle_version} >= 150500
-Requires: libbpf1
-%else
-Requires: libbpf
-%endif
-%endif
-BuildRequires: libbpf-devel clang llvm
+BuildRequires: clang llvm
 %description pmda-bpf
 This package contains the PCP Performance Metrics Domain Agent (PMDA) for
 extracting performance metrics from eBPF ELF modules.

build/rpm/redhat.spec

@@ -268,9 +268,6 @@ BuildRequires: chan-devel HdrHistogram_c-devel
 %if !%{disable_perfevent}
 BuildRequires: libpfm-devel >= 4
 %endif
-%if !%{disable_sdt}
-BuildRequires: systemtap-sdt-devel
-%endif
 %if !%{disable_libuv}
 BuildRequires: libuv-devel >= 1.0
 %endif