Changeset 14436 in vbox for trunk/debian

Timestamp:

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

Author:

vboxsync

Message:

deb/rpm: fixed vboxnetflt module compilation

Location:

trunk/debian

Files:

• postinst (modified) (2 diffs)
• rules (modified) (4 diffs)

trunk/debian/postinst

@@ -68 +68 @@
 Messages emitted during module compilation will be logged to $LOG.
 EOF
-      if ! /usr/share/virtualbox/src/vboxdrv/build_in_tmp install > /var/log/vbox-install.log 2>&1; then
+      rm -f /etc/vbox/module_not_compiled
+      echo "** Compiling vboxdrv" > /var/log/vbox-install.log
+      if ! /usr/share/virtualbox/src/vboxdrv/build_in_tmp \
+          --save-module-symvers /tmp/vboxdrv-Module.symvers \
+          --no-print-directory KBUILD_VERBOSE= \
+          install >> /var/log/vbox-install.log 2>&1; then
         db_fset virtualbox/module-compilation-failed seen false
         db_input critical virtualbox/module-compilation-failed || true
@@ -75 +80 @@
         # don't abort the installation!
       else
+        echo "** Compiling vboxnetflt" >> /var/log/vbox-install.log
+        if ! /usr/share/virtualbox/src/vboxdrv/build_in_tmp \
+            --use-module-symvers /tmp/vboxdrv-Module.symvers \
+            --no-print-directory KBUILD_VERBOSE= \
+            install >> /var/log/vbox-install.log 2>&1; then
+          db_fset virtualbox/module-compilation-failed seen false
+          db_input critical virtualbox/module-compilation-failed || true
+          db_go || true
+          touch /etc/vbox/module_not_compiled
+          # don't abort the installation!
+        fi
+      fi
+      if [ ! -f /etc/vbox/module_not_compiled ]; then
         # success
         cat << EOF
 Success!
 EOF
-        rm -f /etc/vbox/module_not_compiled
       fi
     fi

trunk/debian/rules

@@ -122 +122 @@
             if [ -L $$d/build ]; then \
                 make -C $(builddir)/bin/src/vboxdrv KERN_DIR=$$d/build MODULE_DIR=$$d clean && \
-                make -C $(builddir)/bin/src/vboxdrv KERN_DIR=$$d/build MODULE_DIR=$$d all && \
+                make -C $(builddir)/bin/src/vboxdrv KBUILD_VERBOSE= KERN_DIR=$$d/build MODULE_DIR=$$d all && \
                 install -D -m 0644 -g 0 -o 0 \
-                    $(builddir)/bin/src/vboxdrv/vboxdrv.ko $(moddir)/$$(basename $$d)/vboxdrv.ko; \
-                if [ -f $(builddir)/bin/src/vboxnetflt/Makefile ]; then \
-                  make -C $(builddir)/bin/src/vboxnetflt KERN_DIR=$$d/build MODULE_DIR=$$d clean && \
-                  make -C $(builddir)/bin/src/vboxnetflt KERN_DIR=$$d/build MODULE_DIR=$$d all && \
-                  install -D -m 0644 -g 0 -o 0 \
+                    $(builddir)/bin/src/vboxdrv/vboxdrv.ko $(moddir)/$$(basename $$d)/vboxdrv.ko && \
+                make -C $(builddir)/bin/src/vboxnetflt KERN_DIR=$$d/build MODULE_DIR=$$d clean && \
+                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetflt || true) && \
+                make -C $(builddir)/bin/src/vboxnetflt KBUILD_VERBOSE= KERN_DIR=$$d/build MODULE_DIR=$$d all && \
+                install -D -m 0644 -g 0 -o 0 \
                     $(builddir)/bin/src/vboxnetflt/vboxnetflt.ko $(moddir)/$$(basename $$d)/vboxnetflt.ko; \
-                fi \
             fi; \
         done
         make -C $(builddir)/bin/src/vboxdrv clean
-        if [ -f $(builddir)/bin/src/vboxnetflt/Makefile ]; then \
-          make -C $(builddir)/bin/src/vboxnetflt clean; \
-        fi
+        make -C $(builddir)/bin/src/vboxnetflt clean
         touch debian/modules-stamp
 
@@ -193 +190 @@
         $(if $(NOMODS),,for d in $(moddir)/*; do \
             install -D -g 0 -o 0 -m 0644 \
-                $$d/vboxdrv.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxdrv.ko; \
-            if [ -d $$/vboxnetflt.ko ]; then \
-              install -D -g 0 -o 0 -m 644 \
+                $$d/vboxdrv.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxdrv.ko; \
+            install -D -g 0 -o 0 -m 0644 \
                 $$d/vboxnetflt.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxnetflt.ko; \
-            fi; done)
+            done)
 ifeq ($(ose),)
         $(if $(HEADLESS),,mv $(archdir)/kchmviewer $(prefix)/usr/lib/$(package))
         dh_installdocs \
-          $(archdir)/UserManual*.pdf $(archdir)/VirtualBox*.chm \
-          LICENSE
+            $(archdir)/UserManual*.pdf $(archdir)/VirtualBox*.chm \
+            LICENSE
         rm $(addprefix $(archdir)/,UserManual*.pdf VirtualBox*.chm LICENSE)
         for i in rdesktop-vrdp.tar.gz additions/VBoxGuestAdditions.iso; do \
@@ -214 +210 @@
         rmdir $(prefix)/opt
         dh_link \
-            $(if $(HEADLESS),,usr/bin/VBox usr/bin/VirtualBox) \
-            usr/bin/VBox usr/bin/VBoxManage \
-            $(if $(HEADLESS),,usr/bin/VBox usr/bin/VBoxSDL) \
-            $(if $(ose),,usr/bin/VBox usr/bin/VBoxVRDP) \
-            usr/bin/VBox    usr/bin/VBoxHeadless \
-            usr/bin/VBoxTAP usr/bin/VBoxAddIF \
-            usr/bin/VBoxTAP usr/bin/VBoxDeleteIF
+            $(if $(HEADLESS),,usr/bin/VBox      usr/bin/VirtualBox) \
+            usr/bin/VBox                        usr/bin/VBoxManage \
+            $(if $(HEADLESS),,usr/bin/VBox      usr/bin/VBoxSDL) \
+            $(if $(ose),,usr/bin/VBox           usr/bin/VBoxVRDP) \
+            usr/bin/VBox                        usr/bin/VBoxHeadless \
+            usr/bin/VBoxTAP                     usr/bin/VBoxAddIF \
+            usr/bin/VBoxTAP                     usr/bin/VBoxDeleteIF \
+            usr/share/virtualbox/src/vboxdrv    usr/src/vboxdrv-$(ver) \
+            usr/share/virtualbox/src/vboxnetflt usr/src/vboxnetflt-$(ver)
         dh_desktop
         dh_installmenu
@@ -227 +225 @@
             -e 's|%NOLSB%|$(if $(filter _Debian_sarge ucs1.3,$(debrel)),yes,)|g' \
             -e 's|%PACKAGE%|virtualbox|g' \
-            -e 's|%NETFLT%|$(if $(wildcard $(builddir)/bin/src/vboxnetflt),1,)|g' \
             src/VBox/Installer/linux/vboxdrv.sh.in > debian/vboxdrv.init
         sed \