From 0856888daf134346d4e4e0f2791af3415a43bfc2 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 18 Aug 2020 10:49:10 +0200 Subject: [PATCH] pmbootstrap kconfig check: enable apparmor SECURITY_APPARMOR_BOOTPARAM_VALUE was required to enable it by default until 5.1 where the option was removed: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0102fb83f90050b86ce37aec810ea17bb4448e0c --- pmb/config/__init__.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py index af1c6afb..e5592d86 100644 --- a/pmb/config/__init__.py +++ b/pmb/config/__init__.py @@ -189,14 +189,17 @@ necessary_kconfig_options = { ">=0.0.0": { # all versions "all": { # all arches "ANDROID_PARANOID_NETWORK": False, + "AUDIT": True, "BLK_DEV_INITRD": True, "CGROUPS": True, "CRYPTO_XTS": True, + "DEFAULT_SECURITY_APPARMOR": True, "DEVTMPFS": True, "DM_CRYPT": True, "EXT4_FS": True, "KINETO_GAN": False, "PFT": False, + "SECURITY_APPARMOR": True, "SYSVIPC": True, "USE_VFB": False, "VT": True, @@ -212,6 +215,11 @@ necessary_kconfig_options = { "armhf armv7 x86": { "LBDAF": True } + }, + "<5.1": { + "all": { + "SECURITY_APPARMOR_BOOTPARAM_VALUE": True, + } } }