SOURCES: kernel-desktop-common.config - convert to multiarch format

glen glen at pld-linux.org
Sat Mar 1 14:36:24 CET 2008


Author: glen                         Date: Sat Mar  1 13:36:24 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- convert to multiarch format

---- Files affected:
SOURCES:
   kernel-desktop-common.config (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-common.config
diff -u SOURCES/kernel-desktop-common.config:1.32 SOURCES/kernel-desktop-common.config:1.33
--- SOURCES/kernel-desktop-common.config:1.32	Fri Feb 29 16:50:10 2008
+++ SOURCES/kernel-desktop-common.config	Sat Mar  1 14:36:19 2008
@@ -2,482 +2,482 @@
 #
 # Code maturity level options
 #
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
+EXPERIMENTAL all=y
+BROKEN_ON_SMP all=y
+LOCK_KERNEL all=y
+INIT_ENV_ARG_LIMIT all=32
 
 #
 # General setup
 #
 # CONFIG_LOCALVERSION will be added
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
-CONFIG_POSIX_MQUEUE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
+LOCALVERSION_AUTO all=n
+SWAP all=y
+SYSVIPC all=y
+IPC_NS all=n
+POSIX_MQUEUE all=y
+BSD_PROCESS_ACCT all=y
+BSD_PROCESS_ACCT_V3 all=y
 # 
 # Per task I/O stats
 #
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-
-# CONFIG_UTS_NS is not set
-CONFIG_SYSCTL=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_CPUSETS=y
-CONFIG_RELAY=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_EXTRA_PASS=y
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SHMEM=y
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
+TASKSTATS all=y
+TASK_DELAY_ACCT all=y
+TASK_XACCT all=y
+TASK_IO_ACCOUNTING all=y
+
+UTS_NS all=n
+SYSCTL all=y
+AUDIT all=y
+AUDITSYSCALL all=y
+IKCONFIG all=y
+IKPROC all=y
+SYSFS_DEPRECATED all=y
+CPUSETS all=y
+RELAY all=y
+INITRAMFS_SOURCE all=""
+UID16 all=y
+CC_OPTIMIZE_FOR_SIZE all=n
+EMBEDDED all=n
+KALLSYMS all=y
+KALLSYMS_ALL all=y
+KALLSYMS_EXTRA_PASS all=y
+HOTPLUG all=y
+PRINTK all=y
+BUG all=y
+ELF_CORE all=y
+BASE_FULL all=y
+FUTEX all=y
+EPOLL all=y
+SHMEM all=y
+SLAB all=n
+SLUB all=y
+SLOB all=n
+TINY_SHMEM all=n
+BASE_SMALL all=0
 
 #
 # Loadable module support
 #
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
-CONFIG_STOP_MACHINE=y
+MODULES all=y
+MODULE_UNLOAD all=y
+MODULE_FORCE_UNLOAD all=y
+MODVERSIONS all=n
+MODULE_SRCVERSION_ALL all=n
+KMOD all=y
+STOP_MACHINE all=y
 
 #
 # Block layer
 #
-CONFIG_LBD=y
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_LSF=y
+LBD all=y
+BLK_DEV_IO_TRACE all=y
+LSF all=y
 
 #
 # IO Schedulers
 #
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
+IOSCHED_NOOP all=y
+IOSCHED_AS all=y
+IOSCHED_DEADLINE all=y
+IOSCHED_CFQ all=y
 
 #
 # Default I/O scheduler
 #
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
+DEFAULT_AS all=n
+DEFAULT_DEADLINE all=n
+DEFAULT_CFQ all=y
+DEFAULT_NOOP all=n
+DEFAULT_IOSCHED all="cfq"
 
 #
 # RCU implementation type:
 #
-CONFIG_SELECT_MEMORY_MODEL=y
+SELECT_MEMORY_MODEL all=y
 
 #
 # Memory model
 #
-# CONFIG_FLATMEM_MANUAL is not set
-# CONFIG_RESOURCES_64BIT is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_MIGRATION=y
+FLATMEM_MANUAL all=n
+RESOURCES_64BIT all=n
+DISCONTIGMEM_MANUAL all=n
+SPARSEMEM_MANUAL all=n
+FLATMEM all=y
+FLAT_NODE_MEM_MAP all=y
+NEED_MULTIPLE_NODES all=y
+SPARSEMEM_STATIC all=n
+SPLIT_PTLOCK_CPUS all=4
+MIGRATION all=y
 
 #
 # Power management options
 #
-CONFIG_PM=y
-CONFIG_PM_LEGACY=y
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
+PM all=y
+PM_LEGACY all=y
+PM_DEBUG all=n
+PM_SYSFS_DEPRECATED all=n
 
 #
 # Bus options (PCI etc.)
 #
-CONFIG_PCI_MSI=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_HT_IRQ=y
-
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
-# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
+PCI_MSI all=y
+PCI_DEBUG all=n
+HT_IRQ all=y
+
+PCIEPORTBUS all=y
+HOTPLUG_PCI_PCIE all=m
+HOTPLUG_PCI_PCIE_POLL_EVENT_MODE all=n
 
 #
 # PCCARD (PCMCIA/CardBus) support
 #
-CONFIG_PCCARD=m
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-# CONFIG_PCMCIA_IOCTL is not set
-CONFIG_CARDBUS=y
+PCCARD all=m
+PCMCIA_DEBUG all=n
+PCMCIA all=m
+PCMCIA_LOAD_CIS all=y
+PCMCIA_IOCTL all=n
+CARDBUS all=y
 
 #
 # PC-card bridges
 #
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_I82365=m
-CONFIG_TCIC=m
-CONFIG_PCMCIA_PROBE=y
-CONFIG_PCCARD_NONSTATIC=m
+YENTA all=m
+YENTA_O2 all=y
+YENTA_RICOH all=y
+YENTA_TI all=y
+YENTA_ENE_TUNE all=y
+YENTA_TOSHIBA all=y
+PD6729 all=m
+I82092 all=m
+I82365 all=m
+TCIC all=m
+PCMCIA_PROBE all=y
+PCCARD_NONSTATIC all=m
 
 #
 # PCI Hotplug Support
 #
-CONFIG_HOTPLUG_PCI=m
-CONFIG_HOTPLUG_PCI_FAKE=m
-CONFIG_HOTPLUG_PCI_COMPAQ=m
-CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
-CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_SHPC=m
+HOTPLUG_PCI all=m
+HOTPLUG_PCI_FAKE all=m
+HOTPLUG_PCI_COMPAQ all=m
+HOTPLUG_PCI_COMPAQ_NVRAM all=y
+HOTPLUG_PCI_IBM all=m
+HOTPLUG_PCI_ACPI all=m
+HOTPLUG_PCI_ACPI_IBM all=m
+HOTPLUG_PCI_CPCI all=y
+HOTPLUG_PCI_CPCI_ZT5550 all=m
+HOTPLUG_PCI_CPCI_GENERIC all=m
+HOTPLUG_PCI_SHPC all=m
 
 #
 # Executable file formats / Emulations
 #
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_AOUT=m
-CONFIG_BINFMT_MISC=m
+BINFMT_ELF all=y
+BINFMT_AOUT all=m
+BINFMT_MISC all=m
 
 #
 # Networking
 #
-CONFIG_NET=y
+NET all=y
 
 #
 # Networking options
 #
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
-CONFIG_XFRM_SUB_POLICY=y
-CONFIG_XFRM_MIGRATE=n
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_RING=m
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
-CONFIG_IP_ROUTE_MULTIPATH_RR=m
-CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m
-CONFIG_IP_ROUTE_MULTIPATH_WRANDOM=m
-CONFIG_IP_ROUTE_MULTIPATH_DRR=m
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
-CONFIG_TCP_CONG_ADVANCED=y
+AF_RXRPC all=m
+AF_RXRPC_DEBUG all=n
+RXKAD all=m
+PACKET all=y
+PACKET_MMAP all=y
+UNIX all=y
+XFRM all=y
+XFRM_USER all=m
+XFRM_SUB_POLICY all=y
+XFRM_MIGRATE all=n
+NET_KEY all=m
+NET_KEY_MIGRATE all=n
+RING all=m
+INET all=y
+IP_MULTICAST all=y
+IP_ADVANCED_ROUTER all=y
+ASK_IP_FIB_HASH all=y
+IP_FIB_TRIE all=n
+IP_FIB_HASH all=y
+IP_MULTIPLE_TABLES all=y
+IP_ROUTE_MULTIPATH all=y
+IP_ROUTE_MULTIPATH_CACHED all=y
+IP_ROUTE_MULTIPATH_RR all=m
+IP_ROUTE_MULTIPATH_RANDOM all=m
+IP_ROUTE_MULTIPATH_WRANDOM all=m
+IP_ROUTE_MULTIPATH_DRR all=m
+IP_ROUTE_VERBOSE all=y
+IP_PNP all=y
+IP_PNP_DHCP all=y
+IP_PNP_BOOTP all=y
+IP_PNP_RARP all=y
+NET_IPIP all=m
+NET_IPGRE all=m
+NET_IPGRE_BROADCAST all=y
+IP_MROUTE all=y
+IP_PIMSM_V1 all=y
+IP_PIMSM_V2 all=y
+ARPD all=n
+SYN_COOKIES all=y
+INET_AH all=m
+INET_ESP all=m
+INET_IPCOMP all=m
+INET_XFRM_MODE_TRANSPORT all=m
+INET_XFRM_MODE_TUNNEL all=m
+INET_XFRM_MODE_BEET all=m
+INET_XFRM_TUNNEL all=m
+INET_TUNNEL all=m
+INET_DIAG all=m
+INET_TCP_DIAG all=m
+TCP_CONG_ADVANCED all=y
 
 #
 # TCP congestion control
 #
-CONFIG_TCP_CONG_BIC=y
-CONFIG_TCP_CONG_CUBIC=m
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-CONFIG_DEFAULT_BIC=y
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_TCP_MD5SIG=y
+TCP_CONG_BIC all=y
+TCP_CONG_CUBIC all=m
+TCP_CONG_WESTWOOD all=m
+TCP_CONG_HTCP all=m
+TCP_CONG_HSTCP all=m
+TCP_CONG_HYBLA all=m
+TCP_CONG_VEGAS all=m
+TCP_CONG_SCALABLE all=m
+TCP_CONG_LP all=m
+TCP_CONG_VENO all=m
+TCP_CONG_YEAH all=m
+TCP_CONG_ILLINOIS all=m
+DEFAULT_BIC all=y
+DEFAULT_RENO all=n
+TCP_MD5SIG all=y
 
 #
 # IP: Virtual Server Configuration
 #
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
+IP_VS all=m
+IP_VS_DEBUG all=n
+IP_VS_TAB_BITS all=12
 
 #
 # IPVS transport protocol load balancing support
 #
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
+IP_VS_PROTO_TCP all=y
+IP_VS_PROTO_UDP all=y
+IP_VS_PROTO_ESP all=y
+IP_VS_PROTO_AH all=y
 
 #
 # IPVS scheduler
 #
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
+IP_VS_RR all=m
+IP_VS_WRR all=m
+IP_VS_LC all=m
+IP_VS_WLC all=m
+IP_VS_LBLC all=m
+IP_VS_LBLCR all=m
+IP_VS_DH all=m
+IP_VS_SH all=m
+IP_VS_SED all=m
+IP_VS_NQ all=m
 
 #
 # IPVS application helper
 #
-CONFIG_IP_VS_FTP=m
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=y
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_NETLABEL=y
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_TUNNEL=m
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
+IP_VS_FTP all=m
+IPV6 all=m
+IPV6_PRIVACY all=y
+IPV6_ROUTER_PREF all=n
+IPV6_OPTIMISTIC_DAD all=n
+INET6_AH all=m
+INET6_ESP all=m
+INET6_IPCOMP all=m
+IPV6_MIP6 all=y
+INET6_XFRM_MODE_TRANSPORT all=m
+INET6_XFRM_MODE_TUNNEL all=m
+INET6_XFRM_MODE_BEET all=m
+INET6_XFRM_MODE_ROUTEOPTIMIZATION all=m
+IPV6_SIT all=m
+IPV6_MULTIPLE_TABLES all=n
+INET6_XFRM_TUNNEL all=m
+NETLABEL all=y
+INET6_TUNNEL all=m
+IPV6_TUNNEL all=m
+NETFILTER all=y
+NETFILTER_DEBUG all=n
+BRIDGE_NETFILTER all=y
 
 #
 # DCCP Configuration (EXPERIMENTAL)
 #
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-CONFIG_IP_DCCP_ACKVEC=y
+IP_DCCP all=m
+INET_DCCP_DIAG all=m
+IP_DCCP_ACKVEC all=y
 
 #
 # DCCP CCIDs Configuration (EXPERIMENTAL)
 #
-CONFIG_IP_DCCP_CCID2=m
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=m
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_CCID3_RTO=100
-CONFIG_IP_DCCP_TFRC_LIB=m
-# CONFIG_IP_DCCP_DEBUG is not set
+IP_DCCP_CCID2 all=m
+IP_DCCP_CCID2_DEBUG all=n
+IP_DCCP_CCID3 all=m
+IP_DCCP_CCID3_DEBUG all=n
+IP_DCCP_CCID3_RTO all=100
+IP_DCCP_TFRC_LIB all=m
+IP_DCCP_DEBUG all=n
 
 #
 # SCTP Configuration (EXPERIMENTAL)
 #
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
-# CONFIG_SCTP_DBG_OBJCNT is not set
+IP_SCTP all=m
+SCTP_DBG_MSG all=n
+SCTP_DBG_OBJCNT all=n
 
 #
 # SCTP: Cookie HMAC Algorithm
 #
-# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
+SCTP_HMAC_NONE all=n
+SCTP_HMAC_SHA1 all=n
+SCTP_HMAC_MD5 all=y
 
 #
 # TIPC Configuration (EXPERIMENTAL)
 #
-CONFIG_TIPC=m
-# CONFIG_TIPC_ADVANCED is not set
-# CONFIG_TIPC_DEBUG is not set
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-CONFIG_ATM_CLIP_NO_ICMP=y
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-common.config?r1=1.32&r2=1.33&f=u



More information about the pld-cvs-commit mailing list