build: deal with debian12 inability to compile bash bpf module

And additional removal of old BPF macros from the build.

Author: natoscott

build/rpm/pcp.spec.in

@@ -1484,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.

configure

@@ -9132,8 +9132,9 @@ fi
 if test "x$do_pmdabpf" = "xcheck"
 then :
 
-        $have_libbpf && $have_libelf && \
-	test $clang_major_version -ge 10 -a -f "$pmdabpf_vmlinuxh" && pmda_bpf=true
+        $have_libelf && \
+	test $clang_major_version -ge 10 -a -f "$pmdabpf_vmlinuxh" && \
+    pmda_bpf=true
 
 fi
 PMDA_BPF=$pmda_bpf
@@ -9143,24 +9144,15 @@ printf "%s\n" "yes" >&6; }; else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: r
 printf "%s\n" "no" >&6; }; fi
 
 if $pmda_bpf; then
-    libbpf_version_major=`echo $libbpf_version | cut -d. -f1`
-    libbpf_version_minor=`echo $libbpf_version | cut -d. -f2`
-    pmdabpf_modules="biolatency.so runqlat.so"
-
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if bpf PMDA modules using bpf_buffer__new should be included" >&5
-printf %s "checking if bpf PMDA modules using bpf_buffer__new should be included... " >&6; }
-    if test "$libbpf_version_major" -eq 0; then
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (libbpf version required: 1.0.0, installed: $libbpf_version)" >&5
-printf "%s\n" "no (libbpf version required: 1.0.0, installed: $libbpf_version)" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which bpf PMDA modules should be included" >&5
+printf %s "checking which bpf PMDA modules should be included... " >&6; }
+    if test $clang_major_version -ge 15; then
+	pmdabpf_modules="bashreadline.so"
     else
-       pmdabpf_modules="${pmdabpf_modules} mountsnoop.so oomkill.so"
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+	pmdabpf_modules="bashreadline.so"
     fi
-    pmdabpf_modules="${pmdabpf_modules} bashreadline.so biolatency.so execsnoop.so exitsnoop.so fsslower.so opensnoop.so runqlat.so statsnoop.so tcpconnect.so tcpconnlat.so vfsstat.so biosnoop.so netatop.so"
+    pmdabpf_modules="${pmdabpf_modules} biolatency.so execsnoop.so exitsnoop.so fsslower.so mountsnoop.so oomkill.so opensnoop.so runqlat.so statsnoop.so tcpconnect.so tcpconnlat.so vfsstat.so biosnoop.so netatop.so"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which bpf PMDA modules should be included" >&5
-printf %s "checking which bpf PMDA modules should be included... " >&6; }
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pmdabpf_modules" >&5
 printf "%s\n" "$pmdabpf_modules" >&6; }
 fi

configure.ac

@@ -1197,28 +1197,23 @@ AC_MSG_CHECKING([if the bpf PMDA should be included])
 pmda_bpf=false
 AS_IF([test "x$do_pmdabpf" = "xyes"], [pmda_bpf=true])
 AS_IF([test "x$do_pmdabpf" = "xcheck"], [
-    dnl pmdabpf requires libbpf, libelf, clang 10+ and a bpftool-generated arch-specific vmlinux.h
-    $have_libbpf && $have_libelf && \
-	test $clang_major_version -ge 10 -a -f "$pmdabpf_vmlinuxh" && pmda_bpf=true
+    dnl pmdabpf needs -lelf, clang 10+ and arch-specific vmlinux.h from bpftool
+    $have_libelf && \
+	test $clang_major_version -ge 10 -a -f "$pmdabpf_vmlinuxh" && \
+    pmda_bpf=true
 ])
 AC_SUBST(PMDA_BPF, $pmda_bpf)
 if $pmda_bpf; then AC_MSG_RESULT(yes); else AC_MSG_RESULT(no); fi
 
 if $pmda_bpf; then
-    libbpf_version_major=`echo $libbpf_version | cut -d. -f1`
-    libbpf_version_minor=`echo $libbpf_version | cut -d. -f2`
-    pmdabpf_modules="biolatency.so runqlat.so"
-
-    AC_MSG_CHECKING([if bpf PMDA modules using bpf_buffer__new should be included])
-    if test "$libbpf_version_major" -eq 0; then
-       AC_MSG_RESULT([no (libbpf version required: 1.0.0, installed: $libbpf_version)])
+    AC_MSG_CHECKING([which bpf PMDA modules should be included])
+    if test $clang_major_version -ge 15; then
+	pmdabpf_modules="bashreadline.so"
     else
-       pmdabpf_modules="${pmdabpf_modules} mountsnoop.so oomkill.so"
-       AC_MSG_RESULT(yes)
+	pmdabpf_modules="bashreadline.so"
     fi
