From: Stephane Desneux <stephane.desneux@iot.bzh>
Date: Fri, 24 Feb 2017 18:19:28 +0000 (+0100)
Subject: meta-agl-bsp/meta-qcom: remove duplicate smack config
X-Git-Tag: 3.99.1~159
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=5f1b75d9497cf00db7063628cb313dfd6202cb7f;p=AGL%2Fmeta-agl.git

meta-agl-bsp/meta-qcom: 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. i

See: meta-intel-iot-security/meta-security-smack/recipes-kernel/linux/

Bug-AGL: SPEC-450

Change-Id: I3fe57d5396827f48f18e2f04bf6f0c4d5ee4a894
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
---

diff --git a/meta-agl-bsp/meta-qcom/recipes-kernel/linux/files/smack-default-lsm.cfg b/meta-agl-bsp/meta-qcom/recipes-kernel/linux/files/smack-default-lsm.cfg
deleted file mode 100644
index b5c48454e..000000000
--- a/meta-agl-bsp/meta-qcom/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-qcom/recipes-kernel/linux/files/smack.cfg b/meta-agl-bsp/meta-qcom/recipes-kernel/linux/files/smack.cfg
deleted file mode 100644
index 62f465a45..000000000
--- a/meta-agl-bsp/meta-qcom/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-qcom/recipes-kernel/linux/linux-linaro-qcomlt_4.4.bbappend b/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_4.4.bbappend
index 62f8d7c3e..8127793ee 100644
--- a/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_4.4.bbappend
+++ b/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_4.4.bbappend
@@ -9,12 +9,10 @@ SRC_URI_append_smack = "\
 "
 
 # Extra configuration options
-SRC_URI += "file://smack.cfg \
-            file://smack-default-lsm.cfg \
-            file://fanotify.cfg \
+SRC_URI += "file://fanotify.cfg \
             file://uinput.cfg \
             file://hid.cfg "
-KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/smack.cfg ${WORKDIR}/smack-default-lsm.cfg ${WORKDIR}/fanotify.cfg ${WORKDIR}/uinput.cfg ${WORKDIR}/hid.cfg"
+KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/fanotify.cfg ${WORKDIR}/uinput.cfg ${WORKDIR}/hid.cfg"
 
 # Enable support for TP-Link TL-W722N USB Wifi adapter
 SRC_URI += " file://ath9k_htc.cfg "