Changeset 14436 in vbox for trunk/src/VBox

Timestamp:

Nov 20, 2008 9:06:10 PM (16 years ago)

Author:

vboxsync

Message:

deb/rpm: fixed vboxnetflt module compilation

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/linux/Makefile (modified) (2 diffs)
• HostDrivers/VBoxNetFlt/linux/Makefile (modified) (2 diffs)
• Installer/linux/Makefile.kmk (modified) (1 diff)
• Installer/linux/vboxdrv.sh.in (modified) (3 diffs)

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -206 +206 @@
 endif
 
+KBUILD_VERBOSE ?= 1
+
 #
 # Compiler options
@@ -269 +271 @@
 
 $(MODULE):
-        $(MAKE) KBUILD_VERBOSE=1 -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules
+        $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules
 
 ifeq ($(KERN_VERSION),24)

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile

@@ -200 +200 @@
 endif
 
+KBUILD_VERBOSE ?= 1
+
 #
 # Compiler options
@@ -251 +253 @@
 
 $(MODULE):
-        $(MAKE) KBUILD_VERBOSE=1 -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules
+        $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules
 
 install: $(MODULE)

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -252 +252 @@
         $(QUIET)$(SED_EXT) \
                 -e "s|%NOLSB%|yes|g" \
-                -e "s|%NETFLT%|$(VBOX_WITH_NETFLT)|g" \
                 -e "s|%PACKAGE%|virtualbox|g" \
                 --output $@ \

trunk/src/VBox/Installer/linux/vboxdrv.sh.in

@@ -32 +32 @@
 LOG="/var/log/vbox-install.log"
 NOLSB=%NOLSB%
-NETFLT=%NETFLT%
 
 [ -f /lib/lsb/init-functions ] || NOLSB=yes
@@ -183 +182 @@
         failure "Cannot change owner $GROUPNAME for device $DEVICE"
     fi
-    if [ -n "$NETFLT" ]; then
-        if ! modprobe vboxnetflt > /dev/null 2>&1; then
-            failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
-        fi
+    if ! modprobe vboxnetflt > /dev/null 2>&1; then
+        failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
     fi
     succ_msg
@@ -276 +273 @@
         failure "Look at $LOG to find out what went wrong"
     fi
-    if [ -n "$NETFLT" ]; then
-        if ! $BUILDVBOXNETFLT \
-            --use-module-symvers /tmp/vboxdrv-Module.symvers \
-            --no-print-directory install >> $LOG 2>&1; then
-            failure "Look at $LOG to find out what went wrong"
-        fi
+    if ! $BUILDVBOXNETFLT \
+        --use-module-symvers /tmp/vboxdrv-Module.symvers \
+        --no-print-directory install >> $LOG 2>&1; then
+        failure "Look at $LOG to find out what went wrong"
     fi
     succ_msg