Installer

Timestamp:

Nov 17, 2011 10:25:36 PM (13 years ago)

Author:

vboxsync

Message:

Installers/linux: make do_dkms take arguments instead of requiring patching.

Location:

trunk/src/VBox/Installer/linux

Files:

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

-              r39334
+              r39358
                 -e "s|%DEBIAN%||g" \
                 -e "s|%PACKAGE%|virtualbox|g" \
+                -e "s|%VERSION%|$(VBOX_VERSION_STRING)|g" \
                 --output $@ \
                 $<
 …
                 -e "s|%DEBIAN%||g" \
                 -e "s|%PACKAGE%|virtualbox|g" \
+                -e "s|%VERSION%|$(VBOX_VERSION_STRING)|g" \
                 -e "s|%GROUP%|$(if $(VBOX_WITHOUT_HARDENING),vboxusers,root)|g" \
                 --output $@ \

r39223	r39358
318	318	-e 's\|%DEBIAN%\|yes\|g' \
319	319	-e 's\|%PACKAGE%\|virtualbox\|g' \
	320	-e "s\|%VERSION%\|$(VBOX_VERSION_STRING)\|g" \
320	321	-e "s\|%GROUP%\|$(if $(VBOX_WITHOUT_HARDENING),vboxusers,root)\|g" \
321	322	$(vboxroot)/src/VBox/Installer/linux/vboxdrv.sh.in > debian/vboxdrv.init

r39223	r39358
184	184	-e 's\|%DEBIAN%\|\|g' \
185	185	-e 's\|%PACKAGE%\|virtualbox\|g' \
	186	-e "s\|%VERSION%\|$(VBOX_VERSION_STRING)\|g" \
186	187	-e "s\|%GROUP%\|$(if $(VBOX_WITHOUT_HARDENING),vboxusers,root)\|g" \
187	188	vboxdrv.sh.in > $(archdir)/vboxdrv.init

-              r39334
+              r39358
 NOLSB=%NOLSB%
 DEBIAN=%DEBIAN%
+VERSION=%VERSION%
 MODPROBE=/sbin/modprobe
 …
     stop
     begin_msg "Uninstalling old VirtualBox DKMS kernel modules"
     $DODKMS uninstall > $LOG
+    $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG
     succ_msg
     if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then
 …
     fi
     begin_msg "Trying to register the VirtualBox kernel modules using DKMS"
     if ! $DODKMS install >> $LOG; then
+    if ! $DODKMS install vboxhost $VERSION >> $LOG; then
       fail_msg "Failed, trying without DKMS"
       begin_msg "Recompiling VirtualBox kernel modules"

Note: See TracChangeset for help on using the changeset viewer.