Merge pull request #400 from sched-ext/fix-bpftool

meson: restore previous libbpf version and update bpftool
This commit is contained in:
Andrea Righi 2024-06-28 13:21:46 +02:00 committed by GitHub
commit 657fb6a4aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -124,7 +124,7 @@ if should_build_libbpf
endforeach
message('Fetching libbpf repo')
libbpf_commit = 'c1a6c770c46c6e78ad6755bf596c23a4e6f6b216'
libbpf_commit = '42065ea6627ff6e1ab4c65e51042a70fbf30ff7c'
run_command(fetch_libbpf, meson.current_build_dir(), libbpf_commit, check: true)
make_jobs = 1
@ -180,7 +180,7 @@ endif
if should_build_bpftool
message('Fetching bpftool repo')
bpftool_commit = '42065ea6627ff6e1ab4c65e51042a70fbf30ff7c'
bpftool_commit = '20ce6933869b70bacfdd0dd1a8399199290bf8ff'
run_command(fetch_bpftool, meson.current_build_dir(), bpftool_commit, check: true)
bpftool_target = custom_target('bpftool_target',