aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp
diff options
context:
space:
mode:
authorStephane Desneux <stephane.desneux@iot.bzh>2017-02-24 19:05:23 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-02-25 05:14:22 +0000
commit7990e2f52313753f55b57b426526901b905b5df0 (patch)
tree0195e9b6c09a36d3faecec9d5018c4385a770ccb /meta-agl-bsp
parent5f1b75d9497cf00db7063628cb313dfd6202cb7f (diff)
meta-agl-bsp/meta-ti: remove duplicate smack config
The base smack config is already set by meta-intel-iot-security with a linux-%.bbappend, which applies to all kernels. See: meta-intel-iot-security/meta-security-smack/recipes-kernel/linux/ Bug-AGL: SPEC-450 Change-Id: I39727ee48876754c0821e80ed8d10856a27cb8e4 Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
Diffstat (limited to 'meta-agl-bsp')
-rw-r--r--meta-agl-bsp/meta-ti/recipes-kernel/linux/files/smack-default-lsm.cfg2
-rw-r--r--meta-agl-bsp/meta-ti/recipes-kernel/linux/files/smack.cfg8
-rw-r--r--meta-agl-bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_4.4.bbappend4
3 files changed, 0 insertions, 14 deletions
diff --git a/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/smack-default-lsm.cfg b/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/smack-default-lsm.cfg
deleted file mode 100644
index b5c48454e..000000000
--- a/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/smack-default-lsm.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_DEFAULT_SECURITY="smack"
-CONFIG_DEFAULT_SECURITY_SMACK=y
diff --git a/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/smack.cfg b/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/smack.cfg
deleted file mode 100644
index 62f465a45..000000000
--- a/meta-agl-bsp/meta-ti/recipes-kernel/linux/files/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/meta-agl-bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_4.4.bbappend b/meta-agl-bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_4.4.bbappend
index 636e21bc2..11063ab1d 100644
--- a/meta-agl-bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_4.4.bbappend
+++ b/meta-agl-bsp/meta-ti/recipes-kernel/linux/linux-ti-staging_4.4.bbappend
@@ -3,10 +3,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
SRC_URI_append = " file://ramblock_nbd.cfg"
KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/ramblock_nbd.cfg"
-SRC_URI_append = " file://smack.cfg"
-SRC_URI_append = " file://smack-default-lsm.cfg"
-KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/smack.cfg ${WORKDIR}/smack-default-lsm.cfg"
-
# Enable support for TP-Link TL-W722N USB Wifi adapter
SRC_URI_append = " file://ath9k_htc.cfg"
KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/ath9k_htc.cfg"