In v2:

 - Do upfront check for apparmor >= 3.0.0
 - Add further revert commit

Daniel P. Berrangé (5):
  meson: mandate apparmor >= 3.0.0
  apparmor: assume at least apparmor >= 3
  Revert "apparmor: Allow version-specific bits in abstractions too"
  Revert "apparmor: Allow version-specific bits in profiles"
  meson: drop remaining checks for apparmor version

 meson.build                                   |  7 +-
 .../apparmor/{libvirt-lxc.in => libvirt-lxc}  |  2 -
 .../{libvirt-qemu.in => libvirt-qemu}         |  4 --
 src/security/apparmor/meson.build             | 64 ++-----------------
 .../usr.lib.libvirt.virt-aa-helper.in         |  5 --
 src/security/apparmor/usr.sbin.libvirtd.in    |  2 -
 src/security/apparmor/usr.sbin.virtqemud.in   |  2 -
 src/security/apparmor/usr.sbin.virtxend.in    |  2 -
 src/security/virt-aa-helper.c                 |  9 +--
 9 files changed, 10 insertions(+), 87 deletions(-)
 rename src/security/apparmor/{libvirt-lxc.in => libvirt-lxc} (99%)
 rename src/security/apparmor/{libvirt-qemu.in => libvirt-qemu} (99%)

-- 
2.48.1

On Mon, Mar 31, 2025 at 01:37:26PM +0100, Daniel P. Berrangé via Devel wrote:
> In v2:
> 
>  - Do upfront check for apparmor >= 3.0.0
>  - Add further revert commit
> 
> Daniel P. Berrangé (5):
>   meson: mandate apparmor >= 3.0.0
>   apparmor: assume at least apparmor >= 3
>   Revert "apparmor: Allow version-specific bits in abstractions too"
>   Revert "apparmor: Allow version-specific bits in profiles"
>   meson: drop remaining checks for apparmor version

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>