[Pkg-virtualbox-devel] Bug#820886: virtualbox: Return od the virtualbox-fuse package
Erez Geva
erezgeva2 at gmail.com
Wed Apr 13 11:06:29 UTC 2016
Package: virtualbox
Version: 5.0.16-dfsg-2
Severity: wishlist
Tags: patch
Hi,
I saw that virtualbox-fuse was removed.
I downlaod the files from virtualbox forum.
http://forums.virtualbox.org/viewtopic.php?t=33355
I tried to build, but failed first.
So I patched the version build it and checked it with virtualbox version
5.0.16-dfsg-2.
I'd be nice if you could rebuild the virtualbox-fuse package using the patch
bellow.
Thanks
Erez Geva
diff -u vdbuild vdbuild
--- vdbuild 2016-04-11 13:11:00.000000000 +0200
+++ vdbuild 2016-04-11 14:33:11.050898322 +0200
@@ -41,10 +41,7 @@
exit 1
fi
-oldvboxhdd=""
-if [ -e "${incdir}/VBox/VBoxHDD-new.h" ]; then
- oldvboxhdd="-DOLDVBOXHDD"
-elif ! [ -e "${incdir}/VBox/VBoxHDD.h" ]; then
+if ! [ -e "${incdir}/VBox/vd.h" ]; then
echo "Invalid include directory. Make sure that it has the VBox
directory inside."
exit 1
fi
@@ -53,8 +50,9 @@
`pkg-config --cflags --libs fuse` \
-I"${incdir}" \
-Wl,-rpath,"${INSTALL_DIR}" \
- -l:"${INSTALL_DIR}"/VBoxDD.so \
- -Wall ${oldvboxhdd} ${CFLAGS}
+ "${INSTALL_DIR}"/VBoxDD.so \
+ "${INSTALL_DIR}"/VBoxDDU.so \
+ -Wall ${CFLAGS}
if [ -z "${NOSTRIP}" ]; then
strip -sx "${outfile}"
diff -u vdfuse-v80.c vdfuse-v80.c
--- vdfuse-v80.c 2016-04-11 13:11:00.000000000 +0200
+++ vdfuse-v80.c 2016-04-11 16:58:28.604581333 +0200
@@ -111,13 +111,8 @@
// no longer test this, I've decided to remove this old API code, but I have
left the abstraction in
// I also used the ...testcase/tstVD.cpp as a coding template to work out how
to call the VD routines.
-// if you don't have VBoxHDD.h, run 'svn co
http://www.virtualbox.org/svn/vbox/trunk/include'
-// if your VirtualBox version is older than 2.1, add -DOLDVBOXHDD to your gcc
flags
-#ifdef OLDVBOXHDD // < v2.1
-#include <VBox/VBoxHDD-new.h>
-#else // >= v2.1
-#include <VBox/VBoxHDD.h>
-#endif
+// run 'svn co http://www.virtualbox.org/svn/vbox/trunk/include'
+#include <VBox/vd.h>
#define DISKread(o,b,s) VDRead (hdDisk,o,b,s);
#define DISKwrite(o,b,s) VDWrite (hdDisk,o,b,s);
#define DISKclose VDCloseAll(hdDisk)
@@ -127,13 +122,23 @@
if (RT_FAILURE(VDOpen(hdDisk,t , i, readonly ? VD_OPEN_FLAGS_READONLY :
VD_OPEN_FLAGS_NORMAL, NULL))) \
usageAndExit("opening vbox image failed");
+static DECLCALLBACK(void) handleVDError(void *pvUser, int rc, RT_SRC_POS_DECL,
const char *pszFormat, va_list va)
+{
+ vfprintf(stderr, pszFormat, va);
+ fprintf(stderr, "Error code rc %u", rc);
+}
+
+static DECLCALLBACK(int) handleVDMessage(void *pvUser, const char *pszFormat,
va_list va)
+{
+ vfprintf(stderr, pszFormat, va);
+ return 0;
+}
+
PVBOXHDD hdDisk;
PVDINTERFACE pVDifs = NULL;
-VDINTERFACE vdError;
-VDINTERFACEERROR vdErrorCallbacks = {
- .cbSize = sizeof(VDINTERFACEERROR),
- .enmInterface = VDINTERFACETYPE_ERROR,
- .pfnError = vdErrorCallback };
+VDINTERFACEERROR vdInterfaceError = {
+ .pfnError = handleVDError,
+ .pfnMessage= handleVDMessage };
// Partition table information
@@ -261,10 +266,10 @@
//
// *** Open the VDI, parse the MBR + EBRs and connect to the fuse service
***
//
- if (RT_FAILURE(VDInterfaceAdd(&vdError, "VD Error", VDINTERFACETYPE_ERROR,
- &vdErrorCallbacks, NULL, &pVDifs)))
+ if (RT_FAILURE(VDInterfaceAdd(&vdInterfaceError.Core, "VD Error",
VDINTERFACETYPE_ERROR,
+ NULL, sizeof(VDINTERFACEERROR), &pVDifs)))
usageAndExit("invalid initialisation of VD interface");
- if (RT_FAILURE(VDCreate(&vdError, &hdDisk)))
+ if (RT_FAILURE(VDCreate(pVDifs, VDTYPE_HDD, &hdDisk)))
usageAndExit("invalid initialisation of VD interface");
DISKopen(diskType, imagefilename);
-- System Information:
Debian Release: stretch/sid
APT prefers testing-updates
APT policy: (500, 'testing-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf, armel
Kernel: Linux 4.4.0-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages virtualbox depends on:
ii adduser 3.114
ii init-system-helpers 1.29
ii libc6 2.22-5
ii libcurl3-gnutls 7.47.0-1
ii libgcc1 1:5.3.1-13
ii libgsoap8 2.8.28-2
ii libpng12-0 1.2.54-4+b1
ii libpython2.7 2.7.11-7
ii libsdl1.2debian 1.2.15+dfsg1-4
ii libssl1.0.2 1.0.2g-1
ii libstdc++6 5.3.1-13
ii libvncserver1 0.9.10+dfsg-3+b1
ii libvpx3 1.5.0-2
ii libx11-6 2:1.6.3-1
ii libxcursor1 1:1.1.14-1+b1
ii libxext6 2:1.3.3-1
ii libxml2 2.9.3+dfsg1-1
ii libxmu6 2:1.1.2-2
ii libxt6 1:1.1.5-1
ii procps 2:3.3.11-3
ii python 2.7.11-1
ii python2.7 2.7.11-7
pn python:any <none>
ii virtualbox-dkms [virtualbox-modules] 5.0.16-dfsg-2
ii zlib1g 1:1.2.8.dfsg-2+b1
Versions of packages virtualbox recommends:
ii libgl1-mesa-glx [libgl1] 11.1.2-1
ii libqt4-opengl 4:4.8.7+dfsg-6
ii libqtcore4 4:4.8.7+dfsg-6
ii libqtgui4 4:4.8.7+dfsg-6
ii virtualbox-qt 5.0.16-dfsg-2
Versions of packages virtualbox suggests:
ii vde2 2.3.2+r586-2+b1
pn virtualbox-guest-additions-iso <none>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: org.txz
Type: application/x-xz
Size: 9016 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-virtualbox-devel/attachments/20160413/15554c9b/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: org.txz
Type: application/x-xz
Size: 9016 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-virtualbox-devel/attachments/20160413/15554c9b/attachment-0003.bin>
More information about the Pkg-virtualbox-devel
mailing list