Changeset 39474 in vbox

Timestamp:

Nov 30, 2011 12:46:12 PM (13 years ago)

Author:

vboxsync

Message:

Added a loadall.sh on linux as well (see darwin). This builds the driver as the current user and sudos to root for the reloading. Also moved the linux/freebsd specific makefile mess down into the respective directories.

Location:

trunk/src/VBox/HostDrivers

Files:

• Makefile.kmk (modified) (2 diffs)
• freebsd/Makefile.kmk (added)
• freebsd/Makefile.kup (deleted)
• linux/Makefile.kmk (added)
• linux/Makefile.kup (deleted)
• linux/loadall.sh (added)

trunk/src/VBox/HostDrivers/Makefile.kmk

@@ -42 +42 @@
   endif
  endif
- ifeq ($(KBUILD_TARGET),darwin)
-  include $(PATH_SUB_CURRENT)/darwin/Makefile.kmk
+ if1of ($(KBUILD_TARGET), darwin freebsd linux)
+  include $(PATH_SUB_CURRENT)/$(KBUILD_TARGET)/Makefile.kmk
  endif
 
@@ -52 +52 @@
  endif
 
- if1of ($(KBUILD_TARGET),linux freebsd)
-  #
-  # Install the Makefile for module compilation on Linux and FreeBSD hosts
-  #
-  INSTALLS += HostDrivers-src
-  HostDrivers-src_INST            = bin/src/
-  HostDrivers-src_MODE            = a+r,u+w
-  HostDrivers-src_SOURCES.linux   = linux/Makefile
-  HostDrivers-src_SOURCES.freebsd = freebsd/Makefile
- endif
-
- if1of ($(KBUILD_TARGET),linux)
-  INSTALLS += HostDrivers-scripts
-  HostDrivers-scripts_INST    = bin/src/
-  HostDrivers-scripts_MODE    = a+rx,u+w
-  HostDrivers-scripts_SOURCES = linux/do_dkms \
-                                linux/build_in_tmp
-
-  INSTALLS += HostDrivers-dkms-src
-  HostDrivers-dkms-src_INST    = bin/src/
-  HostDrivers-dkms-src_MODE    = a+r,u+w
-  HostDrivers-dkms-src_SOURCES = $(HostDrivers-dkms-src_0_OUTDIR)/dkms.conf
-  HostDrivers-dkms-src_CLEAN   = $(HostDrivers-dkms-src_0_OUTDIR)/dkms.conf
-
-$$(HostDrivers-dkms-src_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;_OMIT_VBOXNETFLT_;$(if $(VBOX_WITH_NETFLT),,#);g" \
-                -e "s;_OMIT_VBOXNETADP_;$(if $(VBOX_WITH_NETADP),,#);g" \
-                -e "s;_OMIT_VBOXPCI_;$(if $(VBOX_WITH_PCI_PASSTHROUGH),,#);g" \
-                --output $@ $<
-
- endif
-
- if1of ($(KBUILD_TARGET),freebsd)
-  #
-  # Install the export_modules script for tar'ing the module sources on FreeBSD hosts
-  #
-  INSTALLS += HostDrivers-sh
-  HostDrivers-sh_INST    = bin/
-  HostDrivers-sh_MODE    = a+rx,u+w
-  HostDrivers-sh_SOURCES.freebsd = freebsd/export_modules
- endif
 endif # !defined(VBOX_ONLY_DOCS) && !defined(VBOX_ONLY_TESTSUITE)