diff mbox

Lucid pull request, LP494565

Message ID 4B58918C.7010701@canonical.com
State Changes Requested
Delegated to: Andy Whitcroft
Headers show

Commit Message

Tim Gardner Jan. 21, 2010, 5:40 p.m. UTC 
John,

Can you work with Scott to make this really solves the initramfs issue?

rtg

Comments

John Johansen Jan. 21, 2010, 7:13 p.m. UTC | #1 
Tim Gardner wrote:
> John,
> 
> Can you work with Scott to make this really solves the initramfs issue?
> 
Indeed, we had kernels built yesterday, with essentially the same patch and
the issue has been on determining whether should go into -server and -pae
or whether we will need another flavour.

john
Tim Gardner Jan. 21, 2010, 7:47 p.m. UTC | #2 
John Johansen wrote:
> Tim Gardner wrote:
>> John,
>>
>> Can you work with Scott to make this really solves the initramfs issue?
>>
> Indeed, we had kernels built yesterday, with essentially the same patch and
> the issue has been on determining whether should go into -server and -pae
> or whether we will need another flavour.
> 
> john

-pae ? I thought this bug was all about the virtual flavour.
John Johansen Jan. 21, 2010, 7:53 p.m. UTC | #3 
Tim Gardner wrote:
> John Johansen wrote:
>> Tim Gardner wrote:
>>> John,
>>>
>>> Can you work with Scott to make this really solves the initramfs issue?
>>>
>> Indeed, we had kernels built yesterday, with essentially the same patch and
>> the issue has been on determining whether should go into -server and -pae
>> or whether we will need another flavour.
>>
>> john
> 
> -pae ? I thought this bug was all about the virtual flavour.
> 
right this is all about -virtual subflavor which is a sub of -server on 64bit and
generic-pae for 32 bit.
Scott Moser Jan. 21, 2010, 7:55 p.m. UTC | #4 
On Thu, 21 Jan 2010, Tim Gardner wrote:

> John Johansen wrote:
> > Tim Gardner wrote:
> >> John,
> >>
> >> Can you work with Scott to make this really solves the initramfs issue?
> >>
> > Indeed, we had kernels built yesterday, with essentially the same patch and
> > the issue has been on determining whether should go into -server and -pae
> > or whether we will need another flavour.
> >
> > john
>
> -pae ? I thought this bug was all about the virtual flavour.

Unless I'm mistaken
   on amd64, -virtual is subflavour of -server
   on i386, -virtual is subflavour of -generic-pae
Tim Gardner Jan. 22, 2010, 1:07 p.m. UTC | #5 
Scott Moser wrote:
> On Thu, 21 Jan 2010, Tim Gardner wrote:
> 
>> John Johansen wrote:
>>> Tim Gardner wrote:
>>>> John,
>>>>
>>>> Can you work with Scott to make this really solves the initramfs issue?
>>>>
>>> Indeed, we had kernels built yesterday, with essentially the same patch and
>>> the issue has been on determining whether should go into -server and -pae
>>> or whether we will need another flavour.
>>>
>>> john
>> -pae ? I thought this bug was all about the virtual flavour.
> 
> Unless I'm mistaken
>    on amd64, -virtual is subflavour of -server
>    on i386, -virtual is subflavour of -generic-pae
> 

Yeah, I'd just forgotten that -virtual was also built for i386. In any
event, if these config changes are sufficient, then I don't think they
warrant a separate flavour.

rtg
John Johansen Jan. 22, 2010, 5:25 p.m. UTC | #6 
Tim Gardner wrote:
> Scott Moser wrote:
>> On Thu, 21 Jan 2010, Tim Gardner wrote:
>>
>>> John Johansen wrote:
>>>> Tim Gardner wrote:
>>>>> John,
>>>>>
>>>>> Can you work with Scott to make this really solves the initramfs issue?
>>>>>
>>>> Indeed, we had kernels built yesterday, with essentially the same patch and
>>>> the issue has been on determining whether should go into -server and -pae
>>>> or whether we will need another flavour.
>>>>
>>>> john
>>> -pae ? I thought this bug was all about the virtual flavour.
>> Unless I'm mistaken
>>    on amd64, -virtual is subflavour of -server
>>    on i386, -virtual is subflavour of -generic-pae
>>
> 
> Yeah, I'd just forgotten that -virtual was also built for i386. In any
> event, if these config changes are sufficient, then I don't think they
> warrant a separate flavour.
> 
I agree this doesn't really warrant a new flavour unless it causes problems.
There has been some light testing and I have issued a new pull request for
my version of the patches which are pretty much exactly the same except for
they include generic-pae changes.

