[kernel] r14979 - in dists/trunk/linux-2.6/debian: . config/i386 config/i386/none

Fri Jan 22 01:51:33 UTC 2010

Author: benh
Date: Fri Jan 22 01:51:30 2010
New Revision: 14979

Log:
Use i386 flavour configuration files regardless of the featureset

Added:
   dists/trunk/linux-2.6/debian/config/i386/config.486
      - copied unchanged from r14978, dists/trunk/linux-2.6/debian/config/i386/none/config.486
   dists/trunk/linux-2.6/debian/config/i386/config.686
      - copied unchanged from r14978, dists/trunk/linux-2.6/debian/config/i386/none/config.686
   dists/trunk/linux-2.6/debian/config/i386/config.686-bigmem
      - copied unchanged from r14978, dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem
Deleted:
   dists/trunk/linux-2.6/debian/config/i386/none/config.486
   dists/trunk/linux-2.6/debian/config/i386/none/config.686
   dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/i386/defines

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================

--- dists/trunk/linux-2.6/debian/changelog	Thu Jan 21 17:07:48 2010	(r14978)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Jan 22 01:51:30 2010	(r14979)
@@ -33,6 +33,8 @@
     (CVE-2009-3939)
   * e1000,e1000e: Discard all fragments of received over-length packets
     (CVE-2009-4536, CVE-2009-4538)
+  * Enable the '686' configuration options in '686-vserver' packages and
+    the '686-bigmem' configuration options in '686-bigmem-vserver' packages
 
   [ Ian Campbell ]
   * xen: Enable up to 32G of guest memory on i386.

Copied: dists/trunk/linux-2.6/debian/config/i386/config.486 (from r14978, dists/trunk/linux-2.6/debian/config/i386/none/config.486)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/config/i386/config.486	Fri Jan 22 01:51:30 2010	(r14979, copy of r14978, dists/trunk/linux-2.6/debian/config/i386/none/config.486)
@@ -0,0 +1,123 @@
+##
+## file: arch/x86/Kconfig
+##
+# CONFIG_SMP is not set
+CONFIG_X86_UP_APIC=y
+CONFIG_X86_UP_IOAPIC=y
+# CONFIG_X86_MCE is not set
+CONFIG_MATH_EMULATION=y
+CONFIG_EISA=y
+CONFIG_MCA=y
+CONFIG_OLPC=y
+
+##
+## file: arch/x86/Kconfig.cpu
+##
+## choice: Processor family
+CONFIG_M486=y
+# CONFIG_M686 is not set
+## end choice
+
+##
+## file: drivers/char/Kconfig
+##
+CONFIG_DIGIEPCA=m
+CONFIG_MOXA_INTELLIO=m
+CONFIG_RIO=m
+CONFIG_RIO_OLDPCI=y
+CONFIG_STALLION=m
+CONFIG_ISTALLION=m
+
+##
+## file: drivers/eisa/Kconfig
+##
+CONFIG_EISA_VLB_PRIMING=y
+CONFIG_EISA_PCI_EISA=y
+CONFIG_EISA_VIRTUAL_ROOT=y
+CONFIG_EISA_NAMES=y
+
+##
+## file: drivers/i2c/busses/Kconfig
+##
+CONFIG_I2C_ELEKTOR=m
+CONFIG_I2C_STUB=m
+
+##
+## file: drivers/input/mouse/Kconfig
+##
+CONFIG_MOUSE_PS2_OLPC=y
+
+##
+## file: drivers/isdn/i4l/Kconfig
+##
+CONFIG_ISDN_DRV_LOOP=m
+
+##
+## file: drivers/mca/Kconfig
+##
+CONFIG_MCA_LEGACY=y
+# CONFIG_MCA_PROC_FS is not set
+
+##
+## file: drivers/media/video/Kconfig
+##
+CONFIG_USB_W9968CF=m
+
+##
+## file: drivers/mtd/chips/Kconfig
+##
+# CONFIG_MTD_XIP is not set
+
+##
+## file: drivers/net/Kconfig
+##
+CONFIG_ELMC=m
+CONFIG_ELMC_II=m
+CONFIG_ULTRAMCA=m
+CONFIG_ULTRA32=m
+CONFIG_NI5010=m
+CONFIG_NE2_MCA=m
+CONFIG_IBMLANA=m
+CONFIG_LNE390=m
+CONFIG_NE3210=m
+CONFIG_ES3210=m
+
+##
+## file: drivers/net/hamradio/Kconfig
+##
+CONFIG_DMASCC=m
+
+##
+## file: drivers/net/tokenring/Kconfig
+##
+CONFIG_MADGEMC=m
+
+##
+## file: drivers/pci/hotplug/Kconfig
+##
+CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
+
+##
+## file: drivers/power/Kconfig
+##
+CONFIG_BATTERY_OLPC=m
+
+##
+## file: drivers/scsi/Kconfig
+##
+CONFIG_SCSI_FD_MCS=m
+CONFIG_SCSI_IBMMCA=m
+CONFIG_IBMMCA_SCSI_ORDER_STANDARD=y
+# CONFIG_IBMMCA_SCSI_DEV_RESET is not set
+CONFIG_SCSI_NCR_D700=m
+CONFIG_SCSI_NCR_Q720=m
+CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
+CONFIG_SCSI_NCR53C8XX_MAX_TAGS=4
+CONFIG_SCSI_NCR53C8XX_SYNC=5
+CONFIG_SCSI_SIM710=m
+
+##
+## file: drivers/video/geode/Kconfig
+##
+CONFIG_FB_GEODE_LX=y
+

