packages: kernel/kernel-multiarch.config - revised ACPI options - IMA (avai...

[sparky]

Author: sparky                       Date: Fri Dec  4 21:25:44 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- revised ACPI options
- IMA (available only with ACPI) forces TCG_TPM and TCG_TIS to 'y'

---- Files affected:
packages/kernel:
   kernel-multiarch.config (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-multiarch.config
diff -u packages/kernel/kernel-multiarch.config:1.26 packages/kernel/kernel-multiarch.config:1.27
--- packages/kernel/kernel-multiarch.config:1.26	Fri Dec  4 22:10:10 2009
+++ packages/kernel/kernel-multiarch.config	Fri Dec  4 22:25:38 2009
@@ -111,17 +111,17 @@
 #-
 #- *** FILE: drivers/acpi/Kconfig ***
 #-
-ACPI all=y
-ACPI_SLEEP i386=y x86_64=y
+ACPI ia64=y x86=y
+ACPI_SLEEP x86=y
 ACPI_PROCFS all=y
-ACPI_PROCFS_POWER i386=y ia64=y x86_64=y
+ACPI_PROCFS_POWER ia64=y x86=y
 ACPI_POWER_METER all=m
-ACPI_SYSFS_POWER i386=y ia64=y x86_64=y
+ACPI_SYSFS_POWER ia64=y x86=y
 ACPI_PROC_EVENT all=y
-ACPI_AC i386=m x86_64=m
-ACPI_BATTERY i386=m x86_64=m
+ACPI_AC x86=m
+ACPI_BATTERY x86=m
 ACPI_BUTTON all=m
-ACPI_VIDEO i386=m x86_64=m
+ACPI_VIDEO x86=m
 ACPI_FAN all=m
 ACPI_DOCK all=y
 ACPI_PROCESSOR all=m
@@ -134,10 +134,10 @@
 ACPI_BLACKLIST_YEAR all=0
 ACPI_DEBUG all=n
 ACPI_PCI_SLOT all=m
-X86_PM_TIMER i386=y x86_64=y
+X86_PM_TIMER x86=y
 ACPI_CONTAINER all=m
 ACPI_HOTPLUG_MEMORY all=m
-ACPI_SBS i386=m x86_64=m
+ACPI_SBS x86=m
 
 #-
 #- *** FILE: drivers/ata/Kconfig ***
@@ -494,8 +494,10 @@
 #-
 #- *** FILE: drivers/char/tpm/Kconfig ***
 #-
-TCG_TPM all=m
-TCG_TIS all=m
+#* TCG_TPM forced to 'y' by IMA
+TCG_TPM all=m x86=y ia64=y
+#* TCG_TIS forced to 'y' by IMA
+TCG_TIS all=m x86=y ia64=y
 TCG_NSC all=m
 TCG_ATMEL all=m
 TCG_INFINEON all=m
@@ -5931,7 +5933,7 @@
 #-
 #- *** FILE: security/integrity/ima/Kconfig ***
 #-
-IMA all=y
+IMA x86=y ia64=y
 
 #-
 #- *** FILE: security/selinux/Kconfig ***
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.26&r2=1.27&f=u