[1/3,C/Unstable] UBUNTU: [Config] CONFIG_VBOXGUEST=n

Message ID 20181010134135.10555-2-seth.forshee@canonical.com
State New
Headers show
Series
  • Switch back to out-of-tree virtualbox guest modules
Related show

Commit Message

Seth Forshee Oct. 10, 2018, 1:41 p.m.
https://bugs.launchpad.net/bugs/1796647

This conflicts with the module of the same name which we import
from the dkms package. The one from the dkms package is needed
for exports consumed by the other imported modules, so disable
the in-tree vboxguest module.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---
 debian.master/abi/4.18.0-9.10/amd64/generic.modules    | 1 -
 debian.master/abi/4.18.0-9.10/amd64/lowlatency.modules | 1 -
 debian.master/abi/4.18.0-9.10/i386/generic.modules     | 1 -
 debian.master/abi/4.18.0-9.10/i386/lowlatency.modules  | 1 -
 debian.master/config/annotations                       | 5 ++++-
 debian.master/config/config.common.ubuntu              | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

Patch

diff --git a/debian.master/abi/4.18.0-9.10/amd64/generic.modules b/debian.master/abi/4.18.0-9.10/amd64/generic.modules
index 3ecfad846ed1..4891a4bd6c14 100644
--- a/debian.master/abi/4.18.0-9.10/amd64/generic.modules
+++ b/debian.master/abi/4.18.0-9.10/amd64/generic.modules
@@ -4841,7 +4841,6 @@  v4l2-flash-led-class
 v4l2-fwnode
 v4l2-mem2mem
 v4l2-tpg
-vboxguest
 vboxvideo
 vcan
 vcnl4000
diff --git a/debian.master/abi/4.18.0-9.10/amd64/lowlatency.modules b/debian.master/abi/4.18.0-9.10/amd64/lowlatency.modules
index 28a50c10c162..4037310bc0a0 100644
--- a/debian.master/abi/4.18.0-9.10/amd64/lowlatency.modules
+++ b/debian.master/abi/4.18.0-9.10/amd64/lowlatency.modules
@@ -4842,7 +4842,6 @@  v4l2-flash-led-class
 v4l2-fwnode
 v4l2-mem2mem
 v4l2-tpg
-vboxguest
 vboxvideo
 vcan
 vcnl4000
diff --git a/debian.master/abi/4.18.0-9.10/i386/generic.modules b/debian.master/abi/4.18.0-9.10/i386/generic.modules
index 6ffaed2b7f5e..4911085c0d7b 100644
--- a/debian.master/abi/4.18.0-9.10/i386/generic.modules
+++ b/debian.master/abi/4.18.0-9.10/i386/generic.modules
@@ -4944,7 +4944,6 @@  v4l2-flash-led-class
 v4l2-fwnode
 v4l2-mem2mem
 v4l2-tpg
-vboxguest
 vboxvideo
 vcan
 vcnl4000
diff --git a/debian.master/abi/4.18.0-9.10/i386/lowlatency.modules b/debian.master/abi/4.18.0-9.10/i386/lowlatency.modules
index b40e004a9080..604b39a89a91 100644
--- a/debian.master/abi/4.18.0-9.10/i386/lowlatency.modules
+++ b/debian.master/abi/4.18.0-9.10/i386/lowlatency.modules
@@ -4945,7 +4945,6 @@  v4l2-flash-led-class
 v4l2-fwnode
 v4l2-mem2mem
 v4l2-tpg
-vboxguest
 vboxvideo
 vcan
 vcnl4000
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 93813c874627..452706670b51 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8510,7 +8510,10 @@  CONFIG_VIRTIO_MMIO                              note<LP:1557689>
 
 # Menu: Device Drivers >> Virtualization drivers
 CONFIG_VIRT_DRIVERS                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_VBOXGUEST                                policy<{'amd64': 'm', 'i386': 'm'}>
+CONFIG_VBOXGUEST                                policy<{'amd64': 'n', 'i386': 'n'}>
+#
+CONFIG_VBOXGUEST                                note<LP:1796647>
+
 
 # Menu: Device Drivers >> Voltage and Current Regulator Support
 CONFIG_REGULATOR                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'n'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index e2ae8922b310..dfe44babcb45 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -10088,7 +10088,7 @@  CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_V4L_RADIO_ISA_DRIVERS=y
 CONFIG_V4L_TEST_DRIVERS=y
-CONFIG_VBOXGUEST=m
+# CONFIG_VBOXGUEST is not set
 CONFIG_VCNL4000=m
 CONFIG_VDSO=y
 CONFIG_VEML6070=m