[RFC] Precise: collapse gerneric and server into one flavour

[Leann Ogasawara]

On Tue, 2011-10-18 at 08:19 -0700, Leann Ogasawara wrote:
> On Tue, 2011-10-18 at 12:51 +0100, Andy Whitcroft wrote:
> > On Mon, Oct 17, 2011 at 01:41:02PM -0700, Leann Ogasawara wrote:
> > > On Fri, 2011-10-14 at 16:13 +0100, Tim Gardner wrote:
> > > > On 10/14/2011 03:28 PM, Andy Whitcroft wrote:
> [...]
> > > diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> > > index ae6c2a8..83ae858 100644
> > > --- a/debian.master/config/amd64/config.common.amd64
> > > +++ b/debian.master/config/amd64/config.common.amd64
> > > @@ -203,6 +203,8 @@ CONFIG_SCSI_IPR=m
> > >  # CONFIG_SCSI_MVSAS_TASKLET is not set
> > >  CONFIG_SCSI_OSD_INITIATOR=m
> > >  CONFIG_SCSI_QLA_ISCSI=m
> > > +CONFIG_SCSI_SPI_ATTRS=y
> > > +CONFIG_SCSI_SYM53C8XX_2=y
> > >  CONFIG_SENSORS_AK8975=m
> > >  CONFIG_SERIAL_8250=y
> > >  CONFIG_SERIAL_8250_PCI=y
> > > @@ -321,6 +323,11 @@ CONFIG_VIDEO_TVAUDIO=m
> > >  # CONFIG_VIDEO_TVP514X is not set
> > >  CONFIG_VIDEO_TVP5150=m
> > >  CONFIG_VIDEO_VPX3220=m
> > > +CONFIG_VIRTIO=y
> > > +CONFIG_VIRTIO_BLK=y
> > > +CONFIG_VIRTIO_NET=y
> > > +CONFIG_VIRTIO_PCI=y
> > > +CONFIG_VIRTIO_RING=y
> > 
> > Why are these builtin on any flavour again?  I thought these were only
> > needed on -virtual?
> 
> They were built in for -server and enabled as modules for -generic.
> Since we're making config changes to the flavors, I'll enable these as
> modules for now, we can discuss completely disabling during our UDS
> config review.

Bah, I missed Stefan's response prior to writing the above.  Please
disregard and I'll just leave them built-in for now.  We can still table
further discussion for UDS.

> 
> [...]
> > 
> > Otherwise it looks sane enough to me.
> > 
> > Acked-by: Andy Whitcroft <apw at canonical.com>
> > 
> > I wouldn't let this either way hold up the first upload to precise
> > however, if the compilers etc are in shove in what we have.
> 
> I'll make the small config tweaks noted above, rebase to v3.1-rc10 and
> then upload.

Ok, so now I'm just rebasing to v3.1-rc10 and uploading.

Thanks,
Leann