Skip to content
Permalink
Browse files
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
  • Loading branch information
vboxsync committed Dec 5, 2019
1 parent 51dcd6f commit 5178e479b2ac1e33454f203854de9fe8f85a9196
Show file tree
Hide file tree
Showing 16 changed files with 325 additions and 452 deletions.
@@ -482,7 +482,8 @@ endif
# Enables the audio endpoint detection on Windows hosts.
VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT = 1
# Enable PCI passthrough support.
VBOX_WITH_PCI_PASSTHROUGH = 1
# (disabled with 6.1, since it's not complete/useful enough)
VBOX_WITH_PCI_PASSTHROUGH =
# Enable statically linked dbus support.
if1of ($(KBUILD_TARGET), linux solaris)
VBOX_WITH_DBUS = 1
@@ -2312,7 +2313,7 @@ VBOX_PATH_MACOSX_SDK := $(firstword $(wildcard $(addsuffix /MacOSX$(VBOX_DEF_MAC
endif
ifdef VBOX_WITH_NEW_XCODE
if defined(VBOX_WITH_REM) && "$(VBOX_XCODE_VERSION)" >= "4.2"
$(warning Xcode $(VBOX_XCODE_VERSION) is not able to correctly build the recompiler! Please disabled it: 'VBOX_WITH_REM=')
$(warning Xcode $(VBOX_XCODE_VERSION) is not able to correctly build the recompiler! Please disable it: 'VBOX_WITH_REM=')
endif
ifdef KBUILD_USE_KOBJCACHE
$(warning KBUILD_USE_KOBJCACHE does _not_ currently work with this version of Xcode)
@@ -4,7 +4,7 @@
#

#
# Copyright (C) 2006-2017 Oracle Corporation
# Copyright (C) 2006-2019 Oracle Corporation
#
# This file is part of VirtualBox Open Source Edition (OSE), as
# available from http://www.virtualbox.org. This file is free software;
@@ -17,8 +17,10 @@ Package: virtualbox-ose
Architecture: i386 amd64
Pre-Depends: debconf (>= 1.1) | debconf-2.0
Depends: ${shlibs:Depends}, debconf (>= 0.5) | debconf-2.0, psmisc, adduser
Recommends: ${alsa}, ${pulse}, ${sdlttf},
linux-headers, gcc, make, binutils
Recommends: ${alsa}, ${pulse}, ${sdlttf}, kmod | kldutils | module-init-tools,
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,
linux-image, gcc, make | build-essential | dpkg-dev, binutils,
pdf-viewer, libgl1
Description: Oracle VM VirtualBox
VirtualBox is a powerful PC virtualization solution allowing you to run a
wide range of PC operating systems on your Linux system. This includes
@@ -29,7 +31,7 @@ XB-Python-Version: ${python:Versions}

Package: virtualbox-ose-dbg
Architecture: i386 amd64
Depends: virtualbox-ose (= ${Source-Version})
Depends: virtualbox-ose (= ${binary:Version})
Description: Oracle VM VirtualBox debugging symbols
VirtualBox is a powerful PC virtualization solution allowing you to run a
wide range of PC operating systems on your Linux system. This includes
@@ -21,14 +21,10 @@
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxSVCM.so
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/components/VBoxC.so
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxHeadless.so
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxOGLhostcrutil.so
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxOGLhosterrorspu.so
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxOGLrenderspu.so
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxPython.so
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxREM32.so
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxREM64.so
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSDL.so
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxSharedCrOpenGL.so
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VirtualBox.so
%VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDbg.so
%VERPKG%: binary-without-manpage usr/bin/VBox
@@ -40,6 +36,7 @@
%VERPKG%: binary-without-manpage usr/bin/VBoxTunctl
%VERPKG%: binary-without-manpage usr/bin/VBoxVRDP
%VERPKG%: binary-without-manpage usr/bin/VirtualBox
%VERPKG%: binary-without-manpage usr/bin/VirtualBoxVM
%VERPKG%: binary-without-manpage usr/bin/rdesktop-vrdp
%VERPKG%: binary-without-manpage usr/bin/vboxballoonctrl
%VERPKG%: binary-without-manpage usr/bin/vboxdtrace
@@ -48,10 +45,9 @@
%VERPKG%: binary-without-manpage usr/bin/vboxsdl
%VERPKG%: binary-without-manpage usr/bin/vboxwebsrv
%VERPKG%: binary-without-manpage usr/bin/virtualbox
%VERPKG%: binary-without-manpage usr/bin/virtualboxvm
%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VBoxDDRC.rc
%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VBoxDD2RC.rc
%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VBoxDDR0.r0
%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VBoxDD2R0.r0
%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VMMRC.rc
%VERPKG%: unstripped-binary-or-object usr/lib/virtualbox/VMMR0.r0
%VERPKG%: no-shlibs-control-file usr/lib/virtualbox/VBoxRT.so
@@ -84,9 +80,6 @@
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxHeadless.so /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxKeyboard.so /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxManage /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxOGLhostcrutil.so /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxOGLhosterrorspu.so /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxOGLrenderspu.so /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxPython.so /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxREM.so /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxREM32.so /usr/lib/virtualbox
@@ -97,7 +90,6 @@
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxSVC /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxSettings.so /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxSharedClipboard.so /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxSharedCrOpenGL.so /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxSharedFolders.so /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxDragAndDropSvc.so /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxTestOGL /usr/lib/virtualbox
@@ -107,6 +99,7 @@
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxXPCOMIPCD /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxAuth.so /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VirtualBox /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VirtualBoxVM /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VirtualBox.so /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/VBoxExtPackHelperApp /usr/lib/virtualbox
%VERPKG%: binary-or-shlib-defines-rpath ./usr/lib/virtualbox/components/VBoxC.so /usr/lib/virtualbox
@@ -0,0 +1,102 @@
#!/bin/sh
# $Id$
## @file
# VirtualBox postinst
#

#
# Copyright (C) 2006-2019 Oracle Corporation
#
# This file is part of VirtualBox Open Source Edition (OSE), as
# available from http://www.virtualbox.org. This file is free software;
# you can redistribute it and/or modify it under the terms of the GNU
# General Public License (GPL) as published by the Free Software
# Foundation, in version 2 as it comes in the "COPYING" file of the
# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
#

# we can be called with the following arguments (6.5 of Debian policy):
# configure: (our version): installing/configuring new version
# abort-upgrade: (old version): upgrading to a new version failed
# abort-remove: (our version): removing this package failed
# abort-deconfigure: (our version): error during resolving conflicts

## @todo Do we really gain anything from not just executing everything
## unconditionally?

LOG="/var/log/vbox-install.log"

# defaults
[ -r /etc/default/virtualbox ] && . /etc/default/virtualbox

if [ "$1" = "configure" ]; then

# for debconf
. /usr/share/debconf/confmodule
db_version 2.0

# remove old cruft
if [ -f /etc/init.d/vboxdrv.sh ]; then
echo "Found old version of /etc/init.d/vboxdrv.sh, removing."
rm /etc/init.d/vboxdrv.sh
update-rc.d vboxdrv.sh remove >/dev/null
fi
if [ -f /etc/vbox/vbox.cfg ]; then
echo "Found old version of /etc/vbox/vbox.cfg, removing."
rm /etc/vbox/vbox.cfg
fi

# create users groups (disable with INSTALL_NO_GROUP=1 in /etc/default/virtualbox)
if [ "$INSTALL_NO_GROUP" != "1" ]; then
db_input low virtualbox/group-vboxusers || true
db_go || true
addgroup --system vboxusers || true
fi

# The starters need to be Suid root. They drop the privileges before starting
# the real frontend.
if test -e /usr/lib/virtualbox/VirtualBoxVM; then
if ! dpkg-statoverride --list /usr/lib/virtualbox/VirtualBoxVM > /dev/null 2>&1; then
chmod 4511 /usr/lib/virtualbox/VirtualBoxVM
fi
else
if ! dpkg-statoverride --list /usr/lib/virtualbox/VirtualBox > /dev/null 2>&1; then
chmod 4511 /usr/lib/virtualbox/VirtualBox
fi
fi
if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxHeadless > /dev/null 2>&1; then
chmod 4511 /usr/lib/virtualbox/VBoxHeadless
fi
if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxSDL > /dev/null 2>&1; then
chmod 4511 /usr/lib/virtualbox/VBoxSDL
fi
if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxNetDHCP > /dev/null 2>&1; then
chmod 4511 /usr/lib/virtualbox/VBoxNetDHCP
fi
if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxNetNAT > /dev/null 2>&1; then
chmod 4511 /usr/lib/virtualbox/VBoxNetNAT
fi
if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxNetAdpCtl > /dev/null 2>&1; then
chmod 4511 /usr/lib/virtualbox/VBoxNetAdpCtl
fi
if [ -x /usr/lib/virtualbox/VBoxVolInfo ]; then
if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxVolInfo > /dev/null 2>&1; then
chmod 4511 /usr/lib/virtualbox/VBoxVolInfo
fi
fi
fi # $1 = "configure"

#DEBHELPER#

if test "${INSTALL_NO_VBOXDRV}" = 1; then
POSTINST_START=--nostart
else
POSTINST_START=
fi

# Install and start the new service scripts.
/usr/lib/virtualbox/prerm-common.sh || true
/usr/lib/virtualbox/postinst-common.sh ${POSTINST_START} > /dev/null || true

exit 0

This file was deleted.

6 debian/postrm 100644 → 100755
@@ -1,7 +1,11 @@
#!/bin/sh
# $Id$
## @file
# VirtualBox post remove.
#

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

0 comments on commit 5178e47

Please sign in to comment.