Skip to content

Commit 5178e47

Browse files
author
vboxsync
committed
Config: disable PCI passthrough
debian: big resync with files in src/VBox/Installer/Linux/debian, this must have been broken for years doc: mention dropping of PCI passthrough src/VBox/Installer/linux: adapt to handle no longer present vboxpci.ko (without completely ripping it out) git-svn-id: http://www.virtualbox.org/svn/vbox/trunk@82441 cfe28804-0f27-0410-a406-dd0f0b0b656f
1 parent 51dcd6f commit 5178e47

16 files changed

Lines changed: 325 additions & 452 deletions

File tree

Config.kmk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,8 @@ endif
482482
# Enables the audio endpoint detection on Windows hosts.
483483
VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT = 1
484484
# Enable PCI passthrough support.
485-
VBOX_WITH_PCI_PASSTHROUGH = 1
485+
# (disabled with 6.1, since it's not complete/useful enough)
486+
VBOX_WITH_PCI_PASSTHROUGH =
486487
# Enable statically linked dbus support.
487488
if1of ($(KBUILD_TARGET), linux solaris)
488489
VBOX_WITH_DBUS = 1
@@ -2312,7 +2313,7 @@ VBOX_PATH_MACOSX_SDK := $(firstword $(wildcard $(addsuffix /MacOSX$(VBOX_DEF_MAC
23122313
endif
23132314
ifdef VBOX_WITH_NEW_XCODE
23142315
if defined(VBOX_WITH_REM) && "$(VBOX_XCODE_VERSION)" >= "4.2"
2315-
$(warning Xcode $(VBOX_XCODE_VERSION) is not able to correctly build the recompiler! Please disabled it: 'VBOX_WITH_REM=')
2316+
$(warning Xcode $(VBOX_XCODE_VERSION) is not able to correctly build the recompiler! Please disable it: 'VBOX_WITH_REM=')
23162317
endif
23172318
ifdef KBUILD_USE_KOBJCACHE
23182319
$(warning KBUILD_USE_KOBJCACHE does _not_ currently work with this version of Xcode)

debian/LocalConfig.kmk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55

66
#
7-
# Copyright (C) 2006-2017 Oracle Corporation
7+
# Copyright (C) 2006-2019 Oracle Corporation
88
#
99
# This file is part of VirtualBox Open Source Edition (OSE), as
1010
# available from http://www.virtualbox.org. This file is free software;

debian/control

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ Package: virtualbox-ose
1717
Architecture: i386 amd64
1818
Pre-Depends: debconf (>= 1.1) | debconf-2.0
1919
Depends: ${shlibs:Depends}, debconf (>= 0.5) | debconf-2.0, psmisc, adduser
20-
Recommends: ${alsa}, ${pulse}, ${sdlttf},
21-
linux-headers, gcc, make, binutils
20+
Recommends: ${alsa}, ${pulse}, ${sdlttf}, kmod | kldutils | module-init-tools,
21+
linux-headers-generic | linux-headers-generic-pae | linux-headers-686-pae | linux-headers-amd64 | linux-headers-2.6-686 | linux-headers-2.6-amd64 | linux-headers,
22+
linux-image, gcc, make | build-essential | dpkg-dev, binutils,
23+
pdf-viewer, libgl1
2224
Description: Oracle VM VirtualBox
2325
VirtualBox is a powerful PC virtualization solution allowing you to run a
2426
wide range of PC operating systems on your Linux system. This includes
@@ -29,7 +31,7 @@ XB-Python-Version: ${python:Versions}
2931

3032
Package: virtualbox-ose-dbg
3133
Architecture: i386 amd64
32-
Depends: virtualbox-ose (= ${Source-Version})
34+
Depends: virtualbox-ose (= ${binary:Version})
3335
Description: Oracle VM VirtualBox debugging symbols
3436
VirtualBox is a powerful PC virtualization solution allowing you to run a
3537
wide range of PC operating systems on your Linux system. This includes

debian/lintian-override.in

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,10 @@
2121
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxSVCM.so
2222
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxC.so
2323
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxHeadless.so
24-
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxOGLhostcrutil.so
25-
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxOGLhosterrorspu.so
26-
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxOGLrenderspu.so
2724
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxPython.so
2825
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxREM32.so
2926
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxREM64.so
3027
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSDL.so
31-
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedCrOpenGL.so
3228
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VirtualBox.so
3329
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDbg.so
3430
%VERPKG%: binary-without-manpage usr/bin/VBox
@@ -40,6 +36,7 @@
4036
%VERPKG%: binary-without-manpage usr/bin/VBoxTunctl
4137
%VERPKG%: binary-without-manpage usr/bin/VBoxVRDP
4238
%VERPKG%: binary-without-manpage usr/bin/VirtualBox
39+
%VERPKG%: binary-without-manpage usr/bin/VirtualBoxVM
4340
%VERPKG%: binary-without-manpage usr/bin/rdesktop-vrdp
4441
%VERPKG%: binary-without-manpage usr/bin/vboxballoonctrl
4542
%VERPKG%: binary-without-manpage usr/bin/vboxdtrace
@@ -48,10 +45,9 @@
4845
%VERPKG%: binary-without-manpage usr/bin/vboxsdl
4946
%VERPKG%: binary-without-manpage usr/bin/vboxwebsrv
5047
%VERPKG%: binary-without-manpage usr/bin/virtualbox
48+
%VERPKG%: binary-without-manpage usr/bin/virtualboxvm
5149
%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VBoxDDRC.rc
52-
%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VBoxDD2RC.rc
5350
%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VBoxDDR0.r0
54-
%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VBoxDD2R0.r0
5551
%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VMMRC.rc
5652
%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VMMR0.r0
5753
%VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxRT.so
@@ -84,9 +80,6 @@
8480
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxHeadless.so /usr/lib/virtualbox
8581
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxKeyboard.so /usr/lib/virtualbox
8682
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxManage /usr/lib/virtualbox
87-
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxOGLhostcrutil.so /usr/lib/virtualbox
88-
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxOGLhosterrorspu.so /usr/lib/virtualbox
89-
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxOGLrenderspu.so /usr/lib/virtualbox
9083
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxPython.so /usr/lib/virtualbox
9184
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxREM.so /usr/lib/virtualbox
9285
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxREM32.so /usr/lib/virtualbox
@@ -97,7 +90,6 @@
9790
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxSVC /usr/lib/virtualbox
9891
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxSettings.so /usr/lib/virtualbox
9992
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxSharedClipboard.so /usr/lib/virtualbox
100-
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxSharedCrOpenGL.so /usr/lib/virtualbox
10193
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxSharedFolders.so /usr/lib/virtualbox
10294
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxDragAndDropSvc.so /usr/lib/virtualbox
10395
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxTestOGL /usr/lib/virtualbox
@@ -107,6 +99,7 @@
10799
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxXPCOMIPCD /usr/lib/virtualbox
108100
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxAuth.so /usr/lib/virtualbox
109101
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VirtualBox /usr/lib/virtualbox
102+
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VirtualBoxVM /usr/lib/virtualbox
110103
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VirtualBox.so /usr/lib/virtualbox
111104
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxExtPackHelperApp /usr/lib/virtualbox
112105
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/components/VBoxC.so /usr/lib/virtualbox

debian/postinst

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
#!/bin/sh
2+
# $Id$
3+
## @file
4+
# VirtualBox postinst
5+
#
6+
7+
#
8+
# Copyright (C) 2006-2019 Oracle Corporation
9+
#
10+
# This file is part of VirtualBox Open Source Edition (OSE), as
11+
# available from http://www.virtualbox.org. This file is free software;
12+
# you can redistribute it and/or modify it under the terms of the GNU
13+
# General Public License (GPL) as published by the Free Software
14+
# Foundation, in version 2 as it comes in the "COPYING" file of the
15+
# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
16+
# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
17+
#
18+
19+
# we can be called with the following arguments (6.5 of Debian policy):
20+
# configure: (our version): installing/configuring new version
21+
# abort-upgrade: (old version): upgrading to a new version failed
22+
# abort-remove: (our version): removing this package failed
23+
# abort-deconfigure: (our version): error during resolving conflicts
24+
25+
## @todo Do we really gain anything from not just executing everything
26+
## unconditionally?
27+
28+
LOG="/var/log/vbox-install.log"
29+
30+
# defaults
31+
[ -r /etc/default/virtualbox ] && . /etc/default/virtualbox
32+
33+
if [ "$1" = "configure" ]; then
34+
35+
# for debconf
36+
. /usr/share/debconf/confmodule
37+
db_version 2.0
38+
39+
# remove old cruft
40+
if [ -f /etc/init.d/vboxdrv.sh ]; then
41+
echo "Found old version of /etc/init.d/vboxdrv.sh, removing."
42+
rm /etc/init.d/vboxdrv.sh
43+
update-rc.d vboxdrv.sh remove >/dev/null
44+
fi
45+
if [ -f /etc/vbox/vbox.cfg ]; then
46+
echo "Found old version of /etc/vbox/vbox.cfg, removing."
47+
rm /etc/vbox/vbox.cfg
48+
fi
49+
50+
# create users groups (disable with INSTALL_NO_GROUP=1 in /etc/default/virtualbox)
51+
if [ "$INSTALL_NO_GROUP" != "1" ]; then
52+
db_input low virtualbox/group-vboxusers || true
53+
db_go || true
54+
addgroup --system vboxusers || true
55+
fi
56+
57+
# The starters need to be Suid root. They drop the privileges before starting
58+
# the real frontend.
59+
if test -e /usr/lib/virtualbox/VirtualBoxVM; then
60+
if ! dpkg-statoverride --list /usr/lib/virtualbox/VirtualBoxVM > /dev/null 2>&1; then
61+
chmod 4511 /usr/lib/virtualbox/VirtualBoxVM
62+
fi
63+
else
64+
if ! dpkg-statoverride --list /usr/lib/virtualbox/VirtualBox > /dev/null 2>&1; then
65+
chmod 4511 /usr/lib/virtualbox/VirtualBox
66+
fi
67+
fi
68+
if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxHeadless > /dev/null 2>&1; then
69+
chmod 4511 /usr/lib/virtualbox/VBoxHeadless
70+
fi
71+
if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxSDL > /dev/null 2>&1; then
72+
chmod 4511 /usr/lib/virtualbox/VBoxSDL
73+
fi
74+
if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxNetDHCP > /dev/null 2>&1; then
75+
chmod 4511 /usr/lib/virtualbox/VBoxNetDHCP
76+
fi
77+
if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxNetNAT > /dev/null 2>&1; then
78+
chmod 4511 /usr/lib/virtualbox/VBoxNetNAT
79+
fi
80+
if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxNetAdpCtl > /dev/null 2>&1; then
81+
chmod 4511 /usr/lib/virtualbox/VBoxNetAdpCtl
82+
fi
83+
if [ -x /usr/lib/virtualbox/VBoxVolInfo ]; then
84+
if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxVolInfo > /dev/null 2>&1; then
85+
chmod 4511 /usr/lib/virtualbox/VBoxVolInfo
86+
fi
87+
fi
88+
fi # $1 = "configure"
89+
90+
#DEBHELPER#
91+
92+
if test "${INSTALL_NO_VBOXDRV}" = 1; then
93+
POSTINST_START=--nostart
94+
else
95+
POSTINST_START=
96+
fi
97+
98+
# Install and start the new service scripts.
99+
/usr/lib/virtualbox/prerm-common.sh || true
100+
/usr/lib/virtualbox/postinst-common.sh ${POSTINST_START} > /dev/null || true
101+
102+
exit 0

debian/postinst.in

Lines changed: 0 additions & 171 deletions
This file was deleted.

debian/postrm

100644100755
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
#!/bin/sh
2+
# $Id$
3+
## @file
4+
# VirtualBox post remove.
5+
#
26

37
#
4-
# Copyright (C) 2006-2012 Oracle Corporation
8+
# Copyright (C) 2006-2019 Oracle Corporation
59
#
610
# This file is part of VirtualBox Open Source Edition (OSE), as
711
# available from http://www.virtualbox.org. This file is free software;

0 commit comments

Comments
 (0)