Changeset 66077 in vbox for trunk

Timestamp:

Mar 14, 2017 10:10:22 AM (8 years ago)

Author:

vboxsync

Message:

Additions/linux: fail if compiling the vboxsf kernel module fails but intentionally do not fail if compiling the vboxvideo kernel module fails (e.g. too old build environment)

File:

• trunk/src/VBox/Additions/linux/Makefile (modified) (2 diffs)

trunk/src/VBox/Additions/linux/Makefile

@@ -41 +41 @@
             fi; \
             echo "*** Building 'vboxsf' module ***"; \
-            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxsf; \
+            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxsf || exit 1; \
             if [ -f vboxsf/vboxsf.ko ]; then \
                 cp vboxsf/vboxsf.ko .; \
@@ -54 +54 @@
             fi; \
             echo "*** Building 'vboxvideo' module ***"; \
-            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo; \
+            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvideo || \
+              (echo; echo "Building of vboxvideo failed, ignoring!"; echo); \
             if [ -f vboxvideo/vboxvideo.ko ]; then \
                 cp vboxvideo/vboxvideo.ko .; \
-            else \
+            elif [ -f vboxvideo/vboxvideo.o ]; then \
                 cp vboxvideo/vboxvideo.o .; \
             fi; \