[Pkg-virtualbox-commits] [virtualbox] 01/01: New upload

Gianfranco Costamagna locutusofborg at moszumanska.debian.org
Thu Feb 16 19:13:08 UTC 2017


This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository virtualbox.

commit bd86433525f76897e0bb8b3547d78df64d42f307
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Feb 16 20:12:23 2017 +0100

    New upload
---
 debian/changelog                                          |  7 +++++++
 debian/patches/linux-4.10-dont-use-generic-readlink.patch | 14 ++++++++++++++
 debian/patches/series                                     |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f39401a..4ed3f1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virtualbox (5.1.14-dfsg-2) unstable; urgency=medium
+
+  [ Seth Forshee ]
+  * Cherry pick upstream commit 65409 to fix build with Linux 4.10.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 16 Feb 2017 20:10:54 +0100
+
 virtualbox (5.1.14-dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/linux-4.10-dont-use-generic-readlink.patch b/debian/patches/linux-4.10-dont-use-generic-readlink.patch
new file mode 100644
index 0000000..52c4f19
--- /dev/null
+++ b/debian/patches/linux-4.10-dont-use-generic-readlink.patch
@@ -0,0 +1,14 @@
+Index: virtualbox-5.1.14-dfsg/src/VBox/Additions/linux/sharedfolders/lnkops.c
+===================================================================
+--- virtualbox-5.1.14-dfsg.orig/src/VBox/Additions/linux/sharedfolders/lnkops.c
++++ virtualbox-5.1.14-dfsg/src/VBox/Additions/linux/sharedfolders/lnkops.c
+@@ -90,7 +90,9 @@ static const char *sf_get_link(struct de
+ 
+ struct inode_operations sf_lnk_iops =
+ {
++# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+     .readlink       = generic_readlink,
++# endif
+ # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)
+     .get_link       = sf_get_link
+ # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
diff --git a/debian/patches/series b/debian/patches/series
index b48bc21..b25ae0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 35-libvdeplug-soname.patch
 36-fix-vnc-version-string.patch
 new-xorg-1.19.patch
+linux-4.10-dont-use-generic-readlink.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