[PATCH 1/1] UBUNTU: ARM: Enable AA with SECURITYFS for imx51

[Brad Figg]

It is necessary to have SECURITYFS enabled at the same time
as AA.

Signed-off-by: Brad Figg <brad.figg at canonical.com>
---
 debian/config/armel/config           |    1 -
 debian/config/armel/config.imx51     |    3 ++-
 debian/config/armel/config.iop32x    |    1 +
 debian/config/armel/config.ixp4xx    |    1 +
 debian/config/armel/config.versatile |    1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/config/armel/config b/debian/config/armel/config
index f485def..47bd110 100644
--- a/debian/config/armel/config
+++ b/debian/config/armel/config
@@ -322,7 +322,6 @@ CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SRP_ATTRS is not set
 CONFIG_SCSI_WAIT_SCAN=m
-# CONFIG_SECURITYFS is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
diff --git a/debian/config/armel/config.imx51 b/debian/config/armel/config.imx51
index 335aa0d..36abaa3 100644
--- a/debian/config/armel/config.imx51
+++ b/debian/config/armel/config.imx51
@@ -1186,8 +1186,9 @@ CONFIG_SDIO_UNIFI_FS=m
 CONFIG_SDMA_IRAM=y
 CONFIG_SDMA_IRAM_SIZE=0x1000
 CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
 CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
+CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_APPARMOR_DISABLE=y
 CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_SECURITY_FILE_CAPABILITIES=y
diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x
index 6183dd6..a0f5298 100644
--- a/debian/config/armel/config.iop32x
+++ b/debian/config/armel/config.iop32x
@@ -863,6 +863,7 @@ CONFIG_SCHED_DEBUG=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_TGT is not set
 CONFIG_SECURITY=y
+# CONFIG_SECURITYFS is not set
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_APPARMOR_DISABLE=y
diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx
index 30088da..08d5838 100644
--- a/debian/config/armel/config.ixp4xx
+++ b/debian/config/armel/config.ixp4xx
@@ -924,6 +924,7 @@ CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_SCTP_HMAC_SHA1 is not set
 CONFIG_SDIO_UART=m
 # CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile
index ebaeacf..d884ee4 100644
--- a/debian/config/armel/config.versatile
+++ b/debian/config/armel/config.versatile
@@ -673,6 +673,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SDIO_UART is not set
 CONFIG_SECURITY=y
+# CONFIG_SECURITYFS is not set
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_APPARMOR_DISABLE=y
-- 
1.6.1.3