Changeset 78444 in vbox for trunk/src/VBox

Timestamp:

May 8, 2019 7:44:36 AM (6 years ago)

Author:

vboxsync

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

130445

Message:

Installers/Linux: fixes after previous refactoring for generated Make files.
ticketref:18621:Failure to disable hardening in Linux kernel modules.
Refactoring changes to generated Make file templates for Linux kernel modules
removed -D prefixes in front of macros to be defined in Make variables. The
generation code used sed to search for -Dvariable to remove certain variables
and this no longer worked after the refactoring. This change fixes that.
Thank you Ambroz Bizjak for the patch. (Extended to cover more places.)

Location:

trunk/src/VBox/HostDrivers

Files:

• VBoxNetAdp/Makefile.kmk (modified) (2 diffs)
• VBoxNetFlt/Makefile.kmk (modified) (2 diffs)
• VBoxPci/Makefile.kmk (modified) (1 diff)
• linux/export_modules.sh (modified) (4 diffs)

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

@@ -176 +176 @@
         $(QUIET)$(RM) -f -- $@
  ifndef VBOX_WITH_HARDENING
-        $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $<
+        $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $<
  else
         $(QUIET)$(CP) -f $< $@
@@ -208 +208 @@
         $(QUIET)$(RM) -f -- $@
  ifndef VBOX_WITH_HARDENING
-        $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $<
+        $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $<
  else
         $(QUIET)$(CP) -f $< $@

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

@@ -526 +526 @@
         $(QUIET)$(RM) -f -- $@
  ifndef VBOX_WITH_HARDENING
-        $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $<
+        $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $<
  else
         $(QUIET)$(CP) -f $< $@
@@ -566 +566 @@
         $(QUIET)$(CP) -f $< $@
  ifndef VBOX_WITH_HARDENING
-        $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output [email protected] $@
+        $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output [email protected] $@
         ${QUIET}$(MV) -f [email protected] $@
  endif

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

@@ -68 +68 @@
         $(QUIET)$(RM) -f -- $@
  ifndef VBOX_WITH_HARDENING
-        $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $<
+        $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $<
  else
         $(QUIET)$(CP) -f $< $@

trunk/src/VBox/HostDrivers/linux/export_modules.sh

@@ -155 +155 @@
 done
 if [ -n "$VBOX_WITH_HARDENING" ]; then
-    sed -e "s;-DVBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV;;g" \
-        -e "s;-DIPRT_WITH_EFLAGS_AC_PRESERVING;;g" \
+    sed -e "s;VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV;;g" \
+        -e "s;IPRT_WITH_EFLAGS_AC_PRESERVING;;g" \
         < $PATH_VBOXDRV/linux/Makefile > $PATH_TMP/vboxdrv/Makefile
 else
-    sed -e "s;-DVBOX_WITH_HARDENING;;g" \
-        -e "s;-DVBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV;;g" \
-        -e "s;-DIPRT_WITH_EFLAGS_AC_PRESERVING;;g" \
+    sed -e "s;VBOX_WITH_HARDENING;;g" \
+        -e "s;VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV;;g" \
+        -e "s;IPRT_WITH_EFLAGS_AC_PRESERVING;;g" \
         < $PATH_VBOXDRV/linux/Makefile > $PATH_TMP/vboxdrv/Makefile
 fi
@@ -173 +173 @@
     cat                                   $PATH_VBOXNET/linux/Makefile > $PATH_TMP/vboxnetflt/Makefile
 else
-    sed -e "s;-DVBOX_WITH_HARDENING;;g" < $PATH_VBOXNET/linux/Makefile > $PATH_TMP/vboxnetflt/Makefile
+    sed -e "s;VBOX_WITH_HARDENING;;g" < $PATH_VBOXNET/linux/Makefile > $PATH_TMP/vboxnetflt/Makefile
 fi
 
@@ -184 +184 @@
     cat                                   $PATH_VBOXADP/linux/Makefile > $PATH_TMP/vboxnetadp/Makefile
 else
-    sed -e "s;-DVBOX_WITH_HARDENING;;g" < $PATH_VBOXADP/linux/Makefile > $PATH_TMP/vboxnetadp/Makefile
+    sed -e "s;VBOX_WITH_HARDENING;;g" < $PATH_VBOXADP/linux/Makefile > $PATH_TMP/vboxnetadp/Makefile
 fi
 
@@ -195 +195 @@
     cat                                   $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile
 else
-    sed -e "s;-DVBOX_WITH_HARDENING;;g" < $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile
+    sed -e "s;VBOX_WITH_HARDENING;;g" < $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile
 fi