Jaunty config changes: Build in BLK ata, dev_dm, dev_loop, dev_md, dev_sd, dev_sr

[Tim Gardner]

>From ce1f87689272d9946366bd0af0c8fb24deb3b4a8 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner at canonical.com>
Date: Sun, 21 Dec 2008 16:43:43 -0700
Subject: [PATCH] UBUNTU: Build in ata,dev_dm,dev_loop,dev_md,dev_sd,dev_sr

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian/config/amd64/config              |   17 +++++++++--------
 debian/config/i386/config               |   17 +++++++++--------
 debian/d-i/modules/md-modules           |    2 --
 debian/d-i/modules/storage-core-modules |    6 ------
 4 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index d31ee2c..aab5b7b 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -128,7 +128,7 @@ CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
 CONFIG_AT24=m
-CONFIG_ATA=m
+CONFIG_ATA=y
 CONFIG_ATALK=m
 CONFIG_ATARI_PARTITION=y
 CONFIG_ATA_ACPI=y
@@ -269,7 +269,7 @@ CONFIG_BLK_DEV_COMPCACHE=m
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_DM_BBR=m
 CONFIG_BLK_DEV_DRBD=m
 CONFIG_BLK_DEV_FD=m
@@ -277,14 +277,14 @@ CONFIG_BLK_DEV_FD=m
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_MD=m
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_MD=y
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=65536
-CONFIG_BLK_DEV_SD=m
-CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=y
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_UB=m
@@ -451,7 +451,7 @@ CONFIG_CRC32=y
 CONFIG_CRC7=m
 CONFIG_CRC_CCITT=m
 CONFIG_CRC_ITU_T=m
-CONFIG_CRC_T10DIF=m
+CONFIG_CRC_T10DIF=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AEAD2=y
@@ -1682,6 +1682,7 @@ CONFIG_MCS_FIR=m
 # CONFIG_MCYRIXIII is not set
 CONFIG_MD=y
 CONFIG_MDIO_BITBANG=m
+CONFIG_MD_AUTODETECT=y
 CONFIG_MD_FAULTY=m
 CONFIG_MD_LINEAR=m
 CONFIG_MD_MULTIPATH=m
@@ -2535,7 +2536,7 @@ CONFIG_SCHED_HRTICK=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
 # CONFIG_SCHED_TRACER is not set
-CONFIG_SCSI=m
+CONFIG_SCSI=y
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_AACRAID=m
 CONFIG_SCSI_ACARD=m
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 4a17556..fcd74ac 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -145,7 +145,7 @@ CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
 CONFIG_AT1700=m
 CONFIG_AT24=m
-CONFIG_ATA=m
+CONFIG_ATA=y
 CONFIG_ATALK=m
 CONFIG_ATARI_PARTITION=y
 CONFIG_ATA_ACPI=y
@@ -292,7 +292,7 @@ CONFIG_BLK_DEV_COMPCACHE=m
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_DM_BBR=m
 CONFIG_BLK_DEV_DRBD=m
 CONFIG_BLK_DEV_FD=m
@@ -300,14 +300,14 @@ CONFIG_BLK_DEV_FD=m
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_MD=m
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_MD=y
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=65536
-CONFIG_BLK_DEV_SD=m
-CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=y
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_UB=m
@@ -475,7 +475,7 @@ CONFIG_CRC32=y
 CONFIG_CRC7=m
 CONFIG_CRC_CCITT=m
 CONFIG_CRC_ITU_T=m
-CONFIG_CRC_T10DIF=m
+CONFIG_CRC_T10DIF=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AEAD2=y
@@ -1775,6 +1775,7 @@ CONFIG_MCS_FIR=m
 CONFIG_MD=y
 CONFIG_MDA_CONSOLE=m
 CONFIG_MDIO_BITBANG=m
+CONFIG_MD_AUTODETECT=y
 CONFIG_MD_FAULTY=m
 CONFIG_MD_LINEAR=m
 CONFIG_MD_MULTIPATH=m
@@ -2684,7 +2685,7 @@ CONFIG_SCHED_MC=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_SCHED_SMT=y
 # CONFIG_SCHED_TRACER is not set
-CONFIG_SCSI=m
+CONFIG_SCSI=y
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_7000FASST=m
 CONFIG_SCSI_AACRAID=m
diff --git a/debian/d-i/modules/md-modules b/debian/d-i/modules/md-modules
index b0786a3..449e8a4 100644
--- a/debian/d-i/modules/md-modules
+++ b/debian/d-i/modules/md-modules
@@ -1,14 +1,12 @@
 dm-crypt
 dm-log
 dm-mirror
-dm-mod
 dm-multipath
 dm-round-robin
 dm-snapshot
 dm-zero
 faulty
 linear
-md-mod
 multipath
 raid0
 raid1
diff --git a/debian/d-i/modules/storage-core-modules b/debian/d-i/modules/storage-core-modules
index f52063d..7570921 100644
--- a/debian/d-i/modules/storage-core-modules
+++ b/debian/d-i/modules/storage-core-modules
@@ -1,16 +1,10 @@
 # Core stacks
-libata
-scsi_mod
 usbcore
 usb-storage
 
 # Block level
-cdrom
-sd_mod
-sr_mod
 
 # Loop modules
-loop
 cryptoloop
 
 # Needs to be here for better cdrom initrd layout
-- 
1.5.6.3