john
diff mbox

Patch

diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic
index c36c97b..c854de1 100644
--- a/debian.master/config/i386/config.flavour.generic
+++ b/debian.master/config/i386/config.flavour.generic
@@ -11,4 +11,4 @@  CONFIG_HIGHMEM4G=y
 CONFIG_M586=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_X86_L1_CACHE_SHIFT=5
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia
index 453d702..7374bba 100644
--- a/debian.master/config/lpia/config.common.lpia
+++ b/debian.master/config/lpia/config.common.lpia
@@ -263,7 +263,7 @@  CONFIG_X86_32=y
 # CONFIG_X86_64 is not set
 # CONFIG_X86_CPU_DEBUG is not set
 CONFIG_X86_L1_CACHE_SHIFT=5
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
 CONFIG_X86_SPEEDSTEP_LIB=y
 # CONFIG_ZONE_DMA32 is not set
 CONFIG_ZONE_DMA_FLAG=1
-- 
1.6.2.4


From 6ffc5e5002fcea45d40d4f001da0e25d5c59e27d Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Thu, 21 Jan 2010 07:52:48 -0700
Subject: [PATCH 2/3] UBUNTU: [Config] CONFIG_SCSI_SYM53C8XX_2=y for server and virtual flavours

BugLink: http://bugs.launchpad.net/bugs/494565

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 .../abi/2.6.32-10.14/amd64/server.modules          |    2 --
 debian.master/config/amd64/config.flavour.generic  |    2 ++
 debian.master/config/amd64/config.flavour.server   |    2 ++
 debian.master/config/armel/config.common.armel     |    1 +
 debian.master/config/config.common.ubuntu          |    2 --
 debian.master/config/i386/config.common.i386       |    2 ++
 debian.master/config/lpia/config.common.lpia       |    2 ++
 debian.master/sub-flavours/virtual.list            |    1 -
 8 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian.master/abi/2.6.32-10.14/amd64/server.modules b/debian.master/abi/2.6.32-10.14/amd64/server.modules
index 00e6b6d..6c01ed4 100644
--- a/debian.master/abi/2.6.32-10.14/amd64/server.modules
+++ b/debian.master/abi/2.6.32-10.14/amd64/server.modules
@@ -1699,7 +1699,6 @@  scsi_tgt
 scsi_transport_fc
 scsi_transport_iscsi
 scsi_transport_sas
-scsi_transport_spi
 scsi_transport_srp
 scsi_wait_scan
 sctp
@@ -1999,7 +1998,6 @@  svcrdma
 svgalib
 sx8
 sym53c500_cs
-sym53c8xx
 symbolserial
 synaptics_i2c
 synclink
diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
index e655718..d417095 100644
--- a/debian.master/config/amd64/config.flavour.generic
+++ b/debian.master/config/amd64/config.flavour.generic
@@ -7,3 +7,5 @@  CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_MEMORY_HOTPLUG is not set
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_SYM53C8XX_2=m
diff --git a/debian.master/config/amd64/config.flavour.server b/debian.master/config/amd64/config.flavour.server
index 6b4b976..f3543b0 100644
--- a/debian.master/config/amd64/config.flavour.server
+++ b/debian.master/config/amd64/config.flavour.server
@@ -7,3 +7,5 @@  CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_SCSI_SPI_ATTRS=y
+CONFIG_SCSI_SYM53C8XX_2=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 4408ce4..47e9a2f 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -187,6 +187,7 @@  CONFIG_RCU_FANOUT=32
 # CONFIG_RTC_CLASS is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_SCSI_OSD_INITIATOR is not set
+CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SERIAL_8250=m
 CONFIG_SERIAL_8250_NR_UARTS=4
 # CONFIG_SERIAL_NONSTANDARD is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index ea1eac7..6f14fd7 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3137,13 +3137,11 @@  CONFIG_SCSI_SAS_LIBSAS=m
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SCSI_SIM710=m
-CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_SRP=m
 CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_SRP_TGT_ATTRS=y
 CONFIG_SCSI_STEX=m
 CONFIG_SCSI_SYM53C416=m
-CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index f3f5b95..996d94f 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -207,6 +207,8 @@  CONFIG_RTC_CLASS=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_SATA_SX4=m
 CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_NR_UARTS=48
 CONFIG_SERIAL_NONSTANDARD=y
diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia
index 7374bba..54f8a31 100644
--- a/debian.master/config/lpia/config.common.lpia
+++ b/debian.master/config/lpia/config.common.lpia
@@ -216,6 +216,8 @@  CONFIG_RTC_CLASS=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_SATA_SX4=m
 CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_SYM53C8XX_2=m
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_NR_UARTS=48
 CONFIG_SERIAL_NONSTANDARD=y
diff --git a/debian.master/sub-flavours/virtual.list b/debian.master/sub-flavours/virtual.list
index 347bfce..aca70b1 100644
--- a/debian.master/sub-flavours/virtual.list
+++ b/debian.master/sub-flavours/virtual.list
@@ -77,7 +77,6 @@  drivers/scsi/scsi_wait_scan.ko
 drivers/scsi/sd_mod.ko
 drivers/scsi/sg.ko
 drivers/scsi/sr_mod.ko
-drivers/scsi/sym53c8xx_2/sym53c8xx.ko
 drivers/usb/core/usbcore.ko
 drivers/usb/storage/usb-storage.ko
 drivers/video/cirrusfb.ko
-- 
1.6.2.4


From 37c3cc2924df64719f7c7698c8df7f403a42d290 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Thu, 21 Jan 2010 08:53:22 -0700
Subject: [PATCH 3/3] UBUNTU: [Config] server/virtual flavours CONFIG_VIRTIO_BLK=y, CONFIG_VIRTIO_NET=y

BugLink: http://bugs.launchpad.net/bugs/494565

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 .../abi/2.6.32-10.14/amd64/server.modules          |    4 ----
 debian.master/config/amd64/config.flavour.generic  |    5 +++++
 debian.master/config/amd64/config.flavour.server   |    5 +++++
 debian.master/config/config.common.ubuntu          |    5 -----
 debian.master/config/i386/config.common.i386       |    5 +++++
 debian.master/config/lpia/config.common.lpia       |    5 +++++
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/debian.master/abi/2.6.32-10.14/amd64/server.modules b/debian.master/abi/2.6.32-10.14/amd64/server.modules
index 6c01ed4..065a781 100644
--- a/debian.master/abi/2.6.32-10.14/amd64/server.modules
+++ b/debian.master/abi/2.6.32-10.14/amd64/server.modules
@@ -2216,12 +2216,8 @@  videobuf-dvb
 videobuf-vmalloc
 videocodec
 videodev
-virtio
 virtio_balloon
-virtio_blk
 virtio_console
-virtio_net
-virtio_pci
 virtio_ring
 virtio-rng
 virtual
diff --git a/debian.master/config/amd64/config.flavour.generic b/debian.master/config/amd64/config.flavour.generic
index d417095..1dae2db 100644
--- a/debian.master/config/amd64/config.flavour.generic
+++ b/debian.master/config/amd64/config.flavour.generic
@@ -9,3 +9,8 @@  CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_SCSI_SPI_ATTRS=m
 CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_RING=m
diff --git a/debian.master/config/amd64/config.flavour.server b/debian.master/config/amd64/config.flavour.server
index f3543b0..d9bd9be 100644
--- a/debian.master/config/amd64/config.flavour.server
+++ b/debian.master/config/amd64/config.flavour.server
@@ -9,3 +9,8 @@  CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_SCSI_SPI_ATTRS=y
 CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_NET=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_RING=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 6f14fd7..242591c 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4249,13 +4249,8 @@  CONFIG_VIDEO_ZORAN_DC30=m
 CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
 CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIRTIO=m
 CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_CONSOLE=m
-CONFIG_VIRTIO_NET=m
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_RING=m
 CONFIG_VIRTUALIZATION=y
 CONFIG_VIRT_TO_BUS=y
 CONFIG_VITESSE_PHY=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 996d94f..2cf6a50 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -246,6 +246,11 @@  CONFIG_USB_ISP1362_HCD=m
 CONFIG_USB_MON=y
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_DEV=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_RING=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VT6656=m
 CONFIG_WAN=y
diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia
index 54f8a31..52bae53 100644
--- a/debian.master/config/lpia/config.common.lpia
+++ b/debian.master/config/lpia/config.common.lpia
@@ -255,6 +255,11 @@  CONFIG_USB_ISP1362_HCD=m
 CONFIG_USB_MON=y
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_DEV=m
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_NET=m
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_RING=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VT6656=m
 CONFIG_WAN=y