Changeset 7004 in vbox

Timestamp:

Feb 18, 2008 7:34:18 PM (17 years ago)

Author:

vboxsync

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

28205

Message:

Installer/Linux: added support for DKMS to the all distributions Linux installer (the main one, not the additions)

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• Makefile.kmk (modified) (2 diffs)
• linux/build_in_tmp (modified) (1 diff)
• linux/export_modules (modified) (3 diffs)
• linux/files_vboxdrv (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -43 +43 @@
 SYSMODS.os2     += VBoxDrv
 SYSMODS.solaris += vboxdrv
+OTHERS.linux    += \
+        $(PATH_BIN)/src/build_in_tmp \
+        $(if $(VBOX_OSE),,$(PATH_BIN)/src/dkms.conf)
 endif
 
@@ -64 +67 @@
 vboxmod-sh_MODE     = a+rx,u+w
 vboxmod-sh_SOURCES  = $(subst ",,$(FILES_VBOXDRV_BIN)) #"
+
+# Scripts needed for building the kernel modules
+
+$(PATH_BIN)/src/build_in_tmp: \
+                Support/linux/build_in_tmp
+        $(call MSG_TOOL,Creating,,$@)
+        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" < $< > $@
+        $(QUIET)chmod 0755 $@
+
+$(PATH_BIN)/src/dkms.conf: \
+                Support/linux/dkms.conf
+        $(call MSG_TOOL,Creating,,$@)
+        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" < $< > $@
 
 #

trunk/src/VBox/HostDrivers/Support/linux/build_in_tmp

@@ -24 +24 @@
 # terms and conditions of either the GPL or the CDDL or both.
 #
+
+# Attempt to build using DKMS first
+DKMS=`which dkms` 
+if [ -n "$DKMS" ]
+then
+    echo "Attempting to install using DKMS"
+    status=`$DKMS status -m vboxdrv -v _VERSION_`
+    if echo $status | grep added > /dev/null ||
+        echo $status | grep built > /dev/null ||
+        echo $status | grep installed > /dev/null
+    then
+        $DKMS remove -m vboxdrv -v _VERSION_ --all
+    fi
+    if $DKMS add -m vboxdrv -v _VERSION_ &&
+        $DKMS build -m vboxdrv -v _VERSION_ &&
+        $DKMS install -m vboxdrv -v _VERSION_ --force
+    then
+        exit 0
+    fi
+    echo "Failed to install using DKMS, attempting to install without"
+fi
 
 # find a unique temp directory

trunk/src/VBox/HostDrivers/Support/linux/export_modules

@@ -39 +39 @@
 VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
 VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
+VBOX_VERSION_STRING=$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
 
 . $PATH_VBOXDRV/linux/files_vboxdrv
@@ -52 +53 @@
 echo "#define VBOX_VERSION_MINOR $VBOX_VERSION_MINOR" >> $PATH_TMP/version-generated.h
 echo "#define VBOX_VERSION_BUILD $VBOX_VERSION_BUILD" >> $PATH_TMP/version-generated.h
-echo "#define VBOX_VERSION_STRING \"$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD\"" >> $PATH_TMP/version-generated.h
+echo "#define VBOX_VERSION_STRING \"$VBOX_VERSION_STRING\"" >> $PATH_TMP/version-generated.h
 echo "" >> $PATH_TMP/version-generated.h
 echo "#endif" >> $PATH_TMP/version-generated.h
@@ -64 +65 @@
     install -D -m 0755 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxdrv/`echo $f|cut -d'>' -f2`"
 done
+sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_VBOXDRV/linux/build_in_tmp > $PATH_TMP/vboxdrv/build_in_tmp
+chmod 0755 $PATH_TMP/vboxdrv/build_in_tmp
+sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_VBOXDRV/linux/dkms.conf > $PATH_TMP/vboxdrv/dkms.conf
 
 # Only temporary, omit from archive

trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv

@@ -101 +101 @@
 
 FILES_VBOXDRV_BIN=" \
-    ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/build_in_tmp=>build_in_tmp \
 "