]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
UBUNTU: [Packaging]: ignore vbox modules when vbox is disabled
authorThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Wed, 28 Aug 2019 12:02:08 +0000 (09:02 -0300)
committerPaolo Pisati <paolo.pisati@canonical.com>
Mon, 16 Sep 2019 13:06:59 +0000 (15:06 +0200)
When the build of virtualbox modules is disabled, its modules should be
ignored, just like when zfs is disabled.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
debian/rules
debian/vbox-modules.ignore [new file with mode: 0644]

index 2f8c34e655e1bc2dde3225a61b7ce591d556fb73..8b4ea0af34361991689df4ba50f2d6ce4927f602 100755 (executable)
@@ -107,6 +107,10 @@ ifeq ($(do_zfs),false)
        do_zfs_disable:=$(shell cat $(DROOT)/zfs-modules.ignore >>$(prev_abidir)/../modules.ignore)
 endif
 
+ifeq ($(do_dkms_vbox),false)
+       do_vbox_disable:=$(shell cat $(DROOT)/vbox-modules.ignore >>$(prev_abidir)/../modules.ignore)
+endif
+
 # Either tools package needs the common source preparation
 do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools)))
 
diff --git a/debian/vbox-modules.ignore b/debian/vbox-modules.ignore
new file mode 100644 (file)
index 0000000..66dab7d
--- /dev/null
@@ -0,0 +1,2 @@
+vboxguest
+vboxsf