commit 14fddefae2cdb1255279465f2f9fcff5f3da222e
author Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com> Fri Jul 13 23:55:56 2018 +0530
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Fri Jul 27 03:12:32 2018 +0000
tree c741979d99c5cd5e7477483611a0003f44790b49
parent c6ed65665d5392d677c63b836ce6ac358a9db7f7

Squashed 'import-layers/meta-security/' content from commit 4d139b9

Subtree from git://git.yoctoproject.org/meta-security

Change-Id: I14bb13faa3f2b2dc1f5d81b339dd48ffedf8562f
git-subtree-dir: import-layers/meta-security
git-subtree-split: 4d139b95c4f152d132592f515c5151f4dd6269c1
Signed-off-by: Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com>

import-layers/meta-security/recipes-kernel/linux/linux-yocto/apparmor.cfg

diff --git a/import-layers/meta-security/recipes-kernel/linux/linux-yocto/apparmor.cfg b/import-layers/meta-security/recipes-kernel/linux/linux-yocto/apparmor.cfg
new file mode 100644
index 0000000..1dc4168
--- /dev/null
+++ b/import-layers/meta-security/recipes-kernel/linux/linux-yocto/apparmor.cfg
@@ -0,0 +1,13 @@
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
+# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
+CONFIG_SECURITY_PATH=y
+# CONFIG_SECURITY_SELINUX is not set
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_DEFAULT_SECURITY_APPARMOR is not set

import-layers/meta-security/recipes-kernel/linux/linux-yocto/smack-default-lsm.cfg

diff --git a/import-layers/meta-security/recipes-kernel/linux/linux-yocto/smack-default-lsm.cfg b/import-layers/meta-security/recipes-kernel/linux/linux-yocto/smack-default-lsm.cfg
new file mode 100644
index 0000000..b5c4845
--- /dev/null
+++ b/import-layers/meta-security/recipes-kernel/linux/linux-yocto/smack-default-lsm.cfg
@@ -0,0 +1,2 @@
+CONFIG_DEFAULT_SECURITY="smack"
+CONFIG_DEFAULT_SECURITY_SMACK=y

import-layers/meta-security/recipes-kernel/linux/linux-yocto/smack.cfg

diff --git a/import-layers/meta-security/recipes-kernel/linux/linux-yocto/smack.cfg b/import-layers/meta-security/recipes-kernel/linux/linux-yocto/smack.cfg
new file mode 100644
index 0000000..62f465a
--- /dev/null
+++ b/import-layers/meta-security/recipes-kernel/linux/linux-yocto/smack.cfg
@@ -0,0 +1,8 @@
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_SECURITY=y
+CONFIG_SECURITY_SMACK=y
+CONFIG_TMPFS_XATTR=y

import-layers/meta-security/recipes-kernel/linux/linux-yocto_4.%.bbappend

diff --git a/import-layers/meta-security/recipes-kernel/linux/linux-yocto_4.%.bbappend b/import-layers/meta-security/recipes-kernel/linux/linux-yocto_4.%.bbappend
new file mode 100644
index 0000000..067be8f
--- /dev/null
+++ b/import-layers/meta-security/recipes-kernel/linux/linux-yocto_4.%.bbappend
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "\
+        ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor.cfg', '', d)} \
+"
+
+SRC_URI += "\
+        ${@bb.utils.contains('DISTRO_FEATURES', 'smack', ' file://smack.cfg', '', d)} \
+        ${@bb.utils.contains('DISTRO_FEATURES', 'smack', ' file://smack-default-lsm.cfg', '', d)} \
+"