VirtualBox

Changeset 39223 in vbox


Ignore:
Timestamp:
Nov 8, 2011 8:04:58 AM (13 years ago)
Author:
vboxsync
Message:

Installer/linux: nomenclature.

Location:
trunk/src/VBox/Installer/linux
Files:
9 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Installer/linux/Makefile.kmk

    r38466 r39223  
    315315                $(VBOX_LNX_INST_OUT_DIR)/vboxweb-service.sh \
    316316                $(VBOX_LNX_INST_OUT_DIR)/install.sh \
    317                 $(VBOX_PATH_LNX_INST_SRC)/installer-utils.sh \
     317                $(VBOX_PATH_LNX_INST_SRC)/installer-common.sh \
    318318                $(VBOX_PATH_LNX_INST_SRC)/vboxdrv-pardus.py \
    319319                $(VBOX_PATH_LNX_INST_SRC)/uninstall.sh
    … …  
    359359                $<
    360360
    361 $(VBOX_LNX_INST_OUT_DIR)/install.sh: $(VBOX_PATH_LNX_INST_SRC)/install.sh $(VBOX_PATH_LNX_INST_SRC)/installer-utils.sh $(VBOX_VERSION_STAMP) $(VBOX_SVN_REV_KMK).ts | $$(dir $$@)
     361$(VBOX_LNX_INST_OUT_DIR)/install.sh: $(VBOX_PATH_LNX_INST_SRC)/install.sh $(VBOX_PATH_LNX_INST_SRC)/installer-common.sh $(VBOX_VERSION_STAMP) $(VBOX_SVN_REV_KMK).ts | $$(dir $$@)
    362362        $(QUIET)$(SED) \
    363363                -e "s;_VERSION_;$(VBOX_VERSION_STRING);g" \
    … …  
    367367                -e "s;_HARDENED_;$(VBOX_WITH_HARDENING);g" \
    368368                -e "s;_PYTHON_;$(VBOX_WITH_PYTHON);g" \
    369                 -e '/#include installer-utils.sh/ {' \
    370                 -e "r $(PATH_ROOT)/src/VBox/Installer/linux/installer-utils.sh" \
     369                -e '/#include installer-common.sh/ {' \
     370                -e "r $(PATH_ROOT)/src/VBox/Installer/linux/installer-common.sh" \
    371371                -e 'd' \
    372372                -e '}' \

  • trunk/src/VBox/Installer/linux/debian/postinst.in

    r38423 r39223  
    1818#  abort-deconfigure: (our version): error during resolving conflicts
    1919
    20 #include installer-utils.sh
     20#include installer-common.sh
    2121
    2222LOG="/var/log/vbox-install.log"

  • trunk/src/VBox/Installer/linux/debian/rules

    r39214 r39223  
    343343            debian/prerm.in > debian/prerm
    344344        sed -e 's|%VER%|$(ver)|g' \
    345             -e '/#include installer-utils.sh/ {' \
    346             -e "r $(vboxroot)/src/VBox/Installer/linux/installer-utils.sh" \
     345            -e '/#include installer-common.sh/ {' \
     346            -e "r $(vboxroot)/src/VBox/Installer/linux/installer-common.sh" \
    347347            -e 'd' \
    348348            -e '}' \

  • trunk/src/VBox/Installer/linux/install.sh

    r39222 r39223  
    2020# Include routines and utilities needed by the installer
    2121. ./routines.sh
    22 #include installer-utils.sh
     22#include installer-common.sh
    2323
    2424LOG="/var/log/vbox-install.log"

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

    r39222 r39223  
    219219
    220220%post
    221 #include installer-utils.sh
     221#include installer-common.sh
    222222
    223223LOG="/var/log/vbox-install.log"

  • trunk/src/VBox/Installer/linux/rpm/rules

    r39214 r39223  
    175175          -e 's|%LIBASOUND%|$(if $(filter lib64,$(rpmlib)),libasound.so.2()(64bit),libasound.so.2)|g' \
    176176          -e 's|%INITSCRIPTS%|$(if $(filter fedora,$(rpmspec)),initscripts,)|g' \
    177           -e '/#include installer-utils.sh/ {' \
    178           -e "r $(vboxroot)/src/VBox/Installer/linux/installer-utils.sh" \
     177          -e '/#include installer-common.sh/ {' \
     178          -e "r $(vboxroot)/src/VBox/Installer/linux/installer-common.sh" \
    179179          -e 'd' \
    180180          -e '}' \

  • trunk/src/VBox/Installer/linux/testcase/Makefile.kmk

    r38093 r39223  
    2828$$(tstInstallerLinux_0_OUTDIR)/tstInstallerLinux.sh: \
    2929                $(PATH_SUB_CURRENT)/tstInstallerLinux.sh \
    30                 $(PATH_SUB_CURRENT)/../installer-utils.sh \
     30                $(PATH_SUB_CURRENT)/../installer-common.sh \
    3131                | $$(dir $$@)
    3232        $(QUIET)$(SED) \
    33                 -e '/#include installer-utils.sh/ {' \
    34                 -e "r $(PATH_ROOT)/src/VBox/Installer/linux/installer-utils.sh" \
     33                -e '/#include installer-common.sh/ {' \
     34                -e "r $(PATH_ROOT)/src/VBox/Installer/linux/installer-common.sh" \
    3535                -e 'd' \
    3636                -e '}' \

  • trunk/src/VBox/Installer/linux/testcase/tstInstaller.sh

    r37088 r39223  
    1616#
    1717
    18 #include installer-utils.sh
     18#include installer-common.sh
    1919
    2020echo Testing udev rule generation

  • trunk/src/VBox/Installer/linux/testcase/tstInstallerLinux.sh

    r39220 r39223  
    1616#
    1717
    18 #include installer-utils.sh
     18#include installer-common.sh
    1919
    2020CERRS=0
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