From e2490f73849181d840bdbb6265b8df2bb0111062 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 9 Sep 2022 10:27:57 +0200
Subject: [PATCH] Bump libbpf version to 0.7

We already depend on the skeleton APIs introduced in libbpf 0.7 so
let's bump our minimum version to reflect that.

We don't enforce bpf compilation on mkosi anymore since not all
distros have sufficiently up-to-date libbpf available.
---
 README      | 2 +-
 meson.build | 2 +-
 mkosi.build | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README b/README
index cc0782ecbf..fa5d3aca1b 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.2.0 (optional)
+        libbpf >= 0.7.0 (optional)
         libfdisk >= 2.32 (from util-linux) (optional)
         libselinux (optional)
         liblzma (optional)
diff --git a/meson.build b/meson.build
index e76cc1dc6b..0b5fdd1737 100644
--- a/meson.build
+++ b/meson.build
@@ -1050,7 +1050,7 @@ want_bpf_framework = get_option('bpf-framework')
 bpf_compiler = get_option('bpf-compiler')
 bpf_framework_required = want_bpf_framework == 'true'
 
-libbpf_version_requirement = '>= 0.2.0'
+libbpf_version_requirement = '>= 0.7.0'
 if bpf_compiler == 'gcc'
         libbpf_version_requirement = '>= 1.0.0'
 endif
diff --git a/mkosi.build b/mkosi.build
index 1154e738f4..07f9bb21a6 100755
--- a/mkosi.build
+++ b/mkosi.build
@@ -149,7 +149,7 @@ if [ ! -f "$BUILDDIR"/build.ninja ] ; then
                 -D gnu-efi=true \
                 -D kernel-install=true \
                 -D analyze=true \
-                -D bpf-framework=true
+                -D bpf-framework=auto
 fi
 
 cd "$BUILDDIR"