Copied: dists/trunk/linux-2.6/debian/config/i386/config.686 (from r14978, dists/trunk/linux-2.6/debian/config/i386/none/config.686)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/config/i386/config.686	Fri Jan 22 01:51:30 2010	(r14979, copy of r14978, dists/trunk/linux-2.6/debian/config/i386/none/config.686)
@@ -0,0 +1,58 @@
+##
+## file: arch/x86/Kconfig
+##
+# CONFIG_MATH_EMULATION is not set
+# CONFIG_EISA is not set
+# CONFIG_MCA is not set
+
+##
+## file: arch/x86/Kconfig.cpu
+##
+## choice: Processor family
+# CONFIG_M486 is not set
+CONFIG_M686=y
+## end choice
+
+##
+## file: drivers/char/Kconfig
+##
+# CONFIG_DIGIEPCA is not set
+# CONFIG_MOXA_INTELLIO is not set
+# CONFIG_RIO is not set
+
+##
+## file: drivers/i2c/busses/Kconfig
+##
+# CONFIG_I2C_ELEKTOR is not set
+CONFIG_I2C_STUB=m
+
+##
+## file: drivers/isdn/i4l/Kconfig
+##
+# CONFIG_ISDN_DRV_LOOP is not set
+
+##
+## file: drivers/media/video/Kconfig
+##
+# CONFIG_USB_W9968CF is not set
+
+##
+## file: drivers/net/Kconfig
+##
+# CONFIG_NI5010 is not set
+
+##
+## file: drivers/net/hamradio/Kconfig
+##
+# CONFIG_DMASCC is not set
+
+##
+## file: drivers/pci/hotplug/Kconfig
+##
+# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
+
+##
+## file: lib/Kconfig.debug
+##
+# CONFIG_DEBUG_HIGHMEM is not set
+

Copied: dists/trunk/linux-2.6/debian/config/i386/config.686-bigmem (from r14978, dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/config/i386/config.686-bigmem	Fri Jan 22 01:51:30 2010	(r14979, copy of r14978, dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem)
@@ -0,0 +1,65 @@
+##
+## file: arch/x86/Kconfig
+##
+## choice: High Memory Support
+# CONFIG_NOHIGHMEM is not set
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
+## end choice
+CONFIG_X86_PAE=y
+# CONFIG_MATH_EMULATION is not set
+# CONFIG_EISA is not set
+# CONFIG_MCA is not set
+
+##
+## file: arch/x86/Kconfig.cpu
+##
+## choice: Processor family
+# CONFIG_M486 is not set
+CONFIG_M686=y
+## end choice
+
+##
+## file: drivers/char/Kconfig
+##
+# CONFIG_DIGIEPCA is not set
+# CONFIG_MOXA_INTELLIO is not set
+# CONFIG_SX is not set
+# CONFIG_RIO is not set
+
+##
+## file: drivers/i2c/busses/Kconfig
+##
+# CONFIG_I2C_ELEKTOR is not set
+CONFIG_I2C_STUB=m
+
+##
+## file: drivers/isdn/i4l/Kconfig
+##
+# CONFIG_ISDN_DRV_LOOP is not set
+
+##
+## file: drivers/media/video/Kconfig
+##
+# CONFIG_USB_W9968CF is not set
+
+##
+## file: drivers/net/Kconfig
+##
+# CONFIG_NI5010 is not set
+
+##
+## file: drivers/net/hamradio/Kconfig
+##
+# CONFIG_DMASCC is not set
+
+##
+## file: drivers/pci/hotplug/Kconfig
+##
+# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
+
+##
+## file: lib/Kconfig.debug
+##
+# CONFIG_DEBUG_HIGHMEM is not set
+

Modified: dists/trunk/linux-2.6/debian/config/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/defines	Thu Jan 21 17:07:48 2010	(r14978)
+++ dists/trunk/linux-2.6/debian/config/i386/defines	Fri Jan 22 01:51:30 2010	(r14979)
@@ -22,6 +22,7 @@
 [486_image]
 configs:
  kernelarch-x86/config-arch-32
+ i386/config.486
 
 [686_description]
 hardware: modern PCs
@@ -30,6 +31,7 @@
 [686_image]
 configs:
  kernelarch-x86/config-arch-32
+ i386/config.686
 recommends: libc6-i686
 
 [686-bigmem_description]
@@ -40,6 +42,7 @@
 [686-bigmem_image]
 configs:
  kernelarch-x86/config-arch-32
+ i386/config.686-bigmem
 recommends: libc6-i686
 
 [amd64_description]

