diff --git a/pcp.spec b/pcp.spec index c6057df..2efaf33 100644 --- a/pcp.spec +++ b/pcp.spec @@ -11,6 +11,8 @@ Source0: %{artifactory}/pcp-source-release/pcp-%{version}.src.tar.gz Source1: %{pcp_git_url}/main/debian/pcp-testsuite.sysusers Source2: %{pcp_git_url}/main/debian/pcp.sysusers +Patch0: redhat-bugzilla-2117074-vendored_vmlinux.h.patch + # The additional linker flags break out-of-tree PMDAs. # https://bugzilla.redhat.com/show_bug.cgi?id=2043092 %undefine _package_note_flags @@ -2290,6 +2292,7 @@ updated policy package. %prep %setup -q +%patch0 -p1 %build # the buildsubdir macro gets defined in %%setup and is apparently only available in the next step (i.e. the %%build step) @@ -3372,7 +3375,7 @@ fi %files zeroconf -f pcp-zeroconf-files.rpm %changelog -* Thu Oct 27 2022 Nathan Scott - 6.0.1-1 +* Fri Oct 28 2022 Nathan Scott - 6.0.1-1 - Convert to independent selinux policy (BZs 1941873, 2127037) - Improve pmproxy REST API timeout handling (BZ 2130208) - Rebase to latest stable version of PCP (BZ 2117074) diff --git a/redhat-bugzilla-2117074-vendored_vmlinux.h.patch b/redhat-bugzilla-2117074-vendored_vmlinux.h.patch new file mode 100644 index 0000000..7b01f83 --- /dev/null +++ b/redhat-bugzilla-2117074-vendored_vmlinux.h.patch @@ -0,0 +1,19 @@ +commit 23bfdcbac0b0fb7bd33f092c6f2ad56889480335 +Author: Andreas Gerstmayr +Date: Thu Oct 27 14:22:37 2022 +0200 + + build: use vendored vmlinux.h when compiling bpftool + +diff --git a/vendor/GNUmakefile b/vendor/GNUmakefile +index a0c29d4b45..57151e4671 100644 +--- a/vendor/GNUmakefile ++++ b/vendor/GNUmakefile +@@ -3,7 +3,7 @@ include $(TOPDIR)/src/include/builddefs + + default_pcp default: + ifeq "$(PMDA_BPF)" "true" +- $(MAKE) -C github.com/libbpf/bpftool/src ++ $(MAKE) -C github.com/libbpf/bpftool/src VMLINUX_H=$(PMDABPF_VMLINUXH) + endif + + install_pcp install: