diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index de00078b2a..47716541dd 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -47,6 +47,8 @@ jobs: release: tumbleweed - distro: centos_epel release: 9-stream + - distro: centos_epel + release: 8-stream steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b diff --git a/README b/README index fa5d3aca1b..92e3ca0f48 100644 --- a/README +++ b/README @@ -181,7 +181,7 @@ REQUIREMENTS: libcryptsetup (optional), >= 2.3.0 required for signed Verity images support libaudit (optional) libacl (optional) - libbpf >= 0.7.0 (optional) + libbpf >= 0.1.0 (optional) libfdisk >= 2.32 (from util-linux) (optional) libselinux (optional) liblzma (optional) diff --git a/meson.build b/meson.build index 2c6a061a90..dfe18f7e7b 100644 --- a/meson.build +++ b/meson.build @@ -1388,7 +1388,7 @@ conf.set10('HAVE_LIBIPTC', have) want_qrencode = get_option('qrencode') if want_qrencode != 'false' and not skip_deps libqrencode = dependency('libqrencode', - version : '>= 4', + version : '>= 3', required : want_qrencode == 'true') have = libqrencode.found() else diff --git a/mkosi.build b/mkosi.build index 4f7b67d7e5..f02a15ad4d 100755 --- a/mkosi.build +++ b/mkosi.build @@ -56,6 +56,22 @@ for bpftool in /usr/lib/linux-tools/*/bpftool; do break done +# CentOS Stream 8 includes bpftool 4.18.0 which is lower than what we need. However, they've backported the +# specific feature we need ("gen skeleton") to this version, so we replace bpftool with a script that reports +# version 5.6.0 to satisfy meson which makes bpf work on CentOS Stream 8 as well. +if [ "$(grep '^ID=' /etc/os-release)" = "ID=\"centos\"" ] && [ "$(grep '^VERSION=' /etc/os-release)" = "VERSION=\"8\"" ]; then + cp /usr/sbin/bpftool /usr/sbin/bpftool.real + cat > /usr/sbin/bpftool <= 0) + break; + } + + return r; } static void print_border(FILE *output, unsigned width) {