VirtualBox

Changeset 39333 in vbox


Ignore:
Timestamp:
Nov 16, 2011 3:19:21 PM (13 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
74904
Message:

Installer/linux: more build_in_tmp simplificaion.

Location:
trunk/src/VBox
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r38136 r39333  
    6464
    6565 if1of ($(KBUILD_TARGET),linux)
    66   INSTALLS += HostDrivers-dkms-sh
    67   HostDrivers-dkms-sh_INST    = bin/src/
    68   HostDrivers-dkms-sh_MODE    = a+rx,u+w
    69   HostDrivers-dkms-sh_SOURCES = $(HostDrivers-dkms-sh_0_OUTDIR)/do_dkms
    70   HostDrivers-dkms-sh_CLEAN   = $(HostDrivers-dkms-sh_0_OUTDIR)/do_dkms
     66  INSTALLS += HostDrivers-scripts
     67  HostDrivers-scripts_INST    = bin/src/
     68  HostDrivers-scripts_MODE    = a+rx,u+w
     69  HostDrivers-scripts_SOURCES = $(HostDrivers-scripts_0_OUTDIR)/do_dkms \
     70                                linux/build_in_tmp
     71  HostDrivers-scripts_CLEAN   = $(HostDrivers-scripts_0_OUTDIR)/do_dkms
    7172
    7273  INSTALLS += HostDrivers-dkms-src
    … …  
    8889                --output $@ $<
    8990
    90 $$(HostDrivers-dkms-sh_0_OUTDIR)/do_dkms: \
     91$$(HostDrivers-scripts_0_OUTDIR)/do_dkms: \
    9192                $(PATH_SUB_CURRENT)/linux/do_dkms \
    9293                $(VBOX_VERSION_STAMP) \

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

    r39255 r39333  
    266266vboxdrv-mod_EXEC_SOURCES  = \
    267267        $(subst $(DQUOTE),,$(FILES_VBOXDRV_BIN)) \
    268         $(vboxdrv-mod_0_OUTDIR)/build_in_tmp \
    269268        $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
    270269vboxdrv-mod_CLEAN   = \
    271270        $(vboxdrv-mod_0_OUTDIR)/Makefile \
    272271        $(PATH_TARGET)/vboxdrv-mod-1.dep \
    273         $(vboxdrv-mod_0_OUTDIR)/build_in_tmp
    274272
    275273# Scripts needed for building the kernel modules
    276 
    277 $$(vboxdrv-mod_0_OUTDIR)/build_in_tmp: \
    278                 $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
    279                 $(VBOX_VERSION_STAMP) \
    280                 | $$(dir $$@)
    281         $(call MSG_TOOL,Creating,,$@)
    282         $(QUIET)$(SED) \
    283                 -e "s;_VERSION_;${VBOX_VERSION_STRING};g" \
    284                 -e "s;_MODULE_;vboxdrv;g" \
    285                 -e "s;_BUILDTYPE_;${KBUILD_TYPE};g" --output $@ $<
    286         $(QUIET)chmod 0755 $@
    287274
    288275includedep $(PATH_TARGET)/vboxdrv-mod-1.dep

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

    r39252 r39333  
    102102        $(VBoxNetAdp-src_0_OUTDIR)/Makefile
    103103 VBoxNetAdp-src_EXEC_SOURCES = \
    104         $(VBoxNetAdp-src_0_OUTDIR)/build_in_tmp \
    105104        $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
    106105 VBoxNetAdp-src_CLEAN = \
    107106        $(VBoxNetAdp-src_0_OUTDIR)/Makefile \
    108107        $(PATH_TARGET)/VBoxNetAdp-src-1.dep \
    109         $(VBoxNetAdp-src_0_OUTDIR)/build_in_tmp
    110108
    111109 # Scripts needed for building the kernel modules
    … …  
    123121        %$(QUIET2)$(APPEND) -t '$(PATH_TARGET)/VBoxNetAdp-src-1.dep' 'VBoxNetAdp/linux/Makefile_VBOX_HARDENED=$(VBOX_WITH_HARDENING)'
    124122
    125 
    126 $$(VBoxNetAdp-src_0_OUTDIR)/build_in_tmp: \
    127                 $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
    128                 $(VBOX_VERSION_STAMP) \
    129                 | $$(dir $$@)
    130         $(call MSG_TOOL,Creating,,$@)
    131         $(QUIET)$(RM) -f -- $@
    132         $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxnetadp;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" --output $@ $<
    133         $(QUIET)chmod 0755 $@
    134123
    135124endif # linux

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

    r39252 r39333  
    371371        $(VBoxNetFlt-src_0_OUTDIR)/Makefile
    372372 VBoxNetFlt-src_EXEC_SOURCES = \
    373         $(VBoxNetFlt-src_0_OUTDIR)/build_in_tmp \
    374373        $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
    375374 VBoxNetFlt-src_CLEAN   = \
    376375        $(VBoxNetFlt-src_0_OUTDIR)/Makefile \
    377376        $(PATH_TARGET)/VBoxNetFlt-src-1.dep \
    378         $(VBoxNetFlt-src_0_OUTDIR)/build_in_tmp
    379377
    380378 # Scripts needed for building the kernel module.
    … …  
    394392        %$(QUIET2)$(APPEND) '$(PATH_TARGET)/VBoxNetFlt-src-1.dep' 'VBoxNetFlt/linux/Makefile_VBOX_HARDENED=$(VBOX_WITH_HARDENING)'
    395393
    396  $$(VBoxNetFlt-src_0_OUTDIR)/build_in_tmp: \
    397                 $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
    398                 $(VBOX_VERSION_STAMP) \
    399                 | $$(dir $$@)
    400         $(call MSG_TOOL,Creating,,$@)
    401         $(QUIET)$(RM) -f -- $@
    402         $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxnetflt;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" --output $@ $<
    403         $(QUIET)$(CHMOD) 0755 $@
    404 
    405394endif # linux
    406395

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

    r39252 r39333  
    5353        $(VBoxPci-src_0_OUTDIR)/Makefile
    5454 VBoxPci-src_EXEC_SOURCES = \
    55         $(VBoxPci-src_0_OUTDIR)/build_in_tmp \
    5655        $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
    5756 VBoxPci-src_CLEAN      = \
    5857        $(VBoxPci-src_0_OUTDIR)/Makefile \
    5958        $(PATH_TARGET)/VBoxPciSrc-src-1.dep \
    60         $(VBoxPci-src_0_OUTDIR)/build_in_tmp
    6159
    6260 # Generate the scripts needed for building the kernel module.
    … …  
    7573        %$(QUIET2)$(APPEND) -t '$(PATH_TARGET)/VBoxPci-src-1.dep' 'VBoxPci/linux/Makefile_VBOX_HARDENED=$(VBOX_WITH_HARDENING)'
    7674
    77 $$(VBoxPci-src_0_OUTDIR)/build_in_tmp: \
    78                 $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
    79                 $(VBOX_VERSION_STAMP) \
    80                 | $$(dir $$@)
    81         $(call MSG_TOOL,Creating,,$@)
    82         $(QUIET)$(RM) -f -- $@
    83         $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxpci;g; s;_BUILDTYPE_;${KBUILD_TYPE};g" --output $@ $<
    84         $(QUIET)$(CHMOD) 0755 $@
    85 
    8675endif # Supported platform.
    8776include $(KBUILD_PATH)/subfooter.kmk

  • trunk/src/VBox/HostDrivers/linux/export_modules

    r35920 r39333  
    66# Copyright (C) 2007 Oracle Corporation
    77#
    8 # This file is part of VirtualBox Open Source Edition (OSE), as
    98# available from http://www.virtualbox.org. This file is free software;
    109# you can redistribute it and/or modify it under the terms of the GNU
    … …  
    2625fi
    2726
    28 PATH_TMP="`cd \`dirname $1\`; pwd`/.vbox_modules"
    29 PATH_OUT=$PATH_TMP
    30 FILE_OUT="`cd \`dirname $1\`; pwd`/`basename $1`"
    3127PATH_ROOT="`cd \`dirname $0\`/../../../..; pwd`"
    3228PATH_LINUX="$PATH_ROOT/src/VBox/HostDrivers/linux"
    … …  
    8985    install -D -m 0755 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxdrv/`echo $f|cut -d'>' -f2`"
    9086done
    91 sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_LINUX/build_in_tmp > $PATH_TMP/vboxdrv/build_in_tmp
    92 chmod 0755 $PATH_TMP/vboxdrv/build_in_tmp
    9387sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_VBOXDRV/linux/dkms.conf > $PATH_TMP/vboxdrv/dkms.conf
    9488if [ -n "$VBOX_WITH_HARDENING" ]; then
    … …  
    10397    install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxnetflt/`echo $f|cut -d'>' -f2`"
    10498done
    105 sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_LINUX/build_in_tmp > $PATH_TMP/vboxnetflt/build_in_tmp
    106 chmod 0755 $PATH_TMP/vboxnetflt/build_in_tmp
    10799sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_VBOXNET/linux/dkms.conf > $PATH_TMP/vboxnetflt/dkms.conf
    108100if [ -n "$VBOX_WITH_HARDENING" ]; then
    … …  
    117109    install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxnetadp/`echo $f|cut -d'>' -f2`"
    118110done
    119 sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_LINUX/build_in_tmp > $PATH_TMP/vboxnetadp/build_in_tmp
    120 chmod 0755 $PATH_TMP/vboxnetadp/build_in_tmp
    121111sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_VBOXADP/linux/dkms.conf > $PATH_TMP/vboxnetadp/dkms.conf
    122112if [ -n "$VBOX_WITH_HARDENING" ]; then
    … …  
    131121    install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxpci/`echo $f|cut -d'>' -f2`"
    132122done
    133 sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_LINUX/build_in_tmp > $PATH_TMP/vboxpci/build_in_tmp
    134 chmod 0755 $PATH_TMP/vboxpci/build_in_tmp
    135123sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_VBOXPCI/linux/dkms.conf > $PATH_TMP/vboxpci/dkms.conf
    136124if [ -n "$VBOX_WITH_HARDENING" ]; then
    … …  
    141129
    142130install -D -m 0644 $PATH_LINUX/Makefile $PATH_TMP/Makefile
     131install -D -m 0755 $PATH_LINUX/build_in_tmp $PATH_TMP/build_in_tmp
    143132
    144133# Only temporary, omit from archive

  • trunk/src/VBox/Installer/linux/installer-common.sh

    r39229 r39333  
    167167        chcon -t java_exec_t    "$INSTALLATION_DIR"/vboxwebsrv > /dev/null 2>&1
    168168        chcon -t java_exec_t    "$INSTALLATION_DIR"/webtest > /dev/null 2>&1
    169         chcon -t bin_t          "$SHARE_DIR"/src/vboxhost/*/build_in_tmp \
     169        chcon -t bin_t          "$SHARE_DIR"/src/vboxhost/build_in_tmp \
    170170             > /dev/null 2>&1
    171171    fi

  • trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

    r39223 r39333  
    118118  if [ -L $d/build ]; then
    119119    rm -f /tmp/vboxdrv-Module.symvers
    120     ./src/vboxhost/vboxdrv/build_in_tmp \
     120    ./src/vboxhost/build_in_tmp \
    121121      --save-module-symvers /tmp/vboxdrv-Module.symvers \
     122      --module-source $MODULE_SRC/vboxdrv \
    122123      KBUILD_VERBOSE= KERN_DIR=$d/build MODULE_DIR=$RPM_BUILD_ROOT/$d/misc -j4 \
    123124      %INSTMOD%
    124     ./src/vboxhost/vboxnetflt/build_in_tmp \
     125    ./src/vboxhost/build_in_tmp \
    125126      --use-module-symvers /tmp/vboxdrv-Module.symvers \
     127      --module-source $MODULE_SRC/vboxnetflt \
    126128      KBUILD_VERBOSE= KERN_DIR=$d/build MODULE_DIR=$RPM_BUILD_ROOT/$d/misc -j4 \
    127129      %INSTMOD%
    128     ./src/vboxhost/vboxnetadp/build_in_tmp \
     130    ./src/vboxhost/build_in_tmp \
    129131      --use-module-symvers /tmp/vboxdrv-Module.symvers \
     132      --module-source $MODULE_SRC/vboxnetadp \
    130133      KBUILD_VERBOSE= KERN_DIR=$d/build MODULE_DIR=$RPM_BUILD_ROOT/$d/misc -j4 \
    131134      %INSTMOD%
    132     ./src/vboxhost/vboxpci/build_in_tmp \
     135    ./src/vboxhost/build_in_tmp \
    133136      --use-module-symvers /tmp/vboxdrv-Module.symvers \
     137      --module-source $MODULE_SRC/vboxpci \
    134138      KBUILD_VERBOSE= KERN_DIR=$d/build MODULE_DIR=$RPM_BUILD_ROOT/$d/misc -j4 \
    135139      %INSTMOD%

  • trunk/src/VBox/Installer/linux/vboxdrv.sh.in

    r38767 r39333  
    4343if [ -n "$INSTALL_DIR" ]; then
    4444    VBOXMANAGE="$INSTALL_DIR/VBoxManage"
    45     DODKMS="$INSTALL_DIR/src/vboxhost/do_dkms"
    46     BUILDVBOXDRV="$INSTALL_DIR/src/vboxhost/vboxdrv/build_in_tmp"
    47     BUILDVBOXNETFLT="$INSTALL_DIR/src/vboxhost/vboxnetflt/build_in_tmp"
    48     BUILDVBOXNETADP="$INSTALL_DIR/src/vboxhost/vboxnetadp/build_in_tmp"
    49     BUILDVBOXPCI="$INSTALL_DIR/src/vboxhost/vboxpci/build_in_tmp"
     45    MODULE_SRC="$INSTALL_DIR/src/vboxhost"
    5046else
    5147    VBOXMANAGE="/usr/lib/%PACKAGE%/VBoxManage"
    52     DODKMS="/usr/share/%PACKAGE%/src/vboxhost/do_dkms"
    53     BUILDVBOXDRV="/usr/share/%PACKAGE%/src/vboxhost/vboxdrv/build_in_tmp"
    54     BUILDVBOXNETFLT="/usr/share/%PACKAGE%/src/vboxhost/vboxnetflt/build_in_tmp"
    55     BUILDVBOXNETADP="/usr/share/%PACKAGE%/src/vboxhost/vboxnetadp/build_in_tmp"
    56     BUILDVBOXPCI="/usr/share/%PACKAGE%/src/vboxhost/vboxpci/build_in_tmp"
     48    MODULE_SRC="/usr/share/%PACKAGE%/src/vboxhost"
    5749fi
     50BUILDINTMP="$MODULE_SRC/build_in_tmp"
     51DODKMS="$MODULE_SRC/do_dkms"
    5852
    5953# silently exit if the package was uninstalled but not purged,
    6054# applies to Debian packages only
    61 [ -z "$DEBIAN" -o -x $VBOXMANAGE -a -x $BUILDVBOXDRV ] || exit 0
     55[ -z "$DEBIAN" -o -x $VBOXMANAGE -a -x $BUILDINTMP ] || exit 0
    6256
    6357if [ -n "$NOLSB" ]; then
    … …  
    328322      fail_msg "Failed, trying without DKMS"
    329323      begin_msg "Recompiling VirtualBox kernel modules"
    330       if ! $BUILDVBOXDRV \
     324      if ! $BUILDINTMP \
    331325          --save-module-symvers /tmp/vboxdrv-Module.symvers \
     326          --module-source "$MODULE_SRC/vboxdrv" \
    332327          --no-print-directory install >> $LOG 2>&1; then
    333328          failure "Look at $LOG to find out what went wrong"
    334329      fi
    335       if ! $BUILDVBOXNETFLT \
     330      if ! $BUILDINTMP \
    336331          --use-module-symvers /tmp/vboxdrv-Module.symvers \
     332          --module-source "$MODULE_SRC/vboxnetflt" \
    337333          --no-print-directory install >> $LOG 2>&1; then
    338334          failure "Look at $LOG to find out what went wrong"
    339335      fi
    340       if ! $BUILDVBOXNETADP \
     336      if ! $BUILDINTMP \
    341337          --use-module-symvers /tmp/vboxdrv-Module.symvers \
     338          --module-source "$MODULE_SRC/vboxnetadp" \
    342339          --no-print-directory install >> $LOG 2>&1; then
    343340          failure "Look at $LOG to find out what went wrong"
    344341      fi
    345       if ! $BUILDVBOXPCI \
     342      if ! $BUILDINTMP \
    346343          --use-module-symvers /tmp/vboxdrv-Module.symvers \
     344          --module-source "$MODULE_SRC/vboxpci" \
    347345          --no-print-directory install >> $LOG 2>&1; then
    348346          failure "Look at $LOG to find out what went wrong"
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette