diff mbox

[3/6] UBUNTU: [Config] CONFIG_IMA=y

Message ID 1403911369-32675-4-git-send-email-tyhicks@canonical.com
State New
Headers show

Commit Message

Tyler Hicks June 27, 2014, 11:22 p.m. UTC 
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
---
 debian.mako/config/config.common.ubuntu | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/debian.mako/config/config.common.ubuntu b/debian.mako/config/config.common.ubuntu
index 9ce12c4..37e8053 100644
--- a/debian.mako/config/config.common.ubuntu
+++ b/debian.mako/config/config.common.ubuntu
@@ -1005,7 +1005,10 @@  CONFIG_I2C_QUP=y
 # CONFIG_IIO is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
-# CONFIG_IMA is not set
+CONFIG_IMA=y
+CONFIG_IMA_AUDIT=y
+CONFIG_IMA_LSM_RULES=y
+CONFIG_IMA_MEASURE_PCR_IDX=10
 # CONFIG_IMX072 is not set
 # CONFIG_IMX074 is not set
 # CONFIG_IMX074_ACT is not set
@@ -2465,7 +2468,10 @@  CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_TASK_XACCT=y
-# CONFIG_TCG_TPM is not set
+# CONFIG_TCG_ATMEL is not set
+# CONFIG_TCG_ST_I2C is not set
+CONFIG_TCG_TPM=y
+# CONFIG_TCG_TPMD_DEV is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TCP_MD5SIG is not set
@@ -2553,6 +2559,7 @@  CONFIG_TRACING_SUPPORT=y
 # CONFIG_TRANZPORT is not set
 CONFIG_TREE_PREEMPT_RCU=y
 # CONFIG_TREE_RCU_TRACE is not set
+CONFIG_TRUSTED_KEYS=y
 # CONFIG_TSIF is not set
 # CONFIG_TSPP is not set
 # CONFIG_TTY_PRINTK is not set