From 25ec456a627f9b9aa38d8e550c04c9fb9570712d Mon Sep 17 00:00:00 2001
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Fri, 21 Jun 2024 13:09:47 +0200
Subject: [PATCH] snapcraft: add apparmor part

Let's ship newer version of AppArmor with support of new features.
Only needed for core22. But we will use with core24 based series for consistency.

Also bumped apparmor to v4.0.2.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
(cherry picked from commit 8591ed414b4dab7d045ccb344eb914d07f67b93f)
Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
---
 snapcraft.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 534dfa4a..e5823869 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1244,8 +1244,8 @@ parts:
 
   apparmor:
     source: https://gitlab.com/apparmor/apparmor.git
+    source-commit: 84a6bc1b6dcdfeabb1ed3597f01e314f3bcee5c1 # v4.0.2
     source-depth: 1
-    source-tag: v4.0.1
     source-type: git
     plugin: autotools
     build-packages:
@@ -1281,8 +1281,8 @@ parts:
   # Core components
   lxc:
     after:
-      - libseccomp
       - apparmor
+      - libseccomp
     source: https://github.com/lxc/lxc
     source-branch: stable-5.0
     source-type: git