Changeset 82441 in vbox for trunk/src/VBox/Installer/linux

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/src/VBox/Installer/linux

Files:

• debian/control (modified) (1 diff)
• debian/rules (modified) (7 diffs)
• rpm/VirtualBox.tmpl.spec (modified) (1 diff)

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

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

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

@@ -64 +64 @@
 -include $(vboxroot)/SVN_REVISION
 svnrev   :=$(if $(svn_revision),$(svn_revision),)
-
 NOMODS   ?= $(ose)
 NOQT     ?= $(HEADLESS)
@@ -107 +106 @@
              $(if $(NOWEBSVC),,$(if $(ose),--enable-webservice,)) \
              $(if $(VNC),--enable-vnc,) \
-             --disable-extpack \
-             $(if $(filter DEBIAN_7_0,$(debdist)),--build-libopus,)
+             --disable-extpack
 
 bld_flags := AUTOCFG=$(current)/debian/AutoConfig.kmk \
@@ -167 +165 @@
                 make -C $(builddir)/bin/src/vboxpci KERN_VER=$$(basename $$d) clean && \
                 (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxpci || true) && \
-                make -j4 -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all; \
-                make -C $(builddir)/bin/src/vboxdrv KERN_VER=$$(basename $$d) clean; \
-                make -C $(builddir)/bin/src/vboxnetflt KERN_VER=$$(basename $$d) clean; \
-                make -C $(builddir)/bin/src/vboxnetadp KERN_VER=$$(basename $$d) clean; \
-                make -C $(builddir)/bin/src/vboxpci KERN_VER=$$(basename $$d) clean; \
+                make -j4 -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all; true; \
             fi; \
         done
+        make -C $(builddir)/bin/src/vboxdrv clean
+        make -C $(builddir)/bin/src/vboxnetflt clean
+        make -C $(builddir)/bin/src/vboxnetadp clean
+        make -C $(builddir)/bin/src/vboxpci clean; true
         touch debian/modules-stamp
 
@@ -212 +210 @@
         $(if $(NOQT),,mv $(archdir)/nls $(prefix)/usr/share/$(package))
         $(if $(NOQT),,cd $(archdir)/icons; for i in *; do \
-        for j in $$i/virtualbox.*; do \
+            for j in $$i/virtualbox.*; do \
                 if [ -f $$j ]; then \
                     if [ ! -d $(prefix)/usr/share/icons/hicolor/$$i/apps ]; then \
@@ -235 +233 @@
         mv $(archdir)/src  $(prefix)/usr/share/$(package)
         rm $(archdir)/VBox.sh
-        install -D -g 0 -o 0 -m 644 VBox.sh $(prefix)/usr/bin/VBox
+        install -D -g 0 -o 0 -m 644 $(vboxroot)/src/VBox/Installer/linux/VBox.sh $(prefix)/usr/bin/VBox
         mv $(archdir)/VBoxSysInfo.sh $(prefix)/usr/share/$(package)
         if [ -r $(archdir)/VBoxDTrace ]; then \
@@ -242 +240 @@
         mv $(archdir)/VBoxTunctl $(prefix)/usr/bin
         $(if $(NOMODS),,for d in $(moddir)/*; do \
-            if [ -f $$d/vboxdrv.ko -a -f $$d/vboxnetflt.ko -a -f $$d/vboxnetadp.ko -a -f $$d/vboxpci.ko ]; then \
+            if [ -f $$d/vboxdrv.ko -a -f $$d/vboxnetflt.ko -a -f $$d/vboxnetadp.ko ]; then \
                 install -D -g 0 -o 0 -m 0644 \
                     $$d/vboxdrv.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxdrv.ko; \
@@ -249 +247 @@
                 install -D -g 0 -o 0 -m 0644 \
                     $$d/vboxnetadp.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxnetadp.ko; \
-                install -D -g 0 -o 0 -m 0644 \
-                    $$d/vboxpci.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxpci.ko; \
+                if [ -f $$d/vboxpci.ko ]; then \
+                    install -D -g 0 -o 0 -m 0644 \
+                        $$d/vboxpci.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxpci.ko; \
+                fi \
             fi \
             done)

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

@@ -142 +142 @@
       KBUILD_VERBOSE= KERN_VER=$(basename $d) INSTALL_MODULE_PATH=$RPM_BUILD_ROOT -j4 \
       %INSTMOD%
-    ./src/vboxhost/build_in_tmp \
-      --use-module-symvers /tmp/vboxdrv-Module.symvers \
-      --module-source `pwd`/src/vboxhost/vboxpci \
-      KBUILD_VERBOSE= KERN_VER=$(basename $d) INSTALL_MODULE_PATH=$RPM_BUILD_ROOT -j4 \
-      %INSTMOD%
+    if [ -e `pwd`/src/vboxhost/vboxpci ]; then
+      ./src/vboxhost/build_in_tmp \
+        --use-module-symvers /tmp/vboxdrv-Module.symvers \
+        --module-source `pwd`/src/vboxhost/vboxpci \
+        KBUILD_VERBOSE= KERN_VER=$(basename $d) INSTALL_MODULE_PATH=$RPM_BUILD_ROOT -j4 \
+        %INSTMOD%
+    fi
   fi
 done