Commit 517b49c
committed
Merge: redhat: pass correct RPM_VMLINUX_H to bpftool install
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4299
redhat: pass correct RPM_VMLINUX_H to bpftool install
This is required to fix occasional racy build failures where the lack
of a correctly specified path to vmlinux.h in the %install phase can
cause the bpf Makefile to try and re-generate it against the
build-host kernel; the mistmatched built tools and host kernel can
then crash, aborting the build. To add to the fun of this, it's
somewhat randomly tied to when bpf /sys/ files have updated
timestamps to trigger the make dependency.
By saving the file and referencing in the %install phase, we bypass
all this.
JIRA: INTERNAL
Upstream-status: https://gitlab.com/cki-project/kernel-ark
Related-issue: https://gitlab.com/cki-project/kernel-arkproject/infrastructure/-/issues/340
Related-MR: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3105
Link: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/commit/?id=e7b64f9d3f5b10186038201e0b91f734cbd7fc3d
Signed-off-by: Ian Wienand <iwienand@redhat.com>
Approved-by: Jan Stancek <jstancek@redhat.com>
Approved-by: Patrick Talbert <ptalbert@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>
Merged-by: Lucas Zampieri <lzampier@redhat.com>1 file changed
+4
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2720 | 2720 | | |
2721 | 2721 | | |
2722 | 2722 | | |
| 2723 | + | |
2723 | 2724 | | |
2724 | 2725 | | |
2725 | 2726 | | |
| |||
2876 | 2877 | | |
2877 | 2878 | | |
2878 | 2879 | | |
| 2880 | + | |
| 2881 | + | |
| 2882 | + | |
2879 | 2883 | | |
2880 | 2884 | | |
2881 | 2885 | | |
| |||
0 commit comments