[Pkg-virtualbox-commits] [virtualbox] 04/04: Patch refresh, update changelog, upload to unstable
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Thu Oct 22 13:34:46 UTC 2015
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository virtualbox.
commit 9da152312830d242f759208a36e34f1abe37af0d
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Thu Oct 22 15:33:41 2015 +0200
Patch refresh, update changelog, upload to unstable
---
debian/changelog | 8 +++--
debian/patches/04-vboxdrv-references.patch | 48 +++++++++++++++---------------
debian/patches/16-no-update.patch | 4 +--
debian/patches/iasl-fix.patch | 33 ++++++++++++++++++++
debian/patches/series | 1 +
5 files changed, 66 insertions(+), 28 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ecefbff..7ca2aad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
-virtualbox (5.0.6-dfsg-2) UNRELEASED; urgency=medium
+virtualbox (5.0.8-dfsg-1) unstable; urgency=medium
+ * New upstream release, patch refresh.
* Remove version constraint from virtualbox-modules, because it is a virtual package.
* Add runtime dependency on xserver-xorg-legacy on virtualbox-guest-x11
(Closes: #801524)
* Remove some more vboxdrv references (04-vboxdrv-references.patch)
* Override missing virtualbox-modules lintian error.
- -- Gianfranco Costamagna <locutusofborg at debian.org> Sun, 04 Oct 2015 23:14:29 +0200
+ [ Alexander Eichner]
+ * debian/patches/iasl-fix.patch: fix build failure against new iasl 20150930
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Thu, 22 Oct 2015 15:32:44 +0200
virtualbox (5.0.6-dfsg-1) unstable; urgency=medium
diff --git a/debian/patches/04-vboxdrv-references.patch b/debian/patches/04-vboxdrv-references.patch
index fb9f203..dc5e82a 100644
--- a/debian/patches/04-vboxdrv-references.patch
+++ b/debian/patches/04-vboxdrv-references.patch
@@ -12,7 +12,7 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
- pszError = N_("One of the kernel modules was not successfully loaded. Make sure "
- "that no kernel modules from an older version of VirtualBox exist. "
- "Then try to recompile and reload the kernel modules by executing "
-- "'/sbin/rcvboxdrv setup' as root");
+- "'/sbin/vboxconfig' as root");
+ pszError = N_("Please install the virtualbox-dkms package "
+ "and execute 'modprobe vboxdrv' as root");
break;
@@ -25,7 +25,7 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
- pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
- "was either not loaded or /dev/vboxdrv is not set up properly. "
- "Re-setup the kernel module by executing "
-- "'/sbin/rcvboxdrv setup' as root");
+- "'/sbin/vboxconfig' as root");
+ pszError = N_("Please install the virtualbox-dkms package "
+ "and execute 'modprobe vboxdrv' as root");
#else
@@ -38,35 +38,35 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
- pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
- "was either not loaded or /dev/vboxdrv was not created for some "
- "reason. Re-setup the kernel module by executing "
-- "'/sbin/rcvboxdrv setup' as root");
+- "'/sbin/vboxconfig' as root");
+ pszError = N_("Please install the virtualbox-dkms package "
+ "and execute 'modprobe vboxdrv' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
diff --git a/src/VBox/Frontends/VirtualBox/src/main.cpp b/src/VBox/Frontends/VirtualBox/src/main.cpp
-index 094b84c..2610bfc 100644
+index 66a1200..e174ae7 100644
--- a/src/VBox/Frontends/VirtualBox/src/main.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/main.cpp
-@@ -80,9 +80,10 @@ QString g_QStrHintLinuxNoMemory = QApplication::tr(
+@@ -100,9 +100,10 @@ QString g_QStrHintLinuxNoMemory = QApplication::tr(
QString g_QStrHintLinuxNoDriver = QApplication::tr(
- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
-- "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
-+ "there is a permission problem with /dev/vboxdrv. Please install virtualbox-dkms"
-+ "package and load the kernel "
- "module by executing<br/><br/>"
-- " <font color=blue>'/sbin/rcvboxdrv setup'</font><br/><br/>"
-+ " <font color=blue>'modprobe vboxdrv'</font><br/><br/>"
- "as root. If it is available in your distribution, you should install the "
- "DKMS package first. This package keeps track of Linux kernel changes and "
- "recompiles the vboxdrv kernel module if necessary."
-@@ -99,7 +100,7 @@ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
- "The VirtualBox kernel modules do not match this version of "
- "VirtualBox. The installation of VirtualBox was apparently not "
- "successful. Executing<br/><br/>"
-- " <font color=blue>'/sbin/rcvboxdrv setup'</font><br/><br/>"
-+ " <font color=blue>'modprobe vboxdrv'</font><br/><br/>"
- "may correct this. Make sure that you do not mix the "
- "OSE version and the PUEL version of VirtualBox."
- );
+ "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
+- "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
++ "there is a permission problem with /dev/vboxdrv. Please install virtualbox-dkms "
++ "package and load the kernel "
+ "module by executing<br/><br/>"
+- " <font color=blue>'/sbin/vboxconfig'</font><br/><br/>"
++ " <font color=blue>'modprobe vboxdrv'</font><br/><br/>"
+ "as root. If it is available in your distribution, you should install the "
+ "DKMS package first. This package keeps track of Linux kernel changes and "
+ "recompiles the vboxdrv kernel module if necessary."
+@@ -119,7 +120,7 @@ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
+ "The VirtualBox kernel modules do not match this version of "
+ "VirtualBox. The installation of VirtualBox was apparently not "
+ "successful. Executing<br/><br/>"
+- " <font color=blue>'/sbin/vboxconfig'</font><br/><br/>"
++ " <font color=blue>'modprobe vboxdrv'</font><br/><br/>"
+ "may correct this. Make sure that you do not mix the "
+ "OSE version and the PUEL version of VirtualBox."
+ );
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index 89eebc7..bfcac35 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -79,7 +79,7 @@ diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp b/s
index 752afd4..0438cef 100644
--- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-@@ -1211,8 +1211,6 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
+@@ -1235,8 +1235,6 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
/* 'About' action goes to Application menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@@ -88,7 +88,7 @@ index 752afd4..0438cef 100644
/* 'Network Access Manager' action goes to Application menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-@@ -1255,8 +1253,6 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
+@@ -1279,8 +1277,6 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* 'Network Access Manager' action goes to 'File' menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
diff --git a/debian/patches/iasl-fix.patch b/debian/patches/iasl-fix.patch
new file mode 100644
index 0000000..a170b48
--- /dev/null
+++ b/debian/patches/iasl-fix.patch
@@ -0,0 +1,33 @@
+Author: Alexander Eichner <alexander.eichner at oracle.com>
+diff --git a/src/VBox/Devices/PC/vbox-cpuhotplug.dsl b/src/VBox/Devices/PC/vbox-cpuhotplug.dsl
+index 996a3d3..2312304 100644
+--- a/src/VBox/Devices/PC/vbox-cpuhotplug.dsl
++++ b/src/VBox/Devices/PC/vbox-cpuhotplug.dsl
+@@ -27,6 +27,18 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", "SSDT", 1, "VBOX ", "VBOXCPUT", 2)
+ Return(LEqual(CPUL, 0x01))
+ }
+
++ // Method to notify the VMM that a CPU is not
++ // in use anymore and can be safely removed.
++ // Usin the extra method here because the CPUL
++ // register identifer clashes with the CPUL object defined
++ // below making iasl starting with version 20150930 fail.
++ //
++ // Think of CPLO as "CPU Lock Open"
++ Method(CPLO, 1)
++ {
++ Store (Arg0, CPUL)
++ }
++
+ Scope (\_SB)
+ {
+
+@@ -73,7 +85,7 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", "SSDT", 1, "VBOX ", "VBOXCPUT", 2)
+ } \
+ Method(_EJ0, 1) \
+ { \
+- Store(id, CPUL) /* Unlock the CPU */ \
++ CPLO(id) /* Unlock the CPU */ \
+ Return \
+ } \
+ } \
diff --git a/debian/patches/series b/debian/patches/series
index 5b32c83..b8d8887 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
32-disable-guest-version-check.patch
35-libvdeplug-soname.patch
36-fix-vnc-version-string.patch
+iasl-fix.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git
More information about the Pkg-virtualbox-commits
mailing list