VirtualBox

Changeset 82441 in vbox for trunk


Ignore:
Timestamp:
Dec 5, 2019 11:16:02 PM (5 years ago)
Author:
vboxsync
Message:

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)

Location:
trunk
Files:
13 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r82326 r82441  
    483483VBOX_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)
     486VBOX_WITH_PCI_PASSTHROUGH =
    486487# Enable statically linked dbus support.
    487488if1of ($(KBUILD_TARGET), linux solaris)
    … …  
    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

  • trunk/debian/LocalConfig.kmk

    r69111 r82441  
    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

  • trunk/debian/compat

    • Property svn:eol-style set to native

  • trunk/debian/control

    • Property svn:eol-style set to native
    r67067 r82441  
    1818Pre-Depends: debconf (>= 1.1) | debconf-2.0
    1919Depends: ${shlibs:Depends}, debconf (>= 0.5) | debconf-2.0, psmisc, adduser
    20 Recommends: ${alsa}, ${pulse}, ${sdlttf},
    21   linux-headers, gcc, make, binutils
     20Recommends: ${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
    2224Description: Oracle VM VirtualBox
    2325 VirtualBox is a powerful PC virtualization solution allowing you to run a
    … …  
    3032Package: virtualbox-ose-dbg
    3133Architecture: i386 amd64
    32 Depends: virtualbox-ose (= ${Source-Version})
     34Depends: virtualbox-ose (= ${binary:Version})
    3335Description: Oracle VM VirtualBox debugging symbols
    3436 VirtualBox is a powerful PC virtualization solution allowing you to run a

  • trunk/debian/dirs

    • Property svn:eol-style set to native

  • trunk/debian/lintian-override.in

    r63946 r82441  
    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
    … …  
    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
    … …  
    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
    … …  
    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
    … …  
    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
    … …  
    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

  • trunk/debian/postinst

    • Property svn:eol-style set to LF
    • Property svn:executable set to *
    • Property svn:keywords set to Author Date Id Revision
    r82440 r82441  
    11#!/bin/sh
     2# $Id$
     3## @file
     4# VirtualBox postinst
    25#
    3 # Copyright (C) 2006-2012 Oracle Corporation
     6
     7#
     8# Copyright (C) 2006-2019 Oracle Corporation
    49#
    510# This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1823#  abort-deconfigure: (our version): error during resolving conflicts
    1924
    20 #include installer-common.sh
     25## @todo Do we really gain anything from not just executing everything
     26##       unconditionally?
    2127
    2228LOG="/var/log/vbox-install.log"
    … …  
    4955  fi
    5056
    51   # install udev rule (disable with INSTALL_NO_UDEV=1 in
    52   # /etc/default/virtualbox) and /dev/vboxdrv and /dev/vboxusb/*/* device nodes
    53   install_device_node_setup root 0600 /usr/share/virtualbox "${usb_group}"
    54 
    5557  # The starters need to be Suid root. They drop the privileges before starting
    5658  # the real frontend.
    57   if ! dpkg-statoverride --list /usr/lib/virtualbox/VirtualBox > /dev/null 2>&1; then
    58     chmod 4511 /usr/lib/virtualbox/VirtualBox
     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
    5967  fi
    6068  if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxHeadless > /dev/null 2>&1; then
    … …  
    7886    fi
    7987  fi
    80 
    81   # if INSTALL_NO_VBOXDRV is set to 1, remove all shipped modules
    82   if [ "$INSTALL_NO_VBOXDRV" = "1" ]; then
    83     rm -f /lib/modules/*/misc/vboxdrv.ko
    84     rm -f /lib/modules/*/misc/vboxnetflt.ko
    85     rm -f /lib/modules/*/misc/vboxnetadp.ko
    86   fi
    87 
    8888fi # $1 = "configure"
    8989
    9090#DEBHELPER#
    9191
    92 if [ "$1" = "configure" ]; then
    93   # Start vboxdrv/vboxballoonctrl/vboxweb-service manually as we use our own error handling in postrm
    94   if [ -x "/etc/init.d/vboxdrv" ]; then
    95     update-rc.d vboxdrv defaults 20 80 >/dev/null
     92if test "${INSTALL_NO_VBOXDRV}" = 1; then
     93  POSTINST_START=--nostart
     94else
     95  POSTINST_START=
     96fi
    9697
    97     BUILD_MODULES=0
    98     REGISTER_MODULES=1
    99     # Disable module compilation with INSTALL_NO_VBOXDRV=1 in /etc/default/virtualbox
    100     if [ ! -f /lib/modules/`uname -r`/misc/vboxdrv.ko ]; then
    101       REGISTER_MODULES=0
    102       if [ "$INSTALL_NO_VBOXDRV" != "1" ]; then
    103         db_get virtualbox/module-compilation-allowed
    104         if [ "$RET" = "false" ]; then
    105           cat << EOF
    106 Unable to find a precompiled module for the current kernel
    107 though module compilation denied by debconf setting.
    108 EOF
    109         else
    110           db_input low virtualbox/module-compilation-allowed || true
    111           db_go || true
    112           db_get virtualbox/module-compilation-allowed
    113           if [ "$RET" = "true" ]; then
    114             BUILD_MODULES=1
    115           fi
    116         fi
    117       fi
    118     fi
    119 
    120     if [ $BUILD_MODULES -eq 1 ]; then
    121       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
    122         invoke-rc.d vboxdrv setup || true
    123       else
    124         /etc/init.d/vboxdrv setup || true
    125       fi
    126     else
    127       # shipped modules found, register sources at DKMS anyway
    128       if lsmod | grep -q "vboxdrv[^_-]"; then
    129         /etc/init.d/vboxdrv stop || true
    130       fi
    131       if [ $REGISTER_MODULES -eq 1 ]; then
    132         DKMS=`which dkms 2>/dev/null`
    133         if [ -n "$DKMS" ]; then
    134           $DKMS add -m vboxhost -v %VER% > /dev/null 2>&1 || true
    135         fi
    136       fi
    137       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
    138         invoke-rc.d vboxdrv start || exit $?
    139       else
    140         /etc/init.d/vboxdrv start || exit $?
    141       fi
    142     fi
    143   fi
    144   if [ -x "/etc/init.d/vboxballoonctrl-service" ]; then
    145     update-rc.d vboxballoonctrl-service defaults 35 65 >/dev/null
    146     if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
    147         invoke-rc.d vboxballoonctrl-service start || exit $?
    148     else
    149         /etc/init.d/vboxballoonctrl-service start || exit $?
    150     fi
    151   fi
    152   if [ -x "/etc/init.d/vboxautostart-service" ]; then
    153     update-rc.d vboxautostart-service defaults 35 65 >/dev/null
    154     if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
    155         invoke-rc.d vboxautostart-service start || exit $?
    156     else
    157         /etc/init.d/vboxautostart-service start || exit $?
    158     fi
    159   fi
    160   if [ -x "/etc/init.d/vboxweb-service" ]; then
    161     update-rc.d vboxweb-service defaults 35 65 >/dev/null
    162     if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
    163         invoke-rc.d vboxweb-service start || exit $?
    164     else
    165         /etc/init.d/vboxweb-service start || exit $?
    166     fi
    167   fi
    168 
    169 fi # $1 = "configure"
     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
    170101
    171102exit 0

  • trunk/debian/postrm

    • Property svn:eol-style changed from native to LF
    • Property svn:executable set to *
    r44528 r82441  
    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

  • trunk/debian/preinst

    • Property svn:eol-style set to LF
    • Property svn:executable set to *
    • Property svn:keywords set to Author Date Id Revision
    r82440 r82441  
    11#!/bin/bash
     2# $Id$
     3## @file
     4# VirtualBox pre-install.
    25#
    3 # Copyright (C) 2006-2012 Oracle Corporation
     6
     7#
     8# Copyright (C) 2006-2019 Oracle Corporation
    49#
    510# This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2631  db_capb backup
    2732
    28   # check for active VMs
    29   VBOXSVC_PID=`pidof VBoxSVC 2> /dev/null || true`
    30   if [ -n "$VBOXSVC_PID" ]; then
    31     if [ -f /etc/init.d/vboxballoonctrl-service ]; then
    32       # try graceful termination; terminate the ballon control service first
    33       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
    34         invoke-rc.d vboxballoonctrl-service stop || true
    35       else
    36         /etc/init.d/vboxballoonctrl-service stop || true
    37       fi
    38     fi
    39     if [ -f /etc/init.d/vboxweb-service ]; then
    40       # try graceful termination; terminate the webservice first
    41       if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
    42         invoke-rc.d vboxweb-service stop || true
    43       else
    44         /etc/init.d/vboxweb-service stop || true
    45       fi
    46     fi
    47     kill -USR1 $VBOXSVC_PID
    48     sleep 1
    49     if pidof VBoxSVC > /dev/null 2>&1; then
    50       db_fset virtualbox/old-running seen false || true
    51       db_input critical virtualbox/old-running || true
    52       db_go || true
    53       exit 1
    54     fi
    55   fi
    56 
    5733  # check for old installation
    5834  if [ -r /etc/vbox/vbox.cfg ]; then
    … …  
    6743  fi
    6844
    69   # check for old vboxdrv modules
    70   if [ "$INSTALL_NO_VBOXDRV" != "1" ]; then
    71     if find /lib/modules -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then
    72       # old modules found
    73       db_get virtualbox/delete-old-modules || true
    74       if [ "$RET" = "false" ]; then
    75         cat << EOF
    76 Old vboxdrv kernel modules found in
    77 EOF
    78         find /lib/modules -name "vboxdrv\.*" 2>/dev/null|sed "s+\(.*\)+  \1+g"
    79         cat << EOF
    80 Removing of these modules denied by debconf setting
    81 EOF
    82       else
    83         db_input low virtualbox/delete-old-modules || true
    84         db_go || true
    85         db_get virtualbox/delete-old-modules || true
    86         if [ "$RET" = "true" ]; then
    87           find /lib/modules -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null
    88           find /lib/modules -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null
    89           find /lib/modules -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null
    90         fi
    91       fi
     45  # check for active VMs
     46  # Execute the installed package's pre-uninstaller if present.
     47  /usr/lib/virtualbox/prerm-common.sh 2>/dev/null || true
     48  # Stop services from older versions without pre-uninstaller.
     49  invoke-rc.d vboxballoonctrl-service stop 2>/dev/null || true
     50  /etc/init.d/vboxballoonctrl-service stop 2>/dev/null || true
     51  invoke-rc.d vboxautostart-service stop 2>/dev/null || true
     52  /etc/init.d/vboxautostart-service stop 2>/dev/null || true
     53  invoke-rc.d vboxweb-service stop 2>/dev/null || true
     54  /etc/init.d/vboxweb-service stop 2>/dev/null || true
     55  VBOXSVC_PID=`pidof VBoxSVC 2>/dev/null || true`
     56  if [ -n "$VBOXSVC_PID" ]; then
     57    # ask the daemon to terminate immediately
     58    kill -USR1 $VBOXSVC_PID
     59    sleep 1
     60    if pidof VBoxSVC > /dev/null 2>&1; then
     61      db_fset virtualbox/old-running seen false || true
     62      db_input critical virtualbox/old-running || true
     63      db_go || true
     64      exit 1
    9265    fi
    9366  fi

  • trunk/debian/prerm

    • Property svn:eol-style changed from native to LF
    • Property svn:executable set to *
    r82440 r82441  
    11#!/bin/sh
     2# $Id$
     3## @file
     4# VirtualBox pre-removal.
     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
    … …  
    1721#  failed-upgrade:   (our version): failed to upgrade
    1822#  remove:           (our version): remove this package
    19 #  purge:            (our version): purge this package
    2023#  deconfigure:      (our version): removing conflicting version
    2124
    … …  
    2730[ -r /etc/default/virtualbox ] && . /etc/default/virtualbox
    2831
    29 if [ "$1" = "upgrade" -o "$1" = "remove" -o "$1" = "failed-upgrade" ]; then
    30   . /usr/share/debconf/confmodule
    31   db_version 2.0
    32   db_capb backup
     32. /usr/share/debconf/confmodule
     33db_version 2.0
     34db_capb backup
    3335
    34   # check for active VMs
    35   VBOXSVC_PID=`pidof VBoxSVC 2>/dev/null`
    36   if [ -n "$VBOXSVC_PID" ]; then
    37     # try graceful termination; terminate the balloon control servic first
    38     if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
    39       invoke-rc.d vboxballoonctrl-service stop || true
    40     else
    41       /etc/init.d/vboxballoonctrl-service stop || true
    42     fi
    43     # try graceful termination; terminate the webservice first
    44     if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
    45       invoke-rc.d vboxweb-service stop || true
    46     else
    47       /etc/init.d/vboxweb-service stop || true
    48     fi
    49     kill -USR1 $VBOXSVC_PID
    50     sleep 1
    51     if pidof VBoxSVC > /dev/null 2>&1; then
    52       if [ "$1" != "failed-upgrade" ]; then
    53         db_fset virtualbox/old-running seen false || true
    54         db_input critical virtualbox/old-running || true
    55         db_go || true
    56       fi
    57       exit 1
    58     fi
     36if ! /usr/lib/virtualbox/prerm-common.sh > /dev/null 2>&1; then
     37  if [ "$1" != "failed-upgrade" ]; then
     38    db_fset virtualbox/old-running seen false || true
     39    db_input critical virtualbox/old-running || true
     40    db_go || true
    5941  fi
    60 fi
    61 
    62 # make sure we de-register the DMKS modules before the files get removed
    63 if [ "$1" = "upgrade" -o "$1" = "remove" -o "$1" = "deconfigure" ]; then
    64   DKMS=`which dkms 2>/dev/null`
    65   if [ -n "$DKMS" ]; then
    66     $DKMS remove -m vboxhost -v %VER% --all > /dev/null 2>&1 || true
    67   fi
    68 fi
    69 
    70 # stop vboxnet/vboxdrv manually as we use our own error handling in postrm
    71 if [ -x "/etc/init.d/vboxdrv" ]; then
    72   if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
    73     invoke-rc.d vboxdrv stop || exit $?
    74   else
    75     /etc/init.d/vboxdrv stop || exit $?
    76   fi
    77 fi
    78 if [ -x "/etc/init.d/vboxnet" ]; then
    79   if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
    80     invoke-rc.d vboxnet stop || exit $?
    81   else
    82     /etc/init.d/vboxnet stop || exit $?
    83   fi
     42  exit 1
    8443fi
    8544

  • trunk/debian/rules

    • Property svn:eol-style set to LF
    • Property svn:keywords set to Author Date Id Revision
    r68922 r82441  
    11#!/usr/bin/make -f
     2# $Id$
     3## @file
     4# VirtualBox rules.
    25#
    3 # Copyright (C) 2006-2012 Oracle Corporation
     6
     7#
     8# Copyright (C) 2006-2019 Oracle Corporation
    49#
    510# This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    1318
    1419#export DH_VERBOSE=1
    15 export DH_COMPAT=4
     20export DH_COMPAT=5
    1621
    1722# possible overrides:
    … …  
    4954NOWEBSVC ?= $(ose)
    5055NOWINE   := $(if $(NODOCS),$(if $(STAGEDISO),1,),)$(ose)
     56PYTHON   := $(firstword $(shell which python) $(shell which python3))
    5157
    5258ifneq ($(wildcard $(verfile)),)
    … …  
    7884             VBOX_WITHOUT_EXTPACK_PUEL_PACKING=1 \
    7985             VBOX_WITHOUT_EXTPACK_VNC_PACKING=1 \
    80              $(if $(filter _Debian_squeeze _Ubuntu_lucid,$(debrel)),,VBOX_WITH_VMSVGA3D=1) \
     86             VBOX_WITH_VMSVGA3D=1 \
    8187             VBOX_DO_STRIP= \
    82              VBOX_WITH_MULTIVERSION_PYTHON= \
    8388             VBOX_PATH_PACKAGE_DOCS="\"/usr/share/doc/$(verpkg)\"" \
    8489             $(if $(ose),,VBOX_WITH_DOCS_CHM=1) \
    … …  
    118123        rm -rf $(moddir)
    119124        mkdir $(moddir)
    120         make -C $(builddir)/bin/src/vboxdrv clean
    121125        for d in $(wildcard /lib/modules/*); do \
    122126            if [ -L $$d/build ]; then \
    123127                make -C $(builddir)/bin/src/vboxdrv KERN_VER=$$(basename $$d) clean && \
    124                 make -j4 -C $(builddir)/bin/src/vboxdrv KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all \
     128                make -j4 -C $(builddir)/bin/src/vboxdrv KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all; \
    125129                make -C $(builddir)/bin/src/vboxnetflt KERN_VER=$$(basename $$d) clean && \
    126130                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetflt || true) && \
    127                 make -j4 -C $(builddir)/bin/src/vboxnetflt KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all \
     131                make -j4 -C $(builddir)/bin/src/vboxnetflt KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all; \
    128132                make -C $(builddir)/bin/src/vboxnetadp KERN_VER=$$(basename $$d) clean && \
    129133                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetadp || true) && \
    130                 make -j4 -C $(builddir)/bin/src/vboxnetadp KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all \
     134                make -j4 -C $(builddir)/bin/src/vboxnetadp KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all; \
    131135                make -C $(builddir)/bin/src/vboxpci KERN_VER=$$(basename $$d) clean && \
    132136                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxpci || true) && \
    133                 make -j4 -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all \
     137                make -j4 -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all; true; \
    134138            fi; \
    135139        done
    … …  
    137141        make -C $(builddir)/bin/src/vboxnetflt clean
    138142        make -C $(builddir)/bin/src/vboxnetadp clean
    139         make -C $(builddir)/bin/src/vboxpci clean
     143        make -C $(builddir)/bin/src/vboxpci clean; true
    140144        touch debian/modules-stamp
    141145
    … …  
    143147        dh_testdir
    144148        dh_testroot
    145         rm -f debian/preinst debian/postinst debian/prerm
    146         rm -f debian/$(package).init debian/vboxdrv.init
    147         rm -f debian/vboxballoonctrl-service.init debian/vboxautostart-service.init debian/vboxweb-service.init
    148149        rm -f debian/AutoConfig.kmk debian/configure.log debian/env.sh
    149150        rm -f debian/modules-stamp debian/build-stamp debian/configure-stamp
    … …  
    165166        dh_installdirs
    166167        tar -xC $(prefix)/opt -f $(builddir)/bin/VirtualBox.tar
     168        install -d -g 0 -o 0 $(prefix)/usr/share/applications
     169        install -d -g 0 -o 0 $(prefix)/usr/lib
     170        install -d -g 0 -o 0 $(prefix)/usr/bin
     171        install -d -g 0 -o 0 $(prefix)/usr/share/$(package)
     172        install -d -g 0 -o 0 $(prefix)/usr/share/doc/$(verpkg)
     173        $(if $(NOQT),,mv $(archdir)/virtualbox.desktop \
     174           $(prefix)/usr/share/applications/virtualbox.desktop)
     175        install -d -g 0 -o 0 $(prefix)/usr/share/pixmaps
     176        $(if $(NOQT),,install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor)
     177        $(if $(NOQT),,cp $(archdir)/icons/128x128/virtualbox.png \
     178           $(prefix)/usr/share/pixmaps/virtualbox.png)
     179        $(if $(NOQT),,mv $(archdir)/nls $(prefix)/usr/share/$(package))
     180        $(if $(NOQT),,cd $(archdir)/icons; for i in *; do \
     181            for j in $$i/virtualbox.*; do \
     182                if [ -f $$j ]; then \
     183                    if [ ! -d $(prefix)/usr/share/icons/hicolor/$$i/apps ]; then \
     184                        install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/apps; \
     185                    fi; \
     186                    mv $$j $(prefix)/usr/share/icons/hicolor/$$i/apps; \
     187                fi; \
     188            done; \
     189            install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/mimetypes; \
     190            mv $$i/* $(prefix)/usr/share/icons/hicolor/$$i/mimetypes || true; \
     191            rmdir $$i; \
     192        done)
     193        $(if $(NOQT),,rmdir $(archdir)/icons)
    167194        $(if $(NOQT),,mv $(archdir)/virtualbox.xml debian/$(verpkg).sharedmimeinfo)
    168         $(archdir)/scripts/install.sh --package $(package) --root $(prefix) \
    169             --prefix /usr $(if $(NOQT),--no-qt) $(if $(ose),--ose) \
    170             $(if $(HEADLESS),--headless) $(if $(NOWEBSVC),--no-web-service) \
    171             --install-folder /lib/$(package) --no-helpers
    172         install -d -g 0 -o 0 $(prefix)/usr/share/doc/$(verpkg)
    173195        install -d -g 0 -o 0 $(prefix)/usr/share/lintian/overrides
    174196        sed \
    … …  
    176198            debian/lintian-override.in > \
    177199           $(prefix)/usr/share/lintian/overrides/$(verpkg)
     200        mv $(archdir)/VBox.png \
     201           $(prefix)/usr/share/pixmaps/VBox.png
     202        mv $(archdir)/src  $(prefix)/usr/share/$(package)
     203        rm $(archdir)/VBox.sh
     204        install -D -g 0 -o 0 -m 644 $(vboxroot)/src/VBox/Installer/linux/VBox.sh $(prefix)/usr/bin/VBox
     205        mv $(archdir)/VBoxSysInfo.sh $(prefix)/usr/share/$(package)
     206        if [ -r $(archdir)/VBoxDTrace ]; then \
     207            mv $(archdir)/VBoxDTrace $(prefix)/usr/bin; \
     208        fi
     209        mv $(archdir)/VBoxTunctl $(prefix)/usr/bin
    178210        $(if $(NOMODS),,for d in $(moddir)/*; do \
    179             if [ -f $$d/vboxdrv.ko -a -f $$d/vboxnetflt.ko -a -f $$d/vboxnetadp.ko -a -f $$d/vboxpci.ko ]; then \
     211            if [ -f $$d/vboxdrv.ko -a -f $$d/vboxnetflt.ko -a -f $$d/vboxnetadp.ko ]; then \
    180212                install -D -g 0 -o 0 -m 0644 \
    181213                    $$d/vboxdrv.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxdrv.ko; \
    … …  
    184216                install -D -g 0 -o 0 -m 0644 \
    185217                    $$d/vboxnetadp.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxnetadp.ko; \
    186                 install -D -g 0 -o 0 -m 0644 \
    187                     $$d/vboxpci.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxpci.ko; \
     218                if [ -f $$d/vboxpci.ko ]; then \
     219                    install -D -g 0 -o 0 -m 0644 \
     220                        $$d/vboxpci.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxpci.ko; \
     221                fi \
    188222            fi \
    189223            done)
    … …  
    194228        rm $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.chm \
    195229            LICENSE)
     230        for i in rdesktop-vrdp.tar.gz additions/VBoxGuestAdditions.iso; do \
     231            mv $(archdir)/$$i $(prefix)/usr/share/$(package); done
     232        $(if $(HEADLESS),,mv $(archdir)/rdesktop-vrdp $(prefix)/usr/bin)
     233        $(if $(HEADLESS),,mv $(archdir)/rdesktop-vrdp-keymaps $(prefix)/usr/share/$(package))
    196234else
    197235        dh_installdocs \
    198236            $(archdir)/UserManual*.pdf
    199237        rm $(addprefix $(archdir)/,UserManual*.pdf)
     238        for i in additions/VBoxGuestAdditions.iso; do \
     239            mv $(archdir)/$$i $(prefix)/usr/share/$(package); done
    200240endif
    201241        mv $(archdir) $(prefix)/usr/lib/$(package)
     242        if [ -f $(prefix)/usr/lib/$(package)/libQt5CoreVBox.so.5 ]; then \
     243            ../../../../tools/linux.$(chrarch)/bin/chrpath \
     244                --keepgoing --replace /usr/lib/$(package) \
     245                $(prefix)/usr/lib/$(package)/*.so.5 \
     246                $(prefix)/usr/lib/$(package)/plugins/platforms/*.so; \
     247                $(prefix)/usr/lib/$(package)/plugins/xcbglintegrations/*.so; \
     248            echo "[Paths]" > $(prefix)/usr/lib/$(package)/qt.conf; \
     249            echo "Plugins = /usr/lib/$(package)/plugins" >> $(prefix)/usr/lib/$(package)/qt.conf; \
     250        fi
     251        export VBOX_INSTALL_PATH=/usr/lib/$(package) && \
     252            cd $(builddir)/bin/sdk/installer && \
     253            $(PYTHON) ./vboxapisetup.py install --root $(prefix)
     254        rm -rf $(prefix)/usr/lib/$(package)/sdk/installer
    202255        ln -s ../VBoxVMM.so $(prefix)/usr/lib/$(package)/components/VBoxVMM.so
    203256        rmdir $(prefix)/opt
     257        dh_link \
     258            $(if $(NOQT),,usr/bin/VBox          usr/bin/VirtualBox) \
     259            $(if $(NOQT),,usr/bin/VBox          usr/bin/virtualbox) \
     260            $(if $(NOQT),,usr/bin/VBox          usr/bin/VirtualBoxVM) \
     261            $(if $(NOQT),,usr/bin/VBox          usr/bin/virtualboxvm) \
     262            usr/bin/VBox                        usr/bin/VBoxManage \
     263            usr/bin/VBox                        usr/bin/vboxmanage \
     264            $(if $(HEADLESS),,usr/bin/VBox      usr/bin/VBoxSDL) \
     265            $(if $(HEADLESS),,usr/bin/VBox      usr/bin/vboxsdl) \
     266            $(if $(ose),,usr/bin/VBox           usr/bin/VBoxVRDP) \
     267            usr/bin/VBox                        usr/bin/VBoxHeadless \
     268            usr/bin/VBox                        usr/bin/vboxheadless \
     269            usr/bin/VBox                        usr/bin/VBoxBugReport \
     270            usr/bin/VBox                        usr/bin/vboxbugreport \
     271            usr/bin/VBox                        usr/bin/VBoxBalloonCtrl \
     272            usr/bin/VBox                        usr/bin/vboxballoonctrl \
     273            usr/bin/VBox                        usr/bin/VBoxAutostart \
     274            usr/bin/VBox                        usr/bin/vboxautostart \
     275            $(if $(NOWEBSVC),,usr/bin/VBox      usr/bin/vboxwebsrv) \
     276            $(if $(NOVBOXIMG),,usr/lib/virtualbox/vbox-img usr/bin/vbox-img) \
     277            $(if $(NOVBOXIMGMOUNT),,usr/lib/virtualbox/vboximg-mount usr/bin/vboximg-mount) \
     278            usr/share/virtualbox/src/vboxhost   usr/src/vboxhost-$(ver)
    204279        $(if $(NOMODS),,dh_installmodules)
    205         sed \
    206             -e 's|%NOLSB%||g' \
    207             -e 's|%DEBIAN%|yes|g' \
    208             -e 's|%PACKAGE%|virtualbox|g' \
    209             -e "s|%VERSION%|$(VBOX_VERSION_STRING)|g" \
    210             -e "s|%GROUP%|$(if $(VBOX_WITHOUT_HARDENING),vboxusers,root)|g" \
    211             $(vboxroot)/src/VBox/Installer/linux/vboxdrv.sh.in > debian/vboxdrv.init
    212         dh_installinit --name=vboxdrv --noscripts
    213         cp $(vboxroot)/src/VBox/Installer/linux/vboxballoonctrl-service.sh debian/vboxballoonctrl-service.init
    214         dh_installinit --name=vboxballoonctrl-service --noscripts
    215         cp $(vboxroot)/src/VBox/Installer/linux/vboxautostart-service.sh debian/vboxautostart-service.init
    216         dh_installinit --name=vboxautostart-service --noscripts
    217         cp $(vboxroot)/src/VBox/Installer/linux/vboxweb-service.sh debian/vboxweb-service.init
    218         dh_installinit --name=vboxweb-service --noscripts
    219         sed -e 's|%VER%|$(ver)|g' \
    220             debian/preinst.in > debian/preinst
    221         sed -e 's|%VER%|$(ver)|g' \
    222             debian/prerm.in > debian/prerm
    223         sed -e 's|%VER%|$(ver)|g' \
    224             -e '/#include installer-common.sh/ {' \
    225             -e "r $(vboxroot)/src/VBox/Installer/linux/installer-common.sh" \
    226             -e 'd' \
    227             -e '}' \
    228             debian/postinst.in > debian/postinst
    229280        dh_installdebconf
    230281        dh_installchangelogs
    … …  
    236287            $(addprefix --exclude=lib,$(addsuffix VBox.so.5,\
    237288              Qt5Core Qt5Gui Qt5Widgets Qt5PrintSupport Qt5OpenGL Qt5DBus Qt5XcbQpa Qt5X11Extras)) \
    238             --exclude=libqxcb.so
    239 endif
    240         mkdir -p $(current)/debian/$(verpkg)-dbg/usr/lib
     289            --exclude=libqxcb.so --exclude=libqxcb-glx-integration.so
     290endif
     291        mkdir -p $(current)/debian/$(verpkg)-dbg/usr/lib/$(package)
     292        mv $(prefix)/usr/lib/$(package)/*.debug $(current)/debian/$(verpkg)-dbg/usr/lib/$(package)
    241293ifeq ($(DEBUG),)
    242         mv $(current)/debian/$(verpkg)/usr/lib/debug $(current)/debian/$(verpkg)-dbg/usr/lib
     294        mv $(prefix)/usr/lib/debug $(current)/debian/$(verpkg)-dbg/usr/lib
    243295endif
    244296        $(firstword $(shell which dh_python2) $(shell which dh_python3))
    … …  
    248300        dh_installdeb
    249301        dh_perl
    250         LD_LIBRARY_PATH=$(prefix)/usr/lib/virtualbox dh_shlibdeps
     302        # for some reason, the Qt libraries couldn't be found on newer releases (e.g. Ubuntu hardy)
     303        LD_LIBRARY_PATH=$(prefix)/usr/lib/virtualbox dh_shlibdeps --exclude=VBoxPython
    251304        dh_gencontrol -- \
    252305          -Valsa=$(if $(HEADLESS),,libasound2) \

  • trunk/debian/templates

    • Property svn:eol-style set to native
    r34319 r82441  
    1717 by 'uname -r') and execute
    1818   
    19    /etc/init.d/vboxdrv setup
     19   /sbin/vboxconfig
    2020   
    2121 as root.
    … …  
    2828 'uname -r' herausfinden können) und führen Sie danach
    2929   
    30    /etc/init.d/vboxdrv setup
     30   /sbin/vboxconfig
    3131   
    3232 mit Root-Rechten aus.
    33 
    34 Template: virtualbox/module-compilation-allowed
    35 Type: boolean
    36 Default: true
    37 Description: Should the vboxdrv kernel module be compiled now?
    38  Unable to find a precompiled module for the current kernel!
    39  .
    40  Without a suitable kernel module you will not be able to start any VMs. It is
    41  strongly recommended that you compile a kernel module now. This requires
    42  kernel headers and the tools to build kernel modules (gcc, make, binutils, ...).
    43  However if you know that a suitable kernel module already exists at another
    44  location, you might want to override the default by setting
    45  KDIR=<full_path_to_vboxdrv_module> in /etc/default/virtualbox. You can also
    46  build the module later by executing
    47    
    48    /etc/init.d/vboxdrv setup
    49    
    50  as root.
    51 Description-de.UTF-8: Soll das Kernmodul jetzt compiliert werden?
    52  Es konnte kein Kernmodul für den aktuellen Linux-Kern gefunden werden!
    53  .
    54  Ohne ein passendes Kernmodul können Sie keine VM starten. Daher sollten Sie
    55  jetzt ein Kernmodul compilieren. Dazu werden die Kern-Header und die Programme
    56  zum Bauen eines Kernmoduls (gcc, make, binutils, ...) benötigt. Falls Sie
    57  bereits ein passendes Kernmodul in ein anderes Verzeichnis installiert haben,
    58  können Sie den Verzeichnisnamen durch Hinzufügen von KDIR=<voller_Pfad_zu_vboxdrv>
    59  in der Datei /etc/default/virtualbox angeben. Sie können das Kernmodul auch
    60  später compilieren, indem Sie
    61    
    62    /etc/init.d/vboxdrv setup
    63    
    64  mit Root-Rechten ausführen.
    65 
    66 Template: virtualbox/delete-old-modules
    67 Type: boolean
    68 Default: true
    69 Description: Delete old vboxdrv kernel modules?
    70  Old vboxdrv kernel modules found. You should remove these modules as they
    71  might interfere with this version of VirtualBox. You can force re-compilation
    72  of the module later by executing
    73    
    74    /etc/init.d/vboxdrv setup
    75    
    76  as root.
    77 Description-de.UTF-8: Alte Kernmodule löschen?
    78  Es wurden alte vboxdrv-Kernmodule gefunden. Diese sollten gelöscht werden, da sie
    79  eventuell nicht mit dieser Version von VirtualBox zusammen arbeiten. Das Compilieren
    80  des Kernmoduls können Sie später durch
    81    
    82    /etc/init.d/vboxdrv setup
    83    
    84  erzwingen.
    8533
    8634Template: virtualbox/old-installation-found

  • trunk/doc/manual/user_ChangeLogImpl.xml

    r82106 r82441  
    4646      <listitem>
    4747        <para>
     48          Linux host: Drop PCI passthrough, the current code is too incomplete
     49          (cannot handle PCIe devices at all), i.e. not useful enough
     50        </para>
     51      </listitem>
     52
     53      <listitem>
     54        <para>
    4855        </para>
    4956      </listitem>

  • trunk/src/VBox/Installer/linux/debian/control

    r81495 r82441  
    44Maintainer: Oracle Corporation <[email protected]>
    55Standards-Version: 3.2.1
    6 Build-Depends: debhelper (>= 5), libz-dev, libssl-dev, 
     6Build-Depends: debhelper (>= 5), libz-dev, libssl-dev,
    77  libsdl1.2-dev, uuid-dev, libxcursor-dev,
    88  libidl-dev, libpam0g-dev, iasl, xsltproc, linux-headers-generic,
    99  wine, java2-runtime, lsb-release, g++-multilib [amd64],
    1010  libc6-dev-i386 [amd64], ia32-libs [amd64], libasound-dev,
    11   libpulse-dev, libxml2-dev, python-dev,
     11  libpulse-dev, libxml2-dev, python-dev, gsoap,
    1212  libcap2-dev, libgl1-mesa-dev, libglu1-mesa-dev, libxmu-dev,
    1313  libxext-dev, libcurl-dev, libxrandr-dev, openjdk-6-jdk | sun-java6-jdk

  • trunk/src/VBox/Installer/linux/debian/rules

    r81386 r82441  
    6464-include $(vboxroot)/SVN_REVISION
    6565svnrev   :=$(if $(svn_revision),$(svn_revision),)
    66 
    6766NOMODS   ?= $(ose)
    6867NOQT     ?= $(HEADLESS)
    … …  
    107106             $(if $(NOWEBSVC),,$(if $(ose),--enable-webservice,)) \
    108107             $(if $(VNC),--enable-vnc,) \
    109              --disable-extpack \
    110              $(if $(filter DEBIAN_7_0,$(debdist)),--build-libopus,)
     108             --disable-extpack
    111109
    112110bld_flags := AUTOCFG=$(current)/debian/AutoConfig.kmk \
    … …  
    167165                make -C $(builddir)/bin/src/vboxpci KERN_VER=$$(basename $$d) clean && \
    168166                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxpci || true) && \
    169                 make -j4 -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all; \
    170                 make -C $(builddir)/bin/src/vboxdrv KERN_VER=$$(basename $$d) clean; \
    171                 make -C $(builddir)/bin/src/vboxnetflt KERN_VER=$$(basename $$d) clean; \
    172                 make -C $(builddir)/bin/src/vboxnetadp KERN_VER=$$(basename $$d) clean; \
    173                 make -C $(builddir)/bin/src/vboxpci KERN_VER=$$(basename $$d) clean; \
     167                make -j4 -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all; true; \
    174168            fi; \
    175169        done
     170        make -C $(builddir)/bin/src/vboxdrv clean
     171        make -C $(builddir)/bin/src/vboxnetflt clean
     172        make -C $(builddir)/bin/src/vboxnetadp clean
     173        make -C $(builddir)/bin/src/vboxpci clean; true
    176174        touch debian/modules-stamp
    177175
    … …  
    212210        $(if $(NOQT),,mv $(archdir)/nls $(prefix)/usr/share/$(package))
    213211        $(if $(NOQT),,cd $(archdir)/icons; for i in *; do \
    214         for j in $$i/virtualbox.*; do \
     212            for j in $$i/virtualbox.*; do \
    215213                if [ -f $$j ]; then \
    216214                    if [ ! -d $(prefix)/usr/share/icons/hicolor/$$i/apps ]; then \
    … …  
    235233        mv $(archdir)/src  $(prefix)/usr/share/$(package)
    236234        rm $(archdir)/VBox.sh
    237         install -D -g 0 -o 0 -m 644 VBox.sh $(prefix)/usr/bin/VBox
     235        install -D -g 0 -o 0 -m 644 $(vboxroot)/src/VBox/Installer/linux/VBox.sh $(prefix)/usr/bin/VBox
    238236        mv $(archdir)/VBoxSysInfo.sh $(prefix)/usr/share/$(package)
    239237        if [ -r $(archdir)/VBoxDTrace ]; then \
    … …  
    242240        mv $(archdir)/VBoxTunctl $(prefix)/usr/bin
    243241        $(if $(NOMODS),,for d in $(moddir)/*; do \
    244             if [ -f $$d/vboxdrv.ko -a -f $$d/vboxnetflt.ko -a -f $$d/vboxnetadp.ko -a -f $$d/vboxpci.ko ]; then \
     242            if [ -f $$d/vboxdrv.ko -a -f $$d/vboxnetflt.ko -a -f $$d/vboxnetadp.ko ]; then \
    245243                install -D -g 0 -o 0 -m 0644 \
    246244                    $$d/vboxdrv.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxdrv.ko; \
    … …  
    249247                install -D -g 0 -o 0 -m 0644 \
    250248                    $$d/vboxnetadp.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxnetadp.ko; \
    251                 install -D -g 0 -o 0 -m 0644 \
    252                     $$d/vboxpci.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxpci.ko; \
     249                if [ -f $$d/vboxpci.ko ]; then \
     250                    install -D -g 0 -o 0 -m 0644 \
     251                        $$d/vboxpci.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxpci.ko; \
     252                fi \
    253253            fi \
    254254            done)

  • trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

    r81386 r82441  
    142142      KBUILD_VERBOSE= KERN_VER=$(basename $d) INSTALL_MODULE_PATH=$RPM_BUILD_ROOT -j4 \
    143143      %INSTMOD%
    144     ./src/vboxhost/build_in_tmp \
    145       --use-module-symvers /tmp/vboxdrv-Module.symvers \
    146       --module-source `pwd`/src/vboxhost/vboxpci \
    147       KBUILD_VERBOSE= KERN_VER=$(basename $d) INSTALL_MODULE_PATH=$RPM_BUILD_ROOT -j4 \
    148       %INSTMOD%
     144    if [ -e `pwd`/src/vboxhost/vboxpci ]; then
     145      ./src/vboxhost/build_in_tmp \
     146        --use-module-symvers /tmp/vboxdrv-Module.symvers \
     147        --module-source `pwd`/src/vboxhost/vboxpci \
     148        KBUILD_VERBOSE= KERN_VER=$(basename $d) INSTALL_MODULE_PATH=$RPM_BUILD_ROOT -j4 \
     149        %INSTMOD%
     150    fi
    149151  fi
    150152done
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette