From a94c0f9e5d50785bfcc4303990daa7b919640a35 Mon Sep 17 00:00:00 2001
From: Emanuele Aina <emanuele.aina@collabora.com>
Date: Thu, 21 Mar 2019 16:14:18 +0100
Subject: [PATCH] ospack: Re-introduce chaiwala-apparmor-profiles

The chaiwala-apparmor-profiles contains some AppArmor abstractions in use in
some Apertis-specific profiles.

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>
---
 apertis-ospack-basesdk.yaml | 3 +--
 apertis-ospack-devroot.yaml | 3 +--
 apertis-ospack-minimal.yaml | 2 +-
 apertis-ospack-sdk.yaml     | 4 +---
 apertis-ospack-target.yaml  | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/apertis-ospack-basesdk.yaml b/apertis-ospack-basesdk.yaml
index aecd2ff2..7f4ceae1 100644
--- a/apertis-ospack-basesdk.yaml
+++ b/apertis-ospack-basesdk.yaml
@@ -58,7 +58,7 @@ actions:
     description: "AppArmor packages"
     packages:
       - apparmor
-      # - chaiwala-apparmor-profiles
+      - chaiwala-apparmor-profiles
 
   - action: apt
     description: "Test environment packages"
@@ -263,7 +263,6 @@ actions:
       - bzip2
       - ca-certificates
       - ccache
-      #- chaiwala-apparmor-profiles
       #- chaiwala-sdk-default-settings
       - chrpath
       - clang
diff --git a/apertis-ospack-devroot.yaml b/apertis-ospack-devroot.yaml
index ecfc596c..89c94f14 100644
--- a/apertis-ospack-devroot.yaml
+++ b/apertis-ospack-devroot.yaml
@@ -66,7 +66,7 @@ actions:
     description: "AppArmor packages"
     packages:
       - apparmor
-      #- chaiwala-apparmor-profiles
+      - chaiwala-apparmor-profiles
 
   {{ if eq $ivitools "enabled" }}
   - action: apt
@@ -123,7 +123,6 @@ actions:
       - btrfs-tools
       - bzip2
       - ca-certificates
-      #- chaiwala-apparmor-profiles
       - connman
       - debconf-i18n
       - evolution-data-server
diff --git a/apertis-ospack-minimal.yaml b/apertis-ospack-minimal.yaml
index bd2d89be..dd2da34a 100644
--- a/apertis-ospack-minimal.yaml
+++ b/apertis-ospack-minimal.yaml
@@ -60,7 +60,7 @@ actions:
     description: "AppArmor packages"
     packages:
       - apparmor
-      # - chaiwala-apparmor-profiles
+      - chaiwala-apparmor-profiles
 
   - action: apt
     description: "Application framework packages"
diff --git a/apertis-ospack-sdk.yaml b/apertis-ospack-sdk.yaml
index c3915152..9095c51f 100644
--- a/apertis-ospack-sdk.yaml
+++ b/apertis-ospack-sdk.yaml
@@ -59,7 +59,7 @@ actions:
     description: "AppArmor packages"
     packages:
       - apparmor
-      #- chaiwala-apparmor-profiles
+      - chaiwala-apparmor-profiles
 
   - action: apt
     description: "Application framework packages"
@@ -107,7 +107,6 @@ actions:
       - btrfs-tools
       - bzip2
       - ca-certificates
-      #- chaiwala-apparmor-profiles
       - connman
       - debconf-i18n
       - evolution-data-server
@@ -377,7 +376,6 @@ actions:
       - bzip2
       - ca-certificates
       - ccache
-      #- chaiwala-apparmor-profiles
       #- chaiwala-sdk-default-settings
       - chrpath
       - clang
diff --git a/apertis-ospack-target.yaml b/apertis-ospack-target.yaml
index 222589b7..b8c3e295 100644
--- a/apertis-ospack-target.yaml
+++ b/apertis-ospack-target.yaml
@@ -57,7 +57,7 @@ actions:
     description: "AppArmor packages"
     packages:
       - apparmor
-      # - chaiwala-apparmor-profiles
+      - chaiwala-apparmor-profiles
 
   {{ if eq $ivitools "enabled" }}
   - action: apt
@@ -114,7 +114,6 @@ actions:
       - btrfs-tools
       - bzip2
       - ca-certificates
-      #- chaiwala-apparmor-profiles
       - connman
       - debconf-i18n
       #- evolution-data-server
-- 
GitLab