diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-04-09 17:24:59 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-04-09 17:24:59 +0200 |
| commit | 52ea426b81e758819beb7850a590058f740706ab (patch) | |
| tree | 9cad812c767085097e365d0a2c8435bc2170d33d | |
| parent | 0d16b037f546bf8f251ab30f47a0a06657fd098b (diff) | |
| download | NetworkManager-52ea426b81e758819beb7850a590058f740706ab.tar.gz | |
build: disable eBPF by default
We have random failures to build on gitlab-ci. Something is wrong,
at least, eBPF is not working reliably. Disable it for now.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | meson.build | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index a44236512a..c43f8f1cd4 100644 --- a/configure.ac +++ b/configure.ac @@ -529,7 +529,8 @@ esac AC_ARG_WITH(ebpf, AS_HELP_STRING([--with-ebpf=yes|no|auto], [Build with eBPF support (default: auto)]), [], [with_ebpf=auto]) -if test "$with_ebpf" = "yes" -o "$with_ebpf" = "auto"; then +# 'auto' means 'false' because there are still some issues. +if test "$with_ebpf" = "yes" ; then AC_CHECK_HEADER(linux/bpf.h, [have_ebpf=yes], [have_ebpf=no]) else have_ebpf=no diff --git a/meson.build b/meson.build index df5569d3b4..63cd1261cb 100644 --- a/meson.build +++ b/meson.build @@ -437,7 +437,8 @@ config_h.set10('HAVE_SELINUX', enable_selinux) # eBPF support ebpf_opt = get_option('ebpf') -if ebpf_opt == 'false' +# 'auto' means 'false', because there are still issues. +if ebpf_opt != 'true' enable_ebpf = false else enable_ebpf = true |