Jaunty config changes: Build in CDROM_PKTCDVD and CHR_DEV_SG

[Tim Gardner]

Andy Whitcroft wrote:
> On Mon, Dec 22, 2008 at 09:03:21AM -0700, Tim Gardner wrote:
>> From 1b94d6a16de6a242e6af6144b9e4ad617d285ade Mon Sep 17 00:00:00 2001
>> From: Tim Gardner <tim.gardner at canonical.com>
>> Date: Mon, 22 Dec 2008 16:01:08 +0000
>> Subject: [PATCH] UBUNTU: Build in CDROM_PKTCDVD and CHR_DEV_SG
>>
>> Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
>> ---
>>  debian/config/amd64/config       |    4 ++--
>>  debian/config/i386/config        |    4 ++--
>>  debian/d-i/modules/block-modules |    1 -
>>  3 files changed, 4 insertions(+), 5 deletions(-)
>>
>> diff --git a/debian/config/amd64/config b/debian/config/amd64/config
>> index add6bdf..da7c95d 100644
>> --- a/debian/config/amd64/config
>> +++ b/debian/config/amd64/config
>> @@ -369,7 +369,7 @@ CONFIG_CARDMAN_4040=m
>>  # CONFIG_CARMINE_DRAM_CUSTOM is not set
>>  CONFIG_CASSINI=m
>>  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
>> -CONFIG_CDROM_PKTCDVD=m
>> +CONFIG_CDROM_PKTCDVD=y
>>  CONFIG_CDROM_PKTCDVD_BUFFERS=8
>>  # CONFIG_CDROM_PKTCDVD_WCACHE is not set
>>  CONFIG_CFAG12864B=m
>> @@ -389,7 +389,7 @@ CONFIG_CHELSIO_T1_1G=y
>>  CONFIG_CHELSIO_T3=m
>>  CONFIG_CHR_DEV_OSST=m
>>  CONFIG_CHR_DEV_SCH=m
>> -CONFIG_CHR_DEV_SG=m
>> +CONFIG_CHR_DEV_SG=y
>>  CONFIG_CHR_DEV_ST=m
>>  CONFIG_CICADA_PHY=m
>>  CONFIG_CIFS=m
>> diff --git a/debian/config/i386/config b/debian/config/i386/config
>> index c574c6c..fbaa9be 100644
>> --- a/debian/config/i386/config
>> +++ b/debian/config/i386/config
>> @@ -391,7 +391,7 @@ CONFIG_CARDMAN_4040=m
>>  # CONFIG_CARMINE_DRAM_CUSTOM is not set
>>  CONFIG_CASSINI=m
>>  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
>> -CONFIG_CDROM_PKTCDVD=m
>> +CONFIG_CDROM_PKTCDVD=y
>>  CONFIG_CDROM_PKTCDVD_BUFFERS=8
>>  # CONFIG_CDROM_PKTCDVD_WCACHE is not set
>>  CONFIG_CFAG12864B=m
>> @@ -411,7 +411,7 @@ CONFIG_CHELSIO_T1_1G=y
>>  CONFIG_CHELSIO_T3=m
>>  CONFIG_CHR_DEV_OSST=m
>>  CONFIG_CHR_DEV_SCH=m
>> -CONFIG_CHR_DEV_SG=m
>> +CONFIG_CHR_DEV_SG=y
>>  CONFIG_CHR_DEV_ST=m
>>  CONFIG_CICADA_PHY=m
>>  CONFIG_CIFS=m
>> diff --git a/debian/d-i/modules/block-modules b/debian/d-i/modules/block-modules
>> index 9be4b97..2fe4bc3 100644
>> --- a/debian/d-i/modules/block-modules
>> +++ b/debian/d-i/modules/block-modules
>> @@ -23,7 +23,6 @@ pcd
>>  pd
>>  pf
>>  pg
>> -pktcdvd
>>  pt
>>  sx8
>>  ub
> 
> I am supprised we didn't need sg in the installer.  Otherwise this looks
> sane.
> 
> -apw
> 

Isn't CHR_DEV_SG just for eject and other non-blockdev controls?

-- 
Tim Gardner tim.gardner at canonical.com