VirtualBox

Changeset 11752

Show
Ignore:
Timestamp:
08/28/08 13:36:46 (3 months ago)
Author:
vboxsync
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/VBox/HostDrivers/Support/Makefile.kmk

    r11725 r11752  
    5858  OTHERS.linux    += \ 
    5959        $(PATH_BIN)/src/build_in_tmp \ 
     60        $(PATH_BIN)/src/Makefile \ 
    6061        $(if $(VBOX_OSE),,$(PATH_BIN)/src/dkms.conf) 
    6162 endif 
     
    8283 
    8384# Scripts needed for building the kernel modules 
     85## @todo generate these else where and move them from OTHERS to vboxmod-bin (which btw installs NOBIN files contrary to its name). 
    8486 
    8587$(PATH_BIN)/src/build_in_tmp: \ 
     
    8789                $(VBOX_VERSION_STAMP) 
    8890        $(call MSG_TOOL,Creating,,$@) 
    89         $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxdrv;g" < $< > $@ 
     91        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxdrv;g" --output $@ $< 
    9092        $(QUIET)chmod 0755 $@ 
    9193 
     
    9496                $(VBOX_VERSION_STAMP) 
    9597        $(call MSG_TOOL,Creating,,$@) 
    96         $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" < $< > $@ 
    97  
     98        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" --output $@ $< 
     99 
     100$(PATH_BIN)/src/Makefile: \ 
     101                $(PATH_SUB_CURRENT)/linux/Makefile 
     102        $(call MSG_TOOL,Creating,,$@) 
     103ifdef VBOX_WITH_HARDENING 
     104        $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $< 
     105else 
     106        $(QUIET)$(CP) -f $< $@ 
     107endif 
    98108 
    99109# 
  • trunk/src/VBox/HostDrivers/Support/linux/export_modules

    r8155 r11752  
    2929 
    3030if [ -z "$1" ]; then 
    31     echo "Usage: $0 <filename.tar.gz>
     31    echo "Usage: $0 <filename.tar.gz> [--without-hardening]
    3232    echo "  Export VirtualBox kernel modules to <filename.tar.gz>" 
    3333    exit 1 
     34fi 
     35 
     36VBOX_WITH_HARDENING=1 
     37if [ "$2" = "--without-hardening" ]; then 
     38    VBOX_WITH_HARDENING= 
    3439fi 
    3540 
     
    7277chmod 0755 $PATH_TMP/vboxdrv/build_in_tmp 
    7378sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_VBOXDRV/linux/dkms.conf > $PATH_TMP/vboxdrv/dkms.conf 
     79if [ -n "$VBOX_WITH_HARDENING" ]; then 
     80    cat                                   $PATH_VBOXDRV/linux/Makefile > $PATH_TMP/vboxdrv/Makefile 
     81else 
     82    sed -e "s;-DVBOX_WITH_HARDENING;;g" < $PATH_VBOXDRV/linux/Makefile > $PATH_TMP/vboxdrv/Makefile 
     83fi 
    7484 
    7585# Only temporary, omit from archive 
  • trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv

    r10377 r11752  
    6060    ${PATH_ROOT}/include/VBox/sup.h=>include/VBox/sup.h \ 
    6161    ${PATH_ROOT}/include/VBox/types.h=>include/VBox/types.h \ 
    62     ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/Makefile=>Makefile \ 
    6362    ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c=>linux/SUPDrv-linux.c \ 
    6463    ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPDrv.c=>SUPDrv.c \ 

© 2008 Sun Microsystems, Inc.
ContactPrivacy policy