diff options
Diffstat (limited to 'external/meta-security/recipes-kernel/linux')
7 files changed, 8 insertions, 33 deletions
diff --git a/external/meta-security/recipes-kernel/linux/linux-%_5.%.bbappend b/external/meta-security/recipes-kernel/linux/linux-%_5.%.bbappend new file mode 100644 index 00000000..76b5df55 --- /dev/null +++ b/external/meta-security/recipes-kernel/linux/linux-%_5.%.bbappend @@ -0,0 +1,4 @@ +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "yama", " features/yama/yama.scc", "" ,d)}" + diff --git a/external/meta-security/recipes-kernel/linux/linux-yocto-dev.bbappend b/external/meta-security/recipes-kernel/linux/linux-yocto-dev.bbappend new file mode 100644 index 00000000..39d4e6f5 --- /dev/null +++ b/external/meta-security/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -0,0 +1,2 @@ +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}" diff --git a/external/meta-security/recipes-kernel/linux/linux-yocto/apparmor.cfg b/external/meta-security/recipes-kernel/linux/linux-yocto/apparmor.cfg deleted file mode 100644 index 1dc4168e..00000000 --- a/external/meta-security/recipes-kernel/linux/linux-yocto/apparmor.cfg +++ /dev/null @@ -1,13 +0,0 @@ -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 diff --git a/external/meta-security/recipes-kernel/linux/linux-yocto/smack-default-lsm.cfg b/external/meta-security/recipes-kernel/linux/linux-yocto/smack-default-lsm.cfg deleted file mode 100644 index b5c48454..00000000 --- a/external/meta-security/recipes-kernel/linux/linux-yocto/smack-default-lsm.cfg +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_DEFAULT_SECURITY="smack" -CONFIG_DEFAULT_SECURITY_SMACK=y diff --git a/external/meta-security/recipes-kernel/linux/linux-yocto/smack.cfg b/external/meta-security/recipes-kernel/linux/linux-yocto/smack.cfg deleted file mode 100644 index 62f465a4..00000000 --- a/external/meta-security/recipes-kernel/linux/linux-yocto/smack.cfg +++ /dev/null @@ -1,8 +0,0 @@ -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 diff --git a/external/meta-security/recipes-kernel/linux/linux-yocto_4.%.bbappend b/external/meta-security/recipes-kernel/linux/linux-yocto_4.%.bbappend deleted file mode 100644 index 067be8fe..00000000 --- a/external/meta-security/recipes-kernel/linux/linux-yocto_4.%.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -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)} \ -" diff --git a/external/meta-security/recipes-kernel/linux/linux-yocto_5.%.bbappend b/external/meta-security/recipes-kernel/linux/linux-yocto_5.%.bbappend new file mode 100644 index 00000000..39d4e6f5 --- /dev/null +++ b/external/meta-security/recipes-kernel/linux/linux-yocto_5.%.bbappend @@ -0,0 +1,2 @@ +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}" |