Changeset 36885 in vbox

Timestamp:

Apr 29, 2011 9:54:29 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

71463

Message:

Linux/installer: vboxpci adaptions

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/rules (modified) (4 diffs)
• install.sh (modified) (1 diff)
• rpm/VirtualBox.tmpl.spec (modified) (3 diffs)

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

@@ -166 +166 @@
                 $(if $(instmod),&& install -D -m 0644 -g 0 -o 0 \
                     $(builddir)/bin/src/vboxnetadp/vboxnetadp.ko $(moddir)/$$(basename $$d)/vboxnetadp.ko); \
+                make -C $(builddir)/bin/src/vboxpci KERN_DIR=$$d/build MODULE_DIR=$$d clean && \
+                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxpci || true) && \
+                make -j4 -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_DIR=$$d/build MODULE_DIR=$$d all \
+                $(if $(instmod),&& install -D -m 0644 -g 0 -o 0 \
+                    $(builddir)/bin/src/vboxpci/vboxpci.ko $(moddir)/$$(basename $$d)/vboxpci.ko); \
             fi; \
         done
@@ -171 +176 @@
         make -C $(builddir)/bin/src/vboxnetflt clean
         make -C $(builddir)/bin/src/vboxnetadp clean
+        make -C $(builddir)/bin/src/vboxpci clean
         touch debian/modules-stamp
 
@@ -260 +266 @@
         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 ]; then \
+            if [ -f $$d/vboxdrv.ko -a -f $$d/vboxnetflt.ko -a -f $$d/vboxnetadp.ko -a -f $$d/vboxpci.ko ]; then \
                 install -D -g 0 -o 0 -m 0644 \
                     $$d/vboxdrv.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxdrv.ko; \
@@ -267 +273 @@
                 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; \
             fi \
             done)

trunk/src/VBox/Installer/linux/install.sh ¶

@@ -282 +282 @@
             fi
             # OSE doesn't always have the initscript
+            rmmod vboxpci > /dev/null 2>&1
             rmmod vboxnetadp > /dev/null 2>&1
             rmmod vboxnetflt > /dev/null 2>&1

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

@@ -130 +130 @@
       KBUILD_VERBOSE= KERN_DIR=$d/build MODULE_DIR=$RPM_BUILD_ROOT/$d/misc -j4 \
       %INSTMOD%
+    ./src/vboxhost/vboxpci/build_in_tmp \
+      --use-module-symvers /tmp/vboxdrv-Module.symvers \
+      KBUILD_VERBOSE= KERN_DIR=$d/build MODULE_DIR=$RPM_BUILD_ROOT/$d/misc -j4 \
+      %INSTMOD%
   fi
 done
@@ -210 +214 @@
   find /lib/modules -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2> /dev/null || true
   find /lib/modules -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2> /dev/null || true
+  find /lib/modules -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2> /dev/null || true
 fi
 
@@ -340 +345 @@
   rm -f /lib/modules/*/misc/vboxnetflt.ko
   rm -f /lib/modules/*/misc/vboxnetadp.ko
+  rm -f /lib/modules/*/misc/vboxpci.ko
 fi
 if [ $BUILD_MODULES -eq 1 ]; then