Changeset 57969 in vbox for trunk/src/VBox/Additions

Timestamp:

Sep 30, 2015 2:48:47 PM (10 years ago)

Author:

vboxsync

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

102965

Message:

Installers/linux: drop DKMS support.

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/Makefile.kmk (modified) (2 diffs)
• common/VBoxGuest/linux/dkms.conf (deleted)
• linux/Makefile (modified) (1 diff)
• linux/Makefile.kmk (modified) (2 diffs)
• linux/drm/Makefile.kmk (modified) (1 diff)
• linux/installer/vboxadd.sh (modified) (4 diffs)
• linux/sharedfolders/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -201 +201 @@
  vboxguest-src_SOURCES  = $(subst ",,$(FILES_VBOXGUEST_NOBIN))
 
- INSTALLS += vboxguest-conf
- vboxguest-conf_INST    = $(INST_ADDITIONS)src/
- vboxguest-conf_MODE    = a+r,u+w
- vboxguest-conf_SOURCES = $(vboxguest-sh_0_OUTDIR)/dkms.conf
- vboxguest-conf_CLEAN   = $(vboxguest-sh_0_OUTDIR)/dkms.conf
-
  INSTALLS += vboxguest-scripts
  vboxguest-scripts_INST    = $(INST_ADDITIONS)src/
  vboxguest-scripts_MODE    = a+rx,u+w
- vboxguest-scripts_SOURCES = ../../../HostDrivers/linux/do_dkms \
-                             ../../../HostDrivers/linux/build_in_tmp
-
- $$(vboxguest-sh_0_OUTDIR)/dkms.conf: \
-                $(PATH_SUB_CURRENT)/linux/dkms.conf \
-                $(VBOX_VERSION_STAMP) \
-                | $$(dir $$@)
-        $(call MSG_TOOL,Creating,,$@)
-        $(QUIET)$(SED) \
-                -e "s;_VERSION_;${VBOX_VERSION_STRING};g" \
-                -e "s;_BUILDTYPE_;$(KBUILD_TYPE);g" \
-                --output $@ $<
+ vboxguest-scripts_SOURCES = ../../../HostDrivers/linux/build_in_tmp
 
  # scripts.
@@ -228 +211 @@
  vboxguest-sh_MODE      = a+rx,u+w
  vboxguest-sh_SOURCES   = $(subst ",,$(FILES_VBOXGUEST_BIN))
- vboxguest-sh_SOURCES  += $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
 
 endif # Linux

trunk/src/VBox/Additions/linux/Makefile

@@ -18 +18 @@
 ifneq ($(KBUILD_EXTMOD),)
 
-# DKMS
+# Building from kBuild (make -C <kernel_directory> M=`pwd`).
+# KBUILD_EXTMOD is set to $(M) in this case.
 
 obj-m = vboxguest/ vboxsf/ vboxvideo/

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

@@ -156 +156 @@
         vboxvideo_drv.o
 
-VBOX_ADD_KMOD_FILES = $(addprefix vboxguest-$(VBOX_VERSION_STRING)/, Makefile dkms.conf do_dkms build_in_tmp)
+VBOX_ADD_KMOD_FILES = $(addprefix vboxguest-$(VBOX_VERSION_STRING)/, Makefile build_in_tmp)
 VBOX_ADD_KMOD_DIRS =  $(addprefix vboxguest-$(VBOX_VERSION_STRING)/, vboxguest/ vboxsf/ vboxvideo/)
 
@@ -366 +366 @@
         $(VBOX_REL_LNX_ADD_INST)deffiles
 LnxAdd-scripts_EXEC_SOURCES  = \
-        $(VBOX_REL_LNX_HOST_DRV)do_dkms \
         $(VBOX_REL_LNX_INST_SRC)routines.sh \
         $(VBOX_REL_LNX_ADD_INST)vboxadd.sh=>vboxadd \

trunk/src/VBox/Additions/linux/drm/Makefile.kmk

@@ -32 +32 @@
         $(subst $(DQUOTE),,$(FILES_VBOXVIDEO_DRM_NOBIN))
 vboxvideo_drm-mod_EXEC_SOURCES = \
-        $(subst $(DQUOTE),,$(FILES_VBOXVIDEO_DRM_BIN)) \
-        $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
+        $(subst $(DQUOTE),,$(FILES_VBOXVIDEO_DRM_BIN))
 
 

trunk/src/VBox/Additions/linux/installer/vboxadd.sh

@@ -277 +277 @@
 cleanup_modules()
 {
-    if [ -n "$(which dkms 2>/dev/null)" ]; then
-        begin "Removing existing VirtualBox DKMS kernel modules"
-        $DODKMS uninstall $OLDMODULES > $LOG
-        succ_msg
-    fi
-    begin "Removing existing VirtualBox non-DKMS kernel modules"
+    begin "Removing existing VirtualBox kernel modules"
+    # We no longer support DKMS, remove any leftovers.
+    for i in vboxguest vboxadd vboxsf vboxvfs vboxvideo; do
+        rm -rf "/var/lib/dkms/${i}"*
+    done
     for i in $OLDMODULES; do
         find /lib/modules -name $i\* | xargs rm 2>/dev/null
@@ -295 +294 @@
     cleanup_modules
     begin "Building the VirtualBox Guest Additions kernel modules"
-
-    # Short cut out if a dkms build succeeds
-    if [ -n "$(which dkms 2>/dev/null)" ] &&
-       $DODKMS install vboxguest $INSTALL_VER >> $LOG 2>&1; then
-        succ_msg
-        return 0
-    fi
 
     test_for_gcc_and_make
@@ -424 +416 @@
     MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER"
     BUILDINTMP="$MODULE_SRC/build_in_tmp"
-    DODKMS="$MODULE_SRC/do_dkms"
     chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1
-    chcon -t bin_t "$DODKMS"     > /dev/null 2>&1
 
     setup_modules
@@ -447 +437 @@
       test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
         fail "Configuration file $config not complete"
-      DODKMS="$INSTALL_DIR/src/vboxguest-$INSTALL_VER/do_dkms"
-    elif test -x ./do_dkms; then  # Executing as part of the installer...
-      DODKMS=./do_dkms
     else
       fail "Configuration file $config not found"

trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk

@@ -29 +29 @@
         $(subst $(DQUOTE),,$(FILES_VBOXSF_NOBIN))
 vboxsf-mod_EXEC_SOURCES = \
-        $(subst $(DQUOTE),,$(FILES_VBOXSF_BIN)) \
-        $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
+        $(subst $(DQUOTE),,$(FILES_VBOXSF_BIN))