From 479c9803f0de0b0660b97d4ff0c498ee5a7cbd03 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 19 Sep 2013 18:32:52 +0000 Subject: linux-yocto: Add support for the 3.10 kernel Also update the selinux.cfg file to add ext4, jfs, and jffs2 support. Signed-off-by: Mark Hatle Signed-off-by: Joe MacDonald --- recipes-kernel/linux/linux-yocto/selinux.cfg | 3 +++ recipes-kernel/linux/linux-yocto_3.10.bbappend | 3 +++ 2 files changed, 6 insertions(+) diff --git a/recipes-kernel/linux/linux-yocto/selinux.cfg b/recipes-kernel/linux/linux-yocto/selinux.cfg index 325d5d8..53cdf57 100644 --- a/recipes-kernel/linux/linux-yocto/selinux.cfg +++ b/recipes-kernel/linux/linux-yocto/selinux.cfg @@ -14,7 +14,10 @@ CONFIG_AUDIT=y CONFIG_NETWORK_SECMARK=y CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4_FS_SECURITY=y +CONFIG_JFS_SECURITY=y CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFFS2_FS_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y diff --git a/recipes-kernel/linux/linux-yocto_3.10.bbappend b/recipes-kernel/linux/linux-yocto_3.10.bbappend index 9004c59..159d63b 100644 --- a/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -1,6 +1,9 @@ PRINC = "1" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +# Enable selinux support in the kernel if the feature is enabled +SRC_URI += "${@base_contains('DISTRO_FEATURES', 'selinux', 'file://selinux.cfg', '', d)}" + # For inconsistent kallsyms data bug on ARM # http://lists.infradead.org/pipermail/linux-arm-kernel/2012-March/thread.html#89718 EXTRA_OEMAKE += "${@base_contains('TARGET_ARCH', 'arm', ' KALLSYMS_EXTRA_PASS=1', '', d)}" -- cgit v1.2.3-54-g00ecf