Changeset 11752 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Aug 28, 2008 11:36:46 AM (16 years ago)

Author:

vboxsync

Message:

#3076: edit linux/Makefile so VBOX_WITH_HARDENING is defined correctly.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

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

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

@@ -58 +58 @@
   OTHERS.linux    += \
         $(PATH_BIN)/src/build_in_tmp \
+        $(PATH_BIN)/src/Makefile \
         $(if $(VBOX_OSE),,$(PATH_BIN)/src/dkms.conf)
  endif
@@ -82 +83 @@
 
 # Scripts needed for building the kernel modules
+## @todo generate these else where and move them from OTHERS to vboxmod-bin (which btw installs NOBIN files contrary to its name).
 
 $(PATH_BIN)/src/build_in_tmp: \
@@ -87 +89 @@
                 $(VBOX_VERSION_STAMP)
         $(call MSG_TOOL,Creating,,$@)
-        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxdrv;g" < $< > $@
+        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxdrv;g" --output $@ $<
         $(QUIET)chmod 0755 $@
 
@@ -94 +96 @@
                 $(VBOX_VERSION_STAMP)
         $(call MSG_TOOL,Creating,,$@)
-        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" < $< > $@
-
+        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" --output $@ $<
+
+$(PATH_BIN)/src/Makefile: \
+                $(PATH_SUB_CURRENT)/linux/Makefile
+        $(call MSG_TOOL,Creating,,$@)
+ifdef VBOX_WITH_HARDENING
+        $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $<
+else
+        $(QUIET)$(CP) -f $< $@
+endif
 
 #

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

@@ -29 +29 @@
 
 if [ -z "$1" ]; then
-    echo "Usage: $0 <filename.tar.gz>"
+    echo "Usage: $0 <filename.tar.gz> [--without-hardening]"
     echo "  Export VirtualBox kernel modules to <filename.tar.gz>"
     exit 1
+fi
+
+VBOX_WITH_HARDENING=1
+if [ "$2" = "--without-hardening" ]; then
+    VBOX_WITH_HARDENING=
 fi
 
@@ -72 +77 @@
 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
+if [ -n "$VBOX_WITH_HARDENING" ]; then
+    cat                                   $PATH_VBOXDRV/linux/Makefile > $PATH_TMP/vboxdrv/Makefile
+else
+    sed -e "s;-DVBOX_WITH_HARDENING;;g" < $PATH_VBOXDRV/linux/Makefile > $PATH_TMP/vboxdrv/Makefile
+fi
 
 # Only temporary, omit from archive

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

@@ -60 +60 @@
     ${PATH_ROOT}/include/VBox/sup.h=>include/VBox/sup.h \
     ${PATH_ROOT}/include/VBox/types.h=>include/VBox/types.h \
-    ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/Makefile=>Makefile \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c=>linux/SUPDrv-linux.c \
     ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrv.c=>SUPDrv.c \