diff options
author | Armin Kuster <akuster808@gmail.com> | 2019-04-01 08:00:32 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2019-04-01 19:21:06 -0700 |
commit | cb412637a2373b7e015cd5f5ef543df3d90c9ab4 (patch) | |
tree | c928053e0a05e8cc72265a6ced6aa05a2641408e | |
parent | 5b8e4cb21bf624597d256150ced54901428a0997 (diff) | |
download | meta-security-cb412637a2373b7e015cd5f5ef543df3d90c9ab4.tar.gz |
linux-yocto: make bbappend version neutral
update apparmor configs
[v2]
Just update configs.
leave versions intact.
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | recipes-kernel/linux/linux-yocto/apparmor.cfg | 12 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto/apparmor_on_boot.cfg | 1 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-yocto_4.%.bbappend | 1 |
3 files changed, 9 insertions, 5 deletions
diff --git a/recipes-kernel/linux/linux-yocto/apparmor.cfg b/recipes-kernel/linux/linux-yocto/apparmor.cfg index 1dc4168..b5f9bb2 100644 --- a/recipes-kernel/linux/linux-yocto/apparmor.cfg +++ b/recipes-kernel/linux/linux-yocto/apparmor.cfg | |||
@@ -1,13 +1,15 @@ | |||
1 | CONFIG_AUDIT=y | 1 | CONFIG_AUDIT=y |
2 | CONFIG_AUDITSYSCALL=y | ||
3 | CONFIG_AUDIT_WATCH=y | ||
4 | CONFIG_AUDIT_TREE=y | ||
5 | # CONFIG_NETFILTER_XT_TARGET_AUDIT is not set | 2 | # CONFIG_NETFILTER_XT_TARGET_AUDIT is not set |
3 | CONFIG_SECURITY_NETWORK=y | ||
4 | # CONFIG_SECURITY_NETWORK_XFRM is not set | ||
6 | CONFIG_SECURITY_PATH=y | 5 | CONFIG_SECURITY_PATH=y |
7 | # CONFIG_SECURITY_SELINUX is not set | 6 | # CONFIG_SECURITY_SELINUX is not set |
8 | CONFIG_SECURITY_APPARMOR=y | 7 | CONFIG_SECURITY_APPARMOR=y |
9 | CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 | ||
10 | CONFIG_SECURITY_APPARMOR_HASH=y | 8 | CONFIG_SECURITY_APPARMOR_HASH=y |
11 | CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y | 9 | CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y |
10 | # CONFIG_SECURITY_APPARMOR_DEBUG is not set | ||
12 | CONFIG_INTEGRITY_AUDIT=y | 11 | CONFIG_INTEGRITY_AUDIT=y |
13 | # CONFIG_DEFAULT_SECURITY_APPARMOR is not set | 12 | CONFIG_DEFAULT_SECURITY_APPARMOR=y |
13 | # CONFIG_DEFAULT_SECURITY_DAC is not set | ||
14 | CONFIG_DEFAULT_SECURITY="apparmor" | ||
15 | CONFIG_AUDIT_GENERIC=y | ||
diff --git a/recipes-kernel/linux/linux-yocto/apparmor_on_boot.cfg b/recipes-kernel/linux/linux-yocto/apparmor_on_boot.cfg new file mode 100644 index 0000000..fc35740 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/apparmor_on_boot.cfg | |||
@@ -0,0 +1 @@ | |||
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 | |||
diff --git a/recipes-kernel/linux/linux-yocto_4.%.bbappend b/recipes-kernel/linux/linux-yocto_4.%.bbappend index 067be8f..321392c 100644 --- a/recipes-kernel/linux/linux-yocto_4.%.bbappend +++ b/recipes-kernel/linux/linux-yocto_4.%.bbappend | |||
@@ -2,6 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | |||
2 | 2 | ||
3 | SRC_URI += "\ | 3 | SRC_URI += "\ |
4 | ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor.cfg', '', d)} \ | 4 | ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor.cfg', '', d)} \ |
5 | ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor_on_boot.cfg', '', d)} \ | ||
5 | " | 6 | " |
6 | 7 | ||
7 | SRC_URI += "\ | 8 | SRC_URI += "\ |