From: Daniel P. Berrangé <berrange@redhat.com>
Date: Mon, 31 Mar 2025 10:43:33 +0000 (+0100)
Subject: meson: mandate apparmor >= 3.0.0
X-Git-Tag: v11.3.0-rc1~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21b7b02b727e7a817e123e1e8776da1170ab6f5c;p=thirdparty%2Flibvirt.git

meson: mandate apparmor >= 3.0.0

We can now assume at least version three:

 * Debian 12: 3.0.8
 * openSUSE Leap 15.5: 3.0.4
 * openSUSE Leap 15.6: 3.1.7
 * Ubuntu 22.04: 3.0.4
 * Ubuntu 24.04: 4.0.0

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/meson.build b/meson.build
index 50afb74146..f8742338f8 100644
--- a/meson.build
+++ b/meson.build
@@ -926,12 +926,12 @@ if acl_dep.found()
   conf.set('WITH_LIBACL', 1)
 endif
 
-apparmor_dep = dependency('libapparmor', required: get_option('apparmor'))
+apparmor_version = '3.0.0'
+apparmor_dep = dependency('libapparmor', version: '>=' + apparmor_version,
+                          required: get_option('apparmor'))
 if apparmor_dep.found()
   conf.set('WITH_APPARMOR', 1)
-  if apparmor_dep.version().version_compare('>=3.0.0')
-    conf.set('WITH_APPARMOR_3', 1)
-  endif
+  conf.set('WITH_APPARMOR_3', 1)
   conf.set_quoted('APPARMOR_DIR', sysconfdir / 'apparmor.d')
   conf.set_quoted('APPARMOR_PROFILES_PATH', '/sys/kernel/security/apparmor/profiles')
 endif