[PATCH 1/2] UBUNTU: (packaging) Resolve module dependencies in base package

[Stefan Bader]

It turns out that there are several modules in the base package which
have unmet dependencies on modules in the extra package. This change
will move the following:

  72K drivers/char/ipmi/ipmi_msghandler.ko
 612K drivers/infiniband/core/*
 104K drivers/scsi/device_handler/*
  72K drivers/scsi/osd/*
  32K fs/exofs/libore.ko
 200K net/ceph/libceph.ko
-----
1092K

The numbers are taken from a 64bit build, so should be worst case. The
resulting linux-image package was 7.1M.

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

Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
---
 debian.master/control.d/generic.inclusion-list |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list
index 00d9911..c30f821 100644
--- a/debian.master/control.d/generic.inclusion-list
+++ b/debian.master/control.d/generic.inclusion-list
@@ -9,11 +9,13 @@ drivers/block/nbd.ko
 drivers/block/floppy.ko
 drivers/block/cryptoloop.ko
 drivers/char/hangcheck-timer.ko
+drivers/char/ipmi/ipmi_msghandler.ko
 drivers/char/lp.ko
 drivers/char/nvram.ko
 drivers/char/ppdev.ko
 drivers/char/raw.ko
 drivers/hv/*
+drivers/infiniband/core/*
 drivers/input/evbug.ko
 drivers/input/gameport/gameport.ko
 drivers/input/mouse/psmouse.ko
@@ -54,10 +56,12 @@ drivers/parport/parport_pc.ko
 drivers/pci/hotplug/acpiphp.ko
 drivers/net/ethernet/dec/tulip/*
 drivers/scsi/BusLogic.ko
+drivers/scsi/device_handler/*
 drivers/scsi/iscsi_tcp.ko
 drivers/scsi/libiscsi.ko
 drivers/scsi/libiscsi_tcp.ko
 drivers/scsi/libsas/*
+drivers/scsi/osd/*
 drivers/scsi/qla1280.ko
 drivers/scsi/raid_class.ko
 drivers/scsi/scsi_transport_fc.ko
@@ -87,6 +91,7 @@ fs/btrfs/*
 fs/cachefiles/cachefiles.ko
 fs/ceph/*
 fs/configfs/*
+fs/exofs/libore.ko
 fs/ext*/*
 fs/fat/*
 fs/nls/nls_cp437.ko
@@ -113,6 +118,7 @@ net/atm/*
 net/ax25/*
 net/bridge/*
 net/can/*
+net/ceph/libceph.ko
 net/core/*
 net/dccp/*
 net/decnet/*
-- 
1.7.9.5