Move vmware related modules from extras into main kernel package

The modules build by the open-vm-tools-dkms package require symbols from drivers/misc/vmw_vmci/vmw_vmci.ko which is currently shipped in the extra. These are the insmod errors from the dkms modules, the symbols are provided by vmw_vmci.ko:

vmhgfs fails to load:
[386915.338195] vmhgfs: module verification failed: signature and/or required key missing - tainting kernel
[386915.338245] vmhgfs: Unknown symbol vmci_datagram_destroy_handle (err 0)
[386915.338288] vmhgfs: Unknown symbol vmci_datagram_send (err 0)
[386915.338337] vmhgfs: Unknown symbol vmci_datagram_create_handle (err 0)

As well as vsock:
[386943.938818] vsock: Unknown symbol vmci_datagram_create_handle_priv (err 0)
[386943.938827] vsock: Unknown symbol vmci_context_get_priv_flags (err 0)
[386943.938836] vsock: Unknown symbol vmci_qpair_get_produce_indexes (err 0)
[386943.938840] vsock: Unknown symbol vmci_qpair_consume_buf_ready (err 0)
[386943.938848] vsock: Unknown symbol vmci_datagram_destroy_handle (err 0)
[386943.938864] vsock: Unknown symbol vmci_qpair_produce_buf_ready (err 0)
[386943.938873] vsock: Unknown symbol vmci_event_subscribe (err 0)
[386943.938882] vsock: Unknown symbol vmci_datagram_send (err 0)
[386943.938889] vsock: Unknown symbol vmci_qpair_produce_free_space (err 0)
[386943.938909] vsock: Unknown symbol vmci_qpair_get_consume_indexes (err 0)
[386943.938917] vsock: Unknown symbol vmci_qpair_consume_free_space (err 0)
[386943.938921] vsock: Unknown symbol vmci_qpair_peekv (err 0)
[386943.938925] vsock: Unknown symbol vmci_is_context_owner (err 0)
[386943.938928] vsock: Unknown symbol vmci_datagram_create_handle (err 0)
[386943.938935] vsock: Unknown symbol vmci_qpair_alloc (err 0)
[386943.938946] vsock: Unknown symbol vmci_qpair_detach (err 0)
[386943.938953] vsock: Unknown symbol vmci_qpair_dequev (err 0)
[386943.938959] vsock: Unknown symbol vmci_qpair_enquev (err 0)
[386943.938967] vsock: Unknown symbol vmci_event_unsubscribe (err 0)
[386943.938971] vsock: Unknown symbol vmci_get_context_id (err 0)

Here are the locations for vmw_vmci.ko, vmw_vsock*.ko, having these (along with vmxmet3.ko already in virtual) would allow us to remove these modules from the open-vm-tools-dkms package.

diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list
index 8362b7b..707d5dc 100644
--- a/debian.master/control.d/generic.inclusion-list
+++ b/debian.master/control.d/generic.inclusion-list
@@ -37,6 +37,7 @@ drivers/input/misc/xen-kbdfront.ko
 drivers/md/*
 drivers/message/fusion*
 drivers/misc/vmw_balloon.ko
+drivers/misc/vmw_vmci/vmw_vmci.ko
 drivers/net/mii.ko
 drivers/net/ethernet/8390/8390.ko
 drivers/net/ethernet/realtek/8139too.ko
@@ -151,6 +152,8 @@ net/rxrpc/*
 net/sched/*
 net/sctp/*
 net/tipc/*
+net/vmw_vsock/vmw_vsock_vmci_transport.ko
+net/vmw_vsock/vsock.ko
 net/x25/*
 net/xfrm/*
 net/sunrpc/auth_gss/auth_rpcgss.ko

Please make sure that vmxnet3 is included, not vmxnet

Modified the title so this could include multiple modules. vmxnet3 is already in the main package, but vsock.ko and vmw_vsock_vmci_transport.ko are not but likely should. There is a vmwgfx driver, too but the target is probably more server type which does not need accelerated gfx. Also right now there is no other drm driver in the main package.

Came up with the same change mostly. just generically including everything in net/vmw_vsock/*.

Once these modules are enabled in the kernel, we should disable the modules in open-vm-tools DKMS package. The only module that should be built via the DKMS package is vmhgfs.

Test packages in people.cc/~smb/vmcitest.

Stefan, everything looks good with the kernel image posted to people.cc/~smb/vmcitest. All of the vmware modules we were looking for are where we expected. Thanks.

Fix for open-vm-tools @ lp:~rcj/ubuntu/trusty/open-vm-tools/lp1271669

Also built open-vm-tools with the fix available in ppa:rcj/testing

This bug was fixed in the package open-vm-tools - 2:9.4.0-1280544-5ubuntu2

---------------
open-vm-tools (2:9.4.0-1280544-5ubuntu2) trusty; urgency=low

  * debian/patches/dkms-do-not-build-vsock-vmxnet.patch:
    Prevent builds for vmxnet and vsock modules (LP: #1271669).
  * Remove obsolete manpages: debian/manpages/vmblock.9,
     debian/manpages/vmci.9, debian/manpages/vmmemctl.9,
     debian/manpages/vmsock.9, debian/manpages/vmsync.9,
     debian/manpages/vmxnet.9
  * Removed references to obsolete man pages in remaining manpages.
 -- Robert C Jennings <email address hidden> Fri, 24 Jan 2014 12:57:33 -0600

This bug was fixed in the package linux - 3.13.0-6.23

---------------
linux (3.13.0-6.23) trusty; urgency=low

  [ Andy Whitcroft ]

  * [Config] fix up architecture for linux-tools

linux (3.13.0-6.22) trusty; urgency=low

  [ Andy Whitcroft ]

  * [Packaging] limit linux-udebs-<flavour> to matching arch
  * [Config] powerpc -- disable perf to fix FTBFS
  * [Config] ppc64el -- fix up missing udebs

linux (3.13.0-6.21) trusty; urgency=low

  [ Andy Fleming ]

  * SAUCE: net: Add support for handling queueing in hardware
  * SAUCE: of_mdio: Add of_phy_attach function
  * SAUCE: phylib: Add generic 10G driver
  * SAUCE: phylib: Support attaching to gen10g_driver
  * SAUCE: phylib: Add Clause 45 read/write functions

  [ Andy Whitcroft ]

  * SAUCE: fix fmd headers
  * [Packaging] lowlatency -- merge out of tree flavours
  * SAUCE: allow IRQs to be irq-threaded by default via config
  * [Config]: enable CONFIG_IRQ_FORCED_THREADING_DEFAULT for lowlatency
  * [Config] powerpc -- fix up Build-depends:
  * Release Tracking Bug
    - LP: #1273747

  [ Ben Collins ]

  * SAUCE: PPC: PCI: Fix pcibios_io_space_offset() so it works for 32-bit
    ptr/64-bit rsrcs
  * SAUCE: Revert "phy: vitesse make vsc824x_add_skew static"
  * SAUCE: Fixup freescale usb phy driver to work on ppc64
  * SAUCE: xgmac_mdio: Silence read errors
  * SAUCE: Provide booke stub for kvmppc_is_bigendian()
  * SAUCE: Fix stack overflow on ppc32
  * SAUCE: Use resource_size_t instead of long for PCI resource address
  * SAUCE: net/phy: Export function for use by dpaa_eth
  * [Packaging] powerpc -- merge out of tree powerpc arch

  [ Bjorn Helgaas ]

  * SAUCE: Revert "EISA: Log device resources in dmesg"
    - LP: #1251816
  * SAUCE: Revert "EISA: Initialize device before its resources"
    - LP: #1251816

  [ Emil Medve ]

  * SAUCE: phylib: Minimum hack to get the generic 10G PHY driver to work
    with 10G "fixed-link"s

  [ Kumar Gala ]

  * SAUCE: fsl_qbman: Add drivers for Freescale DPAA Qman & Bman
  * SAUCE: fsl_pme2: Add support for DPAA PME
  * SAUCE: fmd: FMD14 integration
  * SAUCE: dpaa_eth: Ethernet driver for Freescale QorIQ DPA Architecture
  * SAUCE: powerpc/85xx: Add DPAA/networking support for CoreNet

  [ Madalin Bucur ]

  * SAUCE: net/flow: remove sleeping and deferral mechanism from
    flow_cache_flush
  * SAUCE: net/phy: abort genphy_read_status when link changes during speed
    and duplex reading

  [ Stefan Bader ]

  * [Config] move some VMWare related modules into main package
    - LP: #1271669

  [ Tim Gardner ]

  * [Config] Add r815x to nic-modules
    - LP: #1273735
  * [Config] CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
    - LP: #239479

  [ Upstream Kernel Changes ]

  * mmc: sdhci-pci: break out definitions to header file
    - LP: #1239938
  * mmc: sdhci-pci: add support of O2Micro/BayHubTech SD hosts
    - LP: #1239938
  * powerpc/book3e: rename interrupt_end_book3e with __end_interrupts
  * powerpc/book3e: support CONFIG_RELOCATABLE
  * book3e/kexec/kdump: enable kexec for kernel
  * book3e/kexec/kdump: create a 1:1 TLB mapping
  * book3e/kexec/kdump: introduce a kexec kernel flag
  * book3e/kexec/kdump: implement ppc64 kexec specfic
  * book3e/...