PCI: PM: Skip devices in D0 for suspend-to-idle

[mirror_ubuntu-bionic-kernel.git] / ubuntu / vbox-update

diff --git a/ubuntu/vbox-update b/ubuntu/vbox-update
index 83b0ebf341b747ce40c461ed7c03c48ae44540ec..604f587db97d7072b352709805682c93896b5c31 100755 (executable)
--- a/ubuntu/vbox-update
+++ b/ubuntu/vbox-update
@@ -37,6 +37,23 @@ do
        sed -i -e '1iKBUILD_EXTMOD=${srctree}/ubuntu/vbox' $make
 done
 
+# Fix up KERN_DIR to point at the kernel source tree
+for make in vbox/*/Makefile.include.header
+do
+       sed -i -e 's/^KERN_DIR := .*$/KERN_DIR := $(srctree)/' $make
+done
+
+# We're now using the vboxvideo module in drivers/staging, so disable
+# the version that was imported.
+sed -i -e 's: vboxvideo/::' vbox/Makefile
+
+# Reduce the version of the in-kernel module just slightly so it
+# will not clash with the dkms package.
+for version in vbox/*/version-generated.h
+do
+       sed -i -e 's/_Ubuntu"/_KernelUbuntu"/' $version
+done
+
 # Record the version number and nominal source.
 {
        echo "Source: http://ports.ubuntu.com/pool/multiverse/v/virtualbox/virtualbox-guest-dkms_${ver}_all.deb"