Changeset 15816 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Jan 6, 2009 11:10:51 AM (16 years ago)

Author:

vboxsync

Message:

Linux guest additions: Makefile for convenience

Location:

trunk/src/VBox/Additions/linux

Files:

• Makefile (copied) (copied from trunk/src/VBox/HostDrivers/linux/Makefile ) (2 diffs)
• Makefile.kmk (modified) (1 diff)
• module/Makefile.module (modified) (3 diffs)
• sharedfolders/Makefile.module (modified) (2 diffs)

trunk/src/VBox/Additions/linux/Makefile

@@ -1 +1 @@
 #
-# Makefile for the VirtualBox Linux Host Drivers.
+# Makefile for the VirtualBox Linux Guest Drivers.
 #
 
 #
 #
-# Copyright (C) 2008 Sun Microsystems, Inc.
+# Copyright (C) 2009 Sun Microsystems, Inc.
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +23 @@
 
 all:
-        @echo "*** Building 'vboxdrv' module ***"
-        @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv
-        @cp vboxdrv/vboxdrv.ko .
+        @echo "*** Building 'vboxadd' module ***"
+        @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxadd
+        @cp vboxadd/vboxadd.ko .
         @echo
-        @if [ -d vboxnetflt ]; then \
-            if [ -f vboxdrv/Module.symvers ]; then \
-                cp vboxdrv/Module.symvers vboxnetflt; \
+        @if [ -d vboxvfs ]; then \
+            if [ -f vboxadd/Module.symvers ]; then \
+                cp vboxadd/Module.symvers vboxvfs; \
             fi; \
-            echo "*** Building 'vboxnetflt' module ***"; \
-            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetflt; \
-            cp vboxnetflt/vboxnetflt.ko .; \
+            echo "*** Building 'vboxvfs' module ***"; \
+            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvfs; \
+            cp vboxvfs/vboxvfs.ko .; \
         fi
 
 
 install:
-        @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv install
-        @if [ -d vboxnetflt ]; then \
-            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetflt install; \
+        @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxadd install
+        @if [ -d vboxvfs ]; then \
+            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvfs install; \
         fi
 
 clean:
-        @$(MAKE) -C vboxdrv clean
-        @if [ -d vboxnetflt ]; then \
-            $(MAKE) -C vboxnetflt clean; \
+        @$(MAKE) -C vboxadd clean
+        @if [ -d vboxvfs ]; then \
+            $(MAKE) -C vboxvfs clean; \
         fi
-        rm -f vboxdrv.ko vboxnetflt.ko
+        rm -f vboxadd.ko vboxvfs.ko
 
 load:
-        @/sbin/rmmod vboxnetflt || true
-        @/sbin/rmmod vboxdrv || true
-        @/sbin/insmod vboxdrv.ko
-        @if [ -f vboxnetflt.ko ]; then /sbin/insmod vboxnetflt.ko; fi
+        @/sbin/rmmod vboxvfs || true
+        @/sbin/rmmod vboxadd || true
+        @/sbin/insmod vboxadd.ko
+        @if [ -f vboxvfs.ko ]; then /sbin/insmod vboxvfs.ko; fi

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

@@ -55 +55 @@
  VBOX_LNX_ADD_BIN_COPY_SYMBOLS      = objcopy -g -R .comment
 endif
+
+INSTALLS += GuestDrivers-src
+GuestDrivers-src_INST = bin/additions/src/
+GuestDrivers-src_MODE = a+r,u+w
+GuestDrivers-src_SOURCES = Makefile
 
 include $(KBUILD_PATH)/subfooter.kmk

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

@@ -132 +132 @@
  endif
 
- # module install dir.
+ # module install dir, only for current kernel
  ifneq ($(filter install install_rpm,$(MAKECMDGOALS)),)
   ifndef MODULE_DIR
@@ -174 +174 @@
 endif
 
+KBUILD_VERBOSE ?= 1
 
 #
@@ -231 +232 @@
 
 $(MODULE):
-        $(MAKE) KBUILD_VERBOSE=1 -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules
+        $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules
 
 endif

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

@@ -165 +165 @@
 endif
 
+KBUILD_VERBOSE ?= 1
 
 #
@@ -237 +238 @@
 
 $(MODULE):
-        $(MAKE) KBUILD_VERBOSE=1 -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules
+        $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $(KERN_DIR) SUBDIRS=$(CURDIR) SRCROOT=$(CURDIR) modules
 
 endif