1 |
Author: jmbsvicetto |
2 |
Date: 2011-11-01 14:38:55 +0000 (Tue, 01 Nov 2011) |
3 |
New Revision: 826 |
4 |
|
5 |
Modified: |
6 |
trunk/releases/weekly/kconfig/amd64/admincd-3.0.config |
7 |
trunk/releases/weekly/kconfig/x86/admincd-3.0.config |
8 |
Log: |
9 |
Update admincd kernel specs. Drop staging drivers, sync amd65 and x86 config and set ISCSI_TCP to module so sys-block/open-iscsi builds. |
10 |
|
11 |
|
12 |
Modified: trunk/releases/weekly/kconfig/amd64/admincd-3.0.config |
13 |
=================================================================== |
14 |
--- trunk/releases/weekly/kconfig/amd64/admincd-3.0.config 2011-10-30 23:58:35 UTC (rev 825) |
15 |
+++ trunk/releases/weekly/kconfig/amd64/admincd-3.0.config 2011-11-01 14:38:55 UTC (rev 826) |
16 |
@@ -1,6 +1,6 @@ |
17 |
# |
18 |
# Automatically generated make config: don't edit |
19 |
-# Linux/x86_64 3.0.3-hardened Kernel Configuration |
20 |
+# Linux/x86_64 3.0.4-hardened-r4 Kernel Configuration |
21 |
# |
22 |
CONFIG_64BIT=y |
23 |
# CONFIG_X86_32 is not set |
24 |
@@ -822,7 +822,7 @@ |
25 |
CONFIG_SCSI_SRP_ATTRS=m |
26 |
CONFIG_SCSI_SRP_TGT_ATTRS=y |
27 |
CONFIG_SCSI_LOWLEVEL=y |
28 |
-CONFIG_ISCSI_TCP=y |
29 |
+CONFIG_ISCSI_TCP=m |
30 |
CONFIG_ISCSI_BOOT_SYSFS=m |
31 |
CONFIG_SCSI_CXGB3_ISCSI=m |
32 |
CONFIG_SCSI_CXGB4_ISCSI=m |
33 |
@@ -3023,7 +3023,6 @@ |
34 |
# |
35 |
# Executable Protections |
36 |
# |
37 |
-CONFIG_GRKERNSEC_EXECVE=y |
38 |
CONFIG_GRKERNSEC_DMESG=y |
39 |
CONFIG_GRKERNSEC_HARDEN_PTRACE=y |
40 |
# CONFIG_GRKERNSEC_TPE is not set |
41 |
|
42 |
Modified: trunk/releases/weekly/kconfig/x86/admincd-3.0.config |
43 |
=================================================================== |
44 |
--- trunk/releases/weekly/kconfig/x86/admincd-3.0.config 2011-10-30 23:58:35 UTC (rev 825) |
45 |
+++ trunk/releases/weekly/kconfig/x86/admincd-3.0.config 2011-11-01 14:38:55 UTC (rev 826) |
46 |
@@ -1,6 +1,6 @@ |
47 |
# |
48 |
# Automatically generated make config: don't edit |
49 |
-# Linux/i386 3.0.4-hardened-r2 Kernel Configuration |
50 |
+# Linux/i386 3.0.4-hardened-r4 Kernel Configuration |
51 |
# |
52 |
# CONFIG_64BIT is not set |
53 |
CONFIG_X86_32=y |
54 |
@@ -71,7 +71,7 @@ |
55 |
# CONFIG_KERNEL_LZMA is not set |
56 |
CONFIG_KERNEL_XZ=y |
57 |
# CONFIG_KERNEL_LZO is not set |
58 |
-CONFIG_DEFAULT_HOSTNAME="4" |
59 |
+CONFIG_DEFAULT_HOSTNAME="" |
60 |
CONFIG_SWAP=y |
61 |
CONFIG_SYSVIPC=y |
62 |
CONFIG_SYSVIPC_SYSCTL=y |
63 |
@@ -377,6 +377,7 @@ |
64 |
# CONFIG_MTRR_SANITIZER is not set |
65 |
CONFIG_X86_PAT=y |
66 |
CONFIG_ARCH_USES_PG_UNCACHED=y |
67 |
+CONFIG_EFI=y |
68 |
CONFIG_SECCOMP=y |
69 |
CONFIG_HZ_100=y |
70 |
# CONFIG_HZ_250 is not set |
71 |
@@ -412,7 +413,7 @@ |
72 |
CONFIG_ACPI_PROCESSOR=m |
73 |
# CONFIG_ACPI_IPMI is not set |
74 |
CONFIG_ACPI_HOTPLUG_CPU=y |
75 |
-# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set |
76 |
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m |
77 |
CONFIG_ACPI_THERMAL=m |
78 |
CONFIG_ACPI_CUSTOM_DSDT_FILE="" |
79 |
# CONFIG_ACPI_CUSTOM_DSDT is not set |
80 |
@@ -663,7 +664,8 @@ |
81 |
CONFIG_BT_HCIBLUECARD=m |
82 |
CONFIG_BT_HCIBTUART=m |
83 |
CONFIG_BT_HCIVHCI=m |
84 |
-# CONFIG_BT_MRVL is not set |
85 |
+CONFIG_BT_MRVL=m |
86 |
+CONFIG_BT_MRVL_SDIO=m |
87 |
# CONFIG_AF_RXRPC is not set |
88 |
CONFIG_WIRELESS=y |
89 |
CONFIG_WIRELESS_EXT=y |
90 |
@@ -840,7 +842,7 @@ |
91 |
CONFIG_SCSI_SRP_ATTRS=m |
92 |
CONFIG_SCSI_SRP_TGT_ATTRS=y |
93 |
CONFIG_SCSI_LOWLEVEL=y |
94 |
-CONFIG_ISCSI_TCP=y |
95 |
+CONFIG_ISCSI_TCP=m |
96 |
CONFIG_ISCSI_BOOT_SYSFS=m |
97 |
CONFIG_SCSI_CXGB3_ISCSI=m |
98 |
CONFIG_SCSI_CXGB4_ISCSI=m |
99 |
@@ -1371,7 +1373,9 @@ |
100 |
CONFIG_WL1251=m |
101 |
# CONFIG_WL1251_SDIO is not set |
102 |
CONFIG_WL12XX_MENU=m |
103 |
-# CONFIG_WL12XX is not set |
104 |
+CONFIG_WL12XX=m |
105 |
+# CONFIG_WL12XX_HT is not set |
106 |
+# CONFIG_WL12XX_SDIO is not set |
107 |
CONFIG_ZD1211RW=m |
108 |
# CONFIG_ZD1211RW_DEBUG is not set |
109 |
CONFIG_MWIFIEX=m |
110 |
@@ -1968,6 +1972,7 @@ |
111 |
# CONFIG_FB_VGA16 is not set |
112 |
# CONFIG_FB_UVESA is not set |
113 |
CONFIG_FB_VESA=y |
114 |
+CONFIG_FB_EFI=y |
115 |
# CONFIG_FB_N411 is not set |
116 |
# CONFIG_FB_HGA is not set |
117 |
# CONFIG_FB_S1D13XXX is not set |
118 |
@@ -2541,76 +2546,8 @@ |
119 |
# CONFIG_UIO_SERCOS3 is not set |
120 |
# CONFIG_UIO_PCI_GENERIC is not set |
121 |
# CONFIG_UIO_NETX is not set |
122 |
-CONFIG_STAGING=y |
123 |
-# CONFIG_ET131X is not set |
124 |
-# CONFIG_SLICOSS is not set |
125 |
-# CONFIG_USBIP_CORE is not set |
126 |
-# CONFIG_W35UND is not set |
127 |
-# CONFIG_PRISM2_USB is not set |
128 |
-# CONFIG_ECHO is not set |
129 |
-# CONFIG_BRCMUTIL is not set |
130 |
-# CONFIG_BRCMSMAC is not set |
131 |
-# CONFIG_BRCMFMAC is not set |
132 |
-# CONFIG_COMEDI is not set |
133 |
-# CONFIG_ASUS_OLED is not set |
134 |
-# CONFIG_R8187SE is not set |
135 |
-# CONFIG_RTL8192U is not set |
136 |
-# CONFIG_RTL8192E is not set |
137 |
-# CONFIG_R8712U is not set |
138 |
-# CONFIG_RTS_PSTOR is not set |
139 |
-# CONFIG_TRANZPORT is not set |
140 |
-# CONFIG_POHMELFS is not set |
141 |
-# CONFIG_IDE_PHISON is not set |
142 |
-# CONFIG_LINE6_USB is not set |
143 |
-# CONFIG_VT6655 is not set |
144 |
-# CONFIG_VT6656 is not set |
145 |
-# CONFIG_HYPERV is not set |
146 |
-# CONFIG_VME_BUS is not set |
147 |
-# CONFIG_DX_SEP is not set |
148 |
-# CONFIG_IIO is not set |
149 |
-# CONFIG_CS5535_GPIO is not set |
150 |
-# CONFIG_XVMALLOC is not set |
151 |
-# CONFIG_ZRAM is not set |
152 |
-# CONFIG_WLAGS49_H2 is not set |
153 |
-# CONFIG_WLAGS49_H25 is not set |
154 |
-# CONFIG_FB_SM7XX is not set |
155 |
-# CONFIG_CRYSTALHD is not set |
156 |
-# CONFIG_CXT1E1 is not set |
157 |
-# CONFIG_FB_XGI is not set |
158 |
-# CONFIG_ACPI_QUICKSTART is not set |
159 |
-CONFIG_MACH_NO_WESTBRIDGE=y |
160 |
-# CONFIG_SBE_2T3E3 is not set |
161 |
-# CONFIG_ATH6K_LEGACY is not set |
162 |
-# CONFIG_USB_ENESTORAGE is not set |
163 |
-# CONFIG_BCM_WIMAX is not set |
164 |
-# CONFIG_FT1000 is not set |
165 |
- |
166 |
-# |
167 |
-# Speakup console speech |
168 |
-# |
169 |
-CONFIG_SPEAKUP=m |
170 |
-CONFIG_SPEAKUP_SYNTH_ACNTSA=m |
171 |
-CONFIG_SPEAKUP_SYNTH_ACNTPC=m |
172 |
-CONFIG_SPEAKUP_SYNTH_APOLLO=m |
173 |
-CONFIG_SPEAKUP_SYNTH_AUDPTR=m |
174 |
-CONFIG_SPEAKUP_SYNTH_BNS=m |
175 |
-CONFIG_SPEAKUP_SYNTH_DECTLK=m |
176 |
-CONFIG_SPEAKUP_SYNTH_DECEXT=m |
177 |
-CONFIG_SPEAKUP_SYNTH_DECPC=m |
178 |
-CONFIG_SPEAKUP_SYNTH_DTLK=m |
179 |
-CONFIG_SPEAKUP_SYNTH_KEYPC=m |
180 |
-CONFIG_SPEAKUP_SYNTH_LTLK=m |
181 |
-CONFIG_SPEAKUP_SYNTH_SOFT=m |
182 |
-CONFIG_SPEAKUP_SYNTH_SPKOUT=m |
183 |
-CONFIG_SPEAKUP_SYNTH_TXPRT=m |
184 |
-CONFIG_SPEAKUP_SYNTH_DUMMY=m |
185 |
-# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set |
186 |
- |
187 |
-# |
188 |
-# Altera FPGA firmware download module |
189 |
-# |
190 |
-# CONFIG_ALTERA_STAPL is not set |
191 |
-# CONFIG_INTEL_MEI is not set |
192 |
+# CONFIG_STAGING is not set |
193 |
+# CONFIG_MACH_NO_WESTBRIDGE is not set |
194 |
CONFIG_X86_PLATFORM_DEVICES=y |
195 |
CONFIG_ACER_WMI=m |
196 |
# CONFIG_ACERHDF is not set |
197 |
@@ -2658,6 +2595,7 @@ |
198 |
# |
199 |
# CONFIG_EDD is not set |
200 |
CONFIG_FIRMWARE_MEMMAP=y |
201 |
+CONFIG_EFI_VARS=m |
202 |
CONFIG_DELL_RBU=m |
203 |
CONFIG_DCDBAS=m |
204 |
CONFIG_DMIID=y |