-    pmdabpf_modules="${pmdabpf_modules} bashreadline.so biolatency.so execsnoop.so exitsnoop.so fsslower.so opensnoop.so runqlat.so statsnoop.so tcpconnect.so tcpconnlat.so vfsstat.so biosnoop.so netatop.so"
+    pmdabpf_modules="${pmdabpf_modules} biolatency.so execsnoop.so exitsnoop.so fsslower.so mountsnoop.so oomkill.so opensnoop.so runqlat.so statsnoop.so tcpconnect.so tcpconnlat.so vfsstat.so biosnoop.so netatop.so"
     AC_SUBST(pmdabpf_modules)
-    AC_MSG_CHECKING([which bpf PMDA modules should be included])
     AC_MSG_RESULT($pmdabpf_modules)
 fi
 

debian/control.pcp

@@ -5,7 +5,7 @@ Homepage: https://pcp.io
 Maintainer: PCP Development Team <[email protected]>
 Uploaders: Nathan Scott <[email protected]>, Ken McDonell <[email protected]>
 Rules-Requires-Root: no
-Build-Depends: bison, flex, gawk, procps, pkg-config, debhelper (>= 5), ?{perl (>= 5.6)}, libreadline-dev | libreadline5-dev | libreadline-gplv2-dev, chrpath, libbsd-dev [kfreebsd-any], libkvm-dev [kfreebsd-any], ?{python-all}, ?{python-dev}, python3-dev, python3-setuptools, libsasl2-dev, ?{libuv1-dev}, ?{libssl-dev}, libavahi-common-dev, ?{qt-dev}, autotools-dev, zlib1g-dev, autoconf, ?{libclass-dbi-perl}, ?{libdbd-mysql-perl}, ?{python-psycopg2}, ?{python-openpyxl}, ?{dh-python}, ?{libpfm4-dev}, libncurses5-dev, ?{python-six}, ?{python-requests}, ?{libextutils-autoinstall-perl}, ?{libxml-tokeparser-perl}, ?{librrds-perl}, ?{libjson-perl}, ?{libwww-perl}, ?{libnet-snmp-perl}, ?{liblzma-dev}, ?{systemd-pkgconfig}, ?{libsystemd-dev}, ?{python-bpfcc}, ?{bpftrace}, ?{clang}, ?{llvm}, ?{libbpf-dev}, ?{libibumad-dev}, ?{libibmad-dev}, ?{libibverbs-dev}, ?{libinih-dev}, ?{postfix}, ?{libxml-libxml-perl}, ?{libfile-slurp-perl}, ?{libyaml-libyaml-perl}, ?{python-rtslib-fb}, ?{python-libvirt}, ?{python-lxml}, ?{libdrm-dev}, ?{python-pymongo}, ?{python-urllib3}, ?{libdbi-perl}, ?{python-pyodbc}, manpages
+Build-Depends: bison, flex, gawk, procps, pkg-config, debhelper (>= 5), ?{perl (>= 5.6)}, libreadline-dev | libreadline5-dev | libreadline-gplv2-dev, chrpath, libbsd-dev [kfreebsd-any], libkvm-dev [kfreebsd-any], ?{python-all}, ?{python-dev}, python3-dev, python3-setuptools, libsasl2-dev, ?{libuv1-dev}, ?{libssl-dev}, libavahi-common-dev, ?{qt-dev}, autotools-dev, zlib1g-dev, autoconf, ?{libclass-dbi-perl}, ?{libdbd-mysql-perl}, ?{python-psycopg2}, ?{python-openpyxl}, ?{dh-python}, ?{libpfm4-dev}, libncurses5-dev, ?{python-six}, ?{python-requests}, ?{libextutils-autoinstall-perl}, ?{libxml-tokeparser-perl}, ?{librrds-perl}, ?{libjson-perl}, ?{libwww-perl}, ?{libnet-snmp-perl}, ?{liblzma-dev}, ?{systemd-pkgconfig}, ?{libsystemd-dev}, ?{python-bpfcc}, ?{bpftrace}, ?{clang}, ?{llvm}, ?{libibumad-dev}, ?{libibmad-dev}, ?{libibverbs-dev}, ?{libinih-dev}, ?{postfix}, ?{libxml-libxml-perl}, ?{libfile-slurp-perl}, ?{libyaml-libyaml-perl}, ?{python-rtslib-fb}, ?{python-libvirt}, ?{python-lxml}, ?{libdrm-dev}, ?{python-pymongo}, ?{python-urllib3}, ?{libdbi-perl}, ?{python-pyodbc}, manpages
 Standards-Version: 4.7.2
 X-Python3-Version: >= 3.6
 

debian/fixcontrol

@@ -98,11 +98,9 @@ if $PMDA_BPF
 then
     echo 's/?{clang}, /clang, /' >>$tmp.sed
     echo 's/?{llvm}, /llvm, /' >>$tmp.sed
-    echo 's/?{libbpf-dev}, /libbpf-dev (>= 0.8.0), /' >>$tmp.sed
 else
     echo 's/?{clang}, //' >>$tmp.sed
     echo 's/?{llvm}, //' >>$tmp.sed
-    echo 's/?{libbpf-dev}, //' >>$tmp.sed
 fi
 
 if $PMDA_POSTGRESQL