Control: tags -1 + patch Hi
The attached debdiff adds support to build and use virtualbox guest
modules with linux kernel v3.8(-rc7-93-gf741656).
$ LANG= m-a --kvers-list $(uname -r) --kernel-dir
/usr/src/linux-headers-$(uname -r)/ --userdir /tmp/pkg/ --text-mode build
virtualbox-guest-source
[…]
kmk[3]: Entering directory `/usr/src/linux-headers-3.8-rc7-aptosid-amd64'
LD /tmp/pkg/usr_src/modules/virtualbox-guest/vboxguest/built-in.o
CC [M] /tmp/pkg/usr_src/modules/virtualbox-guest/vboxguest/VBoxGuest-linux.o
CC [M] /tmp/pkg/usr_src/modules/virtualbox-guest/vboxguest/VBoxGuest.o
/tmp/pkg/usr_src/modules/virtualbox-guest/vboxguest/VBoxGuest.c: In function
'VBoxGuestCommonIOCtl':
/tmp/pkg/usr_src/modules/virtualbox-guest/vboxguest/VBoxGuest.c:2480:9:
warning: ISO C90 forbids mixed declarations and code
[-Wdeclaration-after-statement]
CC [M] /tmp/pkg/usr_src/modules/virtualbox-guest/vboxguest/VBoxGuest2.o
CC [M] /tmp/pkg/usr_src/modules/virtualbox-guest/vboxguest/GenericRequest.o
CC [M] /tmp/pkg/usr_src/modules/virtualbox-guest/vboxguest/HGCMInternal.o
[…]
$ dpkg --contents
virtualbox-guest-modules-3.8-rc7-aptosid-amd64_4.1.18-dfsg-2.1+c0.aptosid.1+3.8~rc7-1~git93.slh.2_amd64.deb
drwxr-xr-x root/root 0 2013-02-17 23:35 ./
drwxr-xr-x root/root 0 2013-02-17 23:35 ./usr/
drwxr-xr-x root/root 0 2013-02-17 23:35 ./usr/share/
drwxr-xr-x root/root 0 2013-02-17 23:35 ./usr/share/doc/
drwxr-xr-x root/root 0 2013-02-17 23:35
./usr/share/doc/virtualbox-guest-modules-3.8-rc7-aptosid-amd64/
-rw-r--r-- root/root 77981 2012-04-05 12:24
./usr/share/doc/virtualbox-guest-modules-3.8-rc7-aptosid-amd64/copyright
-rw-r--r-- root/root 17993 2013-02-17 20:13
./usr/share/doc/virtualbox-guest-modules-3.8-rc7-aptosid-amd64/changelog.Debian.gz
drwxr-xr-x root/root 0 2013-02-17 23:35 ./lib/
drwxr-xr-x root/root 0 2013-02-17 23:35 ./lib/modules/
drwxr-xr-x root/root 0 2013-02-17 23:35
./lib/modules/3.8-rc7-aptosid-amd64/
drwxr-xr-x root/root 0 2013-02-17 23:35
./lib/modules/3.8-rc7-aptosid-amd64/misc/
-rw-r--r-- root/root 296362 2013-02-17 23:35
./lib/modules/3.8-rc7-aptosid-amd64/misc/vboxguest.ko
-rw-r--r-- root/root 55692 2013-02-17 23:35
./lib/modules/3.8-rc7-aptosid-amd64/misc/vboxsf.ko
-rw-r--r-- root/root 6247 2013-02-17 23:35
./lib/modules/3.8-rc7-aptosid-amd64/misc/vboxvideo.ko
Regards
Stefan Lippers-Hollmann
diff -Nru virtualbox-4.1.18-dfsg/debian/changelog virtualbox-4.1.18-dfsg/debian/changelog
--- virtualbox-4.1.18-dfsg/debian/changelog
+++ virtualbox-4.1.18-dfsg/debian/changelog
@@ -1,3 +1,10 @@
+virtualbox (4.1.18-dfsg-2.2) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * fix (guest) kernel module compilation against v3.8 (Closes: #700823).
+
+ -- Stefan Lippers-Hollmann <s....@gmx.de> Sun, 17 Feb 2013 20:01:48 +0100
+
virtualbox (4.1.18-dfsg-2.1) experimental; urgency=low
[ Stefan Lippers-Hollmann ]
diff -Nru virtualbox-4.1.18-dfsg/debian/patches/39-kcompat-3.8.patch virtualbox-4.1.18-dfsg/debian/patches/39-kcompat-3.8.patch
--- virtualbox-4.1.18-dfsg/debian/patches/39-kcompat-3.8.patch
+++ virtualbox-4.1.18-dfsg/debian/patches/39-kcompat-3.8.patch
@@ -0,0 +1,25 @@
+Description: Fix guest module FTBFS with kernel 3.8.
+Author: Stefan Lippers-Hollmann <s....@gmx.de>
+Bug-Debian: #700823
+
+backport upstream patches for kernel 3.8:
+
+r44317 | vboxsync | 2013-01-21 09:44:44 +0000 (Mon, 21 Jan 2013) | 2 lines
+
+Additions/VBoxGuest: compile fix for Linux 3.8-rc4
+
+--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
++++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
+@@ -203,7 +203,11 @@ static struct miscdevice g_MiscDe
+
+
+ /** PCI hotplug structure. */
+-static const struct pci_device_id __devinitdata g_VBoxGuestPciId[] =
++static const struct pci_device_id
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
++__devinitdata
++#endif
++g_VBoxGuestPciId[] =
+ {
+ {
+ vendor: VMMDEV_VENDORID,
diff -Nru virtualbox-4.1.18-dfsg/debian/patches/series virtualbox-4.1.18-dfsg/debian/patches/series
--- virtualbox-4.1.18-dfsg/debian/patches/series
+++ virtualbox-4.1.18-dfsg/debian/patches/series
@@ -18,3 +18,4 @@
CVE-2013-0420.patch
37-kcompat-3.6.patch
38-kcompat-3.7.patch
+39-kcompat-3.8.patch
signature.asc
Description: This is a digitally signed message part.
