Update admincd kernel specs. Drop staging drivers, sync amd65 and x86 config and set ISCSI_TCP to module so sys-block/open-iscsi builds.
svn path=/trunk/; revision=826
This commit is contained in:
parent
ccb9e0d843
commit
9b471d0642
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux/x86_64 3.0.3-hardened Kernel Configuration
|
||||
# Linux/x86_64 3.0.4-hardened-r4 Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
# CONFIG_X86_32 is not set
|
||||
|
@ -822,7 +822,7 @@ CONFIG_SCSI_SAS_HOST_SMP=y
|
|||
CONFIG_SCSI_SRP_ATTRS=m
|
||||
CONFIG_SCSI_SRP_TGT_ATTRS=y
|
||||
CONFIG_SCSI_LOWLEVEL=y
|
||||
CONFIG_ISCSI_TCP=y
|
||||
CONFIG_ISCSI_TCP=m
|
||||
CONFIG_ISCSI_BOOT_SYSFS=m
|
||||
CONFIG_SCSI_CXGB3_ISCSI=m
|
||||
CONFIG_SCSI_CXGB4_ISCSI=m
|
||||
|
@ -3023,7 +3023,6 @@ CONFIG_GRKERNSEC_RWXMAP_LOG=y
|
|||
#
|
||||
# Executable Protections
|
||||
#
|
||||
CONFIG_GRKERNSEC_EXECVE=y
|
||||
CONFIG_GRKERNSEC_DMESG=y
|
||||
CONFIG_GRKERNSEC_HARDEN_PTRACE=y
|
||||
# CONFIG_GRKERNSEC_TPE is not set
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux/i386 3.0.4-hardened-r2 Kernel Configuration
|
||||
# Linux/i386 3.0.4-hardened-r4 Kernel Configuration
|
||||
#
|
||||
# CONFIG_64BIT is not set
|
||||
CONFIG_X86_32=y
|
||||
|
@ -71,7 +71,7 @@ CONFIG_HAVE_KERNEL_LZO=y
|
|||
# CONFIG_KERNEL_LZMA is not set
|
||||
CONFIG_KERNEL_XZ=y
|
||||
# CONFIG_KERNEL_LZO is not set
|
||||
CONFIG_DEFAULT_HOSTNAME="4"
|
||||
CONFIG_DEFAULT_HOSTNAME=""
|
||||
CONFIG_SWAP=y
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_SYSVIPC_SYSCTL=y
|
||||
|
@ -377,6 +377,7 @@ CONFIG_MTRR=y
|
|||
# CONFIG_MTRR_SANITIZER is not set
|
||||
CONFIG_X86_PAT=y
|
||||
CONFIG_ARCH_USES_PG_UNCACHED=y
|
||||
CONFIG_EFI=y
|
||||
CONFIG_SECCOMP=y
|
||||
CONFIG_HZ_100=y
|
||||
# CONFIG_HZ_250 is not set
|
||||
|
@ -412,7 +413,7 @@ CONFIG_ACPI_DOCK=y
|
|||
CONFIG_ACPI_PROCESSOR=m
|
||||
# CONFIG_ACPI_IPMI is not set
|
||||
CONFIG_ACPI_HOTPLUG_CPU=y
|
||||
# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
|
||||
CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
|
||||
CONFIG_ACPI_THERMAL=m
|
||||
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
|
||||
# CONFIG_ACPI_CUSTOM_DSDT is not set
|
||||
|
@ -663,7 +664,8 @@ CONFIG_BT_HCIBT3C=m
|
|||
CONFIG_BT_HCIBLUECARD=m
|
||||
CONFIG_BT_HCIBTUART=m
|
||||
CONFIG_BT_HCIVHCI=m
|
||||
# CONFIG_BT_MRVL is not set
|
||||
CONFIG_BT_MRVL=m
|
||||
CONFIG_BT_MRVL_SDIO=m
|
||||
# CONFIG_AF_RXRPC is not set
|
||||
CONFIG_WIRELESS=y
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
|
@ -840,7 +842,7 @@ CONFIG_SCSI_SAS_HOST_SMP=y
|
|||
CONFIG_SCSI_SRP_ATTRS=m
|
||||
CONFIG_SCSI_SRP_TGT_ATTRS=y
|
||||
CONFIG_SCSI_LOWLEVEL=y
|
||||
CONFIG_ISCSI_TCP=y
|
||||
CONFIG_ISCSI_TCP=m
|
||||
CONFIG_ISCSI_BOOT_SYSFS=m
|
||||
CONFIG_SCSI_CXGB3_ISCSI=m
|
||||
CONFIG_SCSI_CXGB4_ISCSI=m
|
||||
|
@ -1371,7 +1373,9 @@ CONFIG_RTL8192C_COMMON=m
|
|||
CONFIG_WL1251=m
|
||||
# CONFIG_WL1251_SDIO is not set
|
||||
CONFIG_WL12XX_MENU=m
|
||||
# CONFIG_WL12XX is not set
|
||||
CONFIG_WL12XX=m
|
||||
# CONFIG_WL12XX_HT is not set
|
||||
# CONFIG_WL12XX_SDIO is not set
|
||||
CONFIG_ZD1211RW=m
|
||||
# CONFIG_ZD1211RW_DEBUG is not set
|
||||
CONFIG_MWIFIEX=m
|
||||
|
@ -1968,6 +1972,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
|
|||
# CONFIG_FB_VGA16 is not set
|
||||
# CONFIG_FB_UVESA is not set
|
||||
CONFIG_FB_VESA=y
|
||||
CONFIG_FB_EFI=y
|
||||
# CONFIG_FB_N411 is not set
|
||||
# CONFIG_FB_HGA is not set
|
||||
# CONFIG_FB_S1D13XXX is not set
|
||||
|
@ -2541,76 +2546,8 @@ CONFIG_UIO=m
|
|||
# CONFIG_UIO_SERCOS3 is not set
|
||||
# CONFIG_UIO_PCI_GENERIC is not set
|
||||
# CONFIG_UIO_NETX is not set
|
||||
CONFIG_STAGING=y
|
||||
# CONFIG_ET131X is not set
|
||||
# CONFIG_SLICOSS is not set
|
||||
# CONFIG_USBIP_CORE is not set
|
||||
# CONFIG_W35UND is not set
|
||||
# CONFIG_PRISM2_USB is not set
|
||||
# CONFIG_ECHO is not set
|
||||
# CONFIG_BRCMUTIL is not set
|
||||
# CONFIG_BRCMSMAC is not set
|
||||
# CONFIG_BRCMFMAC is not set
|
||||
# CONFIG_COMEDI is not set
|
||||
# CONFIG_ASUS_OLED is not set
|
||||
# CONFIG_R8187SE is not set
|
||||
# CONFIG_RTL8192U is not set
|
||||
# CONFIG_RTL8192E is not set
|
||||
# CONFIG_R8712U is not set
|
||||
# CONFIG_RTS_PSTOR is not set
|
||||
# CONFIG_TRANZPORT is not set
|
||||
# CONFIG_POHMELFS is not set
|
||||
# CONFIG_IDE_PHISON is not set
|
||||
# CONFIG_LINE6_USB is not set
|
||||
# CONFIG_VT6655 is not set
|
||||
# CONFIG_VT6656 is not set
|
||||
# CONFIG_HYPERV is not set
|
||||
# CONFIG_VME_BUS is not set
|
||||
# CONFIG_DX_SEP is not set
|
||||
# CONFIG_IIO is not set
|
||||
# CONFIG_CS5535_GPIO is not set
|
||||
# CONFIG_XVMALLOC is not set
|
||||
# CONFIG_ZRAM is not set
|
||||
# CONFIG_WLAGS49_H2 is not set
|
||||
# CONFIG_WLAGS49_H25 is not set
|
||||
# CONFIG_FB_SM7XX is not set
|
||||
# CONFIG_CRYSTALHD is not set
|
||||
# CONFIG_CXT1E1 is not set
|
||||
# CONFIG_FB_XGI is not set
|
||||
# CONFIG_ACPI_QUICKSTART is not set
|
||||
CONFIG_MACH_NO_WESTBRIDGE=y
|
||||
# CONFIG_SBE_2T3E3 is not set
|
||||
# CONFIG_ATH6K_LEGACY is not set
|
||||
# CONFIG_USB_ENESTORAGE is not set
|
||||
# CONFIG_BCM_WIMAX is not set
|
||||
# CONFIG_FT1000 is not set
|
||||
|
||||
#
|
||||
# Speakup console speech
|
||||
#
|
||||
CONFIG_SPEAKUP=m
|
||||
CONFIG_SPEAKUP_SYNTH_ACNTSA=m
|
||||
CONFIG_SPEAKUP_SYNTH_ACNTPC=m
|
||||
CONFIG_SPEAKUP_SYNTH_APOLLO=m
|
||||
CONFIG_SPEAKUP_SYNTH_AUDPTR=m
|
||||
CONFIG_SPEAKUP_SYNTH_BNS=m
|
||||
CONFIG_SPEAKUP_SYNTH_DECTLK=m
|
||||
CONFIG_SPEAKUP_SYNTH_DECEXT=m
|
||||
CONFIG_SPEAKUP_SYNTH_DECPC=m
|
||||
CONFIG_SPEAKUP_SYNTH_DTLK=m
|
||||
CONFIG_SPEAKUP_SYNTH_KEYPC=m
|
||||
CONFIG_SPEAKUP_SYNTH_LTLK=m
|
||||
CONFIG_SPEAKUP_SYNTH_SOFT=m
|
||||
CONFIG_SPEAKUP_SYNTH_SPKOUT=m
|
||||
CONFIG_SPEAKUP_SYNTH_TXPRT=m
|
||||
CONFIG_SPEAKUP_SYNTH_DUMMY=m
|
||||
# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
|
||||
|
||||
#
|
||||
# Altera FPGA firmware download module
|
||||
#
|
||||
# CONFIG_ALTERA_STAPL is not set
|
||||
# CONFIG_INTEL_MEI is not set
|
||||
# CONFIG_STAGING is not set
|
||||
# CONFIG_MACH_NO_WESTBRIDGE is not set
|
||||
CONFIG_X86_PLATFORM_DEVICES=y
|
||||
CONFIG_ACER_WMI=m
|
||||
# CONFIG_ACERHDF is not set
|
||||
|
@ -2658,6 +2595,7 @@ CONFIG_CLKSRC_I8253=y
|
|||
#
|
||||
# CONFIG_EDD is not set
|
||||
CONFIG_FIRMWARE_MEMMAP=y
|
||||
CONFIG_EFI_VARS=m
|
||||
CONFIG_DELL_RBU=m
|
||||
CONFIG_DCDBAS=m
|
||||
CONFIG_DMIID=y
|
||||
|
|
Loading…
Reference in a new issue