| Message ID | 20190828120208.7753-1-cascardo@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [E/U] UBUNTU: [Packaging]: ignore vbox modules when vbox is disabled | expand |
On Wed, Aug 28, 2019 at 09:02:08AM -0300, Thadeu Lima de Souza Cascardo wrote: > 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> Good catch. Applied to eoan/master-next and unstable/master, thanks!
diff --git a/debian/rules b/debian/rules index 0953195f5ab1..4ec9e7c81d4d 100755 --- a/debian/rules +++ b/debian/rules @@ -96,6 +96,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 index 000000000000..66dab7da1c1d --- /dev/null +++ b/debian/vbox-modules.ignore @@ -0,0 +1,2 @@ +vboxguest +vboxsf
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> --- debian/rules | 4 ++++ debian/vbox-modules.ignore | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 debian/vbox-modules.ignore