shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-31 14:50:15 +03:00
Code

Merge pull request #21607 from mrc0mmand/ci-install-libbpf

Browse Source 
ci: run build test with BPF-related stuff as well
This commit is contained in:
Luca Boccassi 2021-12-03 18:37:33 +00:00 committed by GitHub
commit 09dfd918ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/build_test.sh vendored
View File

@ -27,6 +27,7 @@ PACKAGES=(
itstool
kbd
libblkid-dev
libbpf-dev
libcap-dev
libcurl4-gnutls-dev
libfdisk-dev
@ -48,8 +49,8 @@ PACKAGES=(
net-tools
perl
python3-evdev
python3-lxml
python3-jinja2
python3-lxml
python3-pip
python3-pyparsing
python3-setuptools

13
meson.build
View File

@ -992,8 +992,17 @@ conf.set10('HAVE_LIBBPF', libbpf.found())
if want_bpf_framework == 'false'
conf.set10('BPF_FRAMEWORK', 0)
else
clang = find_program('clang', required : bpf_framework_required)
llvm_strip = find_program('llvm-strip', required : bpf_framework_required)
# Support 'versioned' clang/llvm-strip binaries, as seen on Debian/Ubuntu
# (like clang-10/llvm-strip-10)
clang_bin = cc.get_id() == 'clang' ? cc.cmd_array()[0] : 'clang'
clang = find_program(clang_bin, required : bpf_framework_required)
if clang.found()
llvm_strip_bin = run_command(clang, '--print-prog-name', 'llvm-strip',
check : true).stdout().strip()
else
llvm_strip_bin = 'llvm-strip'
endif
llvm_strip = find_program(llvm_strip_bin, required : bpf_framework_required)
# Debian installs this in /usr/sbin/ which is not in $PATH.
# We check for 'bpftool' first, honouring $PATH, and in /usr/sbin/ for Debian.

2
src/analyze/analyze.c
View File

@ -1959,7 +1959,7 @@ static int dump_filesystems(int argc, char *argv[], void *userdata) {
const statfs_f_type_t *magic;
bool is_primary = false;
assert(fs_type_from_string(*filesystem, &magic) >= 0);
assert_se(fs_type_from_string(*filesystem, &magic) >= 0);
for (size_t i = 0; magic[i] != 0; i++) {
const char *primary;