VirtualBox

Changeset 14015 in vbox


Ignore:
Timestamp:
Nov 10, 2008 1:57:45 PM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
39069
Message:

added vboxnetflt to the installer + some cleanup

Location:
trunk/src/VBox
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/linux/module/Makefile.kmk

    r13441 r14015  
    2323include $(KBUILD_PATH)/subheader.kmk
    2424
    25 INSTALLS += vboxadd-mod
    26 OTHERS.linux += \
    27         $(VBOX_PATH_ADDITIONS)/src/vboxadd/build_in_tmp \
    28         $(if $(VBOX_OSE),,$(VBOX_PATH_ADDITIONS)/src/vboxadd/dkms.conf)
     25INSTALLS += vboxadd-mod vboxadd-sh
    2926ifdef VBOX_WITH_ADDITION_DRIVERS
    3027 SYSMODS += vboxadd
    … …  
    3633include $(PATH_SUB_CURRENT)/files_vboxadd
    3734
    38 $(VBOX_PATH_ADDITIONS)/src/vboxadd/build_in_tmp: \
    39                 $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/build_in_tmp \
    40                 $(VBOX_VERSION_STAMP) \
    41                 | $(call DIRDEP,$(VBOX_PATH_ADDITIONS)/src/vboxadd)
    42         $(call MSG_TOOL,Creating,,$@)
    43         $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxadd;g" < $< > $@
    44         $(QUIET)chmod 0755 $@
     35vboxadd-mod_INST     = $(INST_ADDITIONS)src/vboxadd/
     36vboxadd-mod_MODE     = a+r,u+w
     37vboxadd-mod_SOURCES  = $(subst ",,$(FILES_VBOXADD_NOBIN))
     38vboxadd-mod_SOURCES += $(if $(VBOX_OSE),,$(PATH_vboxadd-mod)/dkms.conf)
     39vboxadd-mod_CLEAN    = $(PATH_vboxadd-mod)/dkms.conf
    4540
    46 $(VBOX_PATH_ADDITIONS)/src/vboxadd/dkms.conf: \
    47                 $(PATH_SUB_CURRENT)/dkms.conf \
    48                 $(VBOX_VERSION_STAMP)
    49         $(call MSG_TOOL,Creating,,$@)
    50         $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" < $< > $@
     41vboxadd-sh_INST      = $(INST_ADDITIONS)src/vboxadd/
     42vboxadd-sh_MODE      = a+rx,u+w
     43vboxadd-sh_SOURCES   = $(subst ",,$(FILES_VBOXADD_BIN))
     44vboxadd-sh_SOURCES  += $(PATH_vboxadd-sh)/build_in_tmp
     45vboxadd-sh_CLEAN    += $(PATH_vboxadd-sh)/build_in_tmp
    5146
    52 vboxadd-mod_INST    = $(INST_ADDITIONS)src/vboxadd/
    53 vboxadd-mod_MODE    = a+r,u+w
    54 vboxadd-mod_SOURCES = $(subst ",,$(FILES_VBOXADD_NOBIN))
    5547
    5648#
    … …  
    7264        $(VBOX_LIB_IPRT_GUEST_R0)
    7365
     66
     67$$(PATH_vboxadd-sh)/build_in_tmp: \
     68                $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/build_in_tmp \
     69                $(VBOX_VERSION_STAMP) \
     70                | $$(dir $$@)
     71        $(call MSG_TOOL,Creating,,$@)
     72        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxadd;g" < $< > $@
     73        $(QUIET)chmod 0755 $@
     74
     75$$(PATH_vboxadd-mod)/dkms.conf: \
     76                $(PATH_SUB_CURRENT)/dkms.conf \
     77                $(VBOX_VERSION_STAMP) \
     78                | $$(dir $$@)
     79        $(call MSG_TOOL,Creating,,$@)
     80        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" < $< > $@
     81
    7482include $(KBUILD_PATH)/subfooter.kmk
    7583

  • trunk/src/VBox/Additions/linux/module/files_vboxadd

    r13321 r14015  
    9393
    9494FILES_VBOXADD_BIN=" \
    95     ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/build_in_tmp=>build_in_tmp \
    9695"

  • trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk

    r12446 r14015  
    2525PROGRAMS += mountvboxsf
    2626INSTALLS += vboxvfs-mod vboxvfs-sh
    27 OTHERS.linux += \
    28         $(VBOX_PATH_ADDITIONS)/src/vboxvfs/build_in_tmp \
    29         $(if $(VBOX_OSE),,$(VBOX_PATH_ADDITIONS)/src/vboxvfs/dkms.conf)
    3027ifdef VBOX_WITH_ADDITION_DRIVERS
    3128 SYSMODS += vboxvfs
    … …  
    3734include $(PATH_SUB_CURRENT)/files_vboxvfs
    3835
    39 $(VBOX_PATH_ADDITIONS)/src/vboxvfs/build_in_tmp: \
    40                 $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/build_in_tmp \
    41                 $(VBOX_VERSION_STAMP) \
    42                 | $(call DIRDEP,$(VBOX_PATH_ADDITIONS)/src/vboxvfs)
    43         $(call MSG_TOOL,Creating,,$@)
    44         $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxvfs;g" < $< > $@
    45         $(QUIET)chmod 0755 $@
    46 
    47 $(VBOX_PATH_ADDITIONS)/src/vboxvfs/dkms.conf: \
    48                 $(PATH_SUB_CURRENT)/dkms.conf \
    49                 $(VBOX_VERSION_STAMP)
    50         $(call MSG_TOOL,Creating,,$@)
    51         $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" < $< > $@
    52 
    5336vboxvfs-mod_INST        = $(INST_ADDITIONS)src/vboxvfs/
    5437vboxvfs-mod_MODE        = a+r,u+w
    5538vboxvfs-mod_SOURCES     = $(subst ",,$(FILES_VBOXVFS_NOBIN))
     39vboxvfs-mod_SOURCES    += $(PATH_vboxvfs-mod)/dkms.conf
     40vboxvfs-mod_CLEAN      += $(PATH_vboxvfs-mod)/dkms.conf
     41
     42vboxvfs-sh_INST        = $(INST_ADDITIONS)src/vboxvfs/
     43vboxvfs-sh_MODE        = a+rx,u+w
     44vboxvfs-sh_SOURCES     = $(subst ",,$(FILES_VBOXVFS_BIN))
     45vboxvfs-sh_SOURCES    += $(PATH_vboxvfs-sh)/build_in_tmp
     46vboxvfs-sh_CLEAN      += $(PATH_vboxvfs-sh)/build_in_tmp
    5647
    5748
    … …  
    9990
    10091
     92## Scripts needed for building kernel modules
     93
     94$$(PATH_vboxvfs-sh)/build_in_tmp: \
     95                $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/build_in_tmp \
     96                $(VBOX_VERSION_STAMP) \
     97                | $$(dir $$@)
     98        $(call MSG_TOOL,Creating,,$@)
     99        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxvfs;g" < $< > $@
     100        $(QUIET)chmod 0755 $@
     101
     102$$(PATH_vboxvfs-mod)/dkms.conf: \
     103                $(PATH_SUB_CURRENT)/dkms.conf \
     104                $(VBOX_VERSION_STAMP) \
     105                | $$(dir $$@)
     106        $(call MSG_TOOL,Creating,,$@)
     107        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" < $< > $@
     108
    101109include $(KBUILD_PATH)/subfooter.kmk
    102110

  • trunk/src/VBox/Additions/linux/sharedfolders/files_vboxvfs

    r11519 r14015  
    8484
    8585FILES_VBOXVFS_BIN=" \
    86     ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/build_in_tmp=>build_in_tmp \
    8786"

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

    r13707 r14015  
    5252  SYSMODS.solaris += vboxdrv
    5353 endif
    54  OTHERS.linux    += \
    55         $(PATH_BIN)/src/build_in_tmp \
    56         $(PATH_BIN)/src/Makefile \
    57         $(if $(VBOX_OSE),,$(PATH_BIN)/src/dkms.conf)
    58  INSTALLS.linux   += vboxmod-bin vboxmod-sh
     54 INSTALLS.linux   += vboxdrv-mod vboxdrv-sh
    5955
    6056 #
    … …  
    218214
    219215#
    220 # vboxdrv.ko - The Linux Kernel Module (syntax only).
     216# vboxdrv.ko - The Linux Kernel Module (syntax check only).
    221217#
    222218ifeq ($(KBUILD_TARGET),linux)
    … …  
    247243# Targets for installing the linux sources.
    248244#
    249 vboxmod-bin_INST    = bin/src/
    250 vboxmod-bin_MODE    = a+r,u+w
    251 vboxmod-bin_SOURCES = $(subst ",,$(FILES_VBOXDRV_NOBIN)) #"
    252 
    253 vboxmod-sh_INST     = bin/src/
    254 vboxmod-sh_MODE     = a+rx,u+w
    255 vboxmod-sh_SOURCES  = $(subst ",,$(FILES_VBOXDRV_BIN)) #"
    256 vboxmod-sh_CLEAN    = $(PATH_TARGET)/vboxmod-sh-1.dep
     245vboxdrv-mod_INST    = bin/src/vboxdrv/
     246vboxdrv-mod_MODE    = a+r,u+w
     247vboxdrv-mod_SOURCES = $(subst ",,$(FILES_VBOXDRV_NOBIN)) #"
     248vboxdrv-mod_SOURCES += \
     249        $(if $(VBOX_OSE),,$(PATH_vboxdrv-mod)/dkms.conf) \
     250        $(PATH_vboxdrv-mod)/Makefile
     251vboxdrv-mod_CLEAN   = \
     252        $(PATH_vboxdrv-mod)/dkms.conf \
     253        $(PATH_vboxdrv-mod)/Makefile
     254
     255vboxdrv-sh_INST     = bin/src/vboxdrv
     256vboxdrv-sh_MODE     = a+rx,u+w
     257vboxdrv-sh_SOURCES  = $(subst ",,$(FILES_VBOXDRV_BIN)) #"
     258vboxdrv-sh_SOURCES += $(PATH_vboxdrv-sh)/build_in_tmp
     259vboxdrv-sh_CLEAN    = \
     260        $(PATH_TARGET)/vboxdrv-sh-1.dep \
     261        $(PATH_vboxdrv-sh)/build_in_tmp
     262
    257263
    258264# Scripts needed for building the kernel modules
    259 ## @todo generate these else where and move them from OTHERS to vboxmod-bin (which btw installs NOBIN files contrary to its name).
    260 
    261 $(PATH_BIN)/src/build_in_tmp: \
     265
     266$$(PATH_vboxdrv-sh)/build_in_tmp: \
    262267                $(PATH_SUB_CURRENT)/linux/build_in_tmp \
    263                 $(VBOX_VERSION_STAMP)
     268                $(VBOX_VERSION_STAMP) \
     269                | $$(dir $$@)
    264270        $(call MSG_TOOL,Creating,,$@)
    265271        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxdrv;g" --output $@ $<
    266272        $(QUIET)chmod 0755 $@
    267273
    268 $(PATH_BIN)/src/dkms.conf: \
     274$$(PATH_vboxdrv-mod)/dkms.conf: \
    269275                $(PATH_SUB_CURRENT)/linux/dkms.conf \
    270                 $(VBOX_VERSION_STAMP)
     276                $(VBOX_VERSION_STAMP) \
     277                | $$(dir $$@)
    271278        $(call MSG_TOOL,Creating,,$@)
    272279        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" --output $@ $<
    273280
    274 includedep $(PATH_TARGET)/vboxmod-sh-1.dep
    275 $(PATH_BIN)/src/Makefile: \
     281includedep $(PATH_TARGET)/vboxdrv-sh-1.dep
     282$$(PATH_vboxdrv-mod)/Makefile: \
    276283                $(PATH_SUB_CURRENT)/linux/Makefile \
    277284                $$(if $$(eq $$(Support/linux/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
    278                 | $(PATH_TARGET)/
     285                | $$(dir $$@)
    279286        $(call MSG_TOOL,Creating,,$@)
    280287 ifndef VBOX_WITH_HARDENING
    … …  
    283290        $(QUIET)$(CP) -f $< $@
    284291 endif
    285         %$(QUIET2)$(RM) -f -- $(PATH_TARGET)/vboxmod-sh-1.dep
    286         %$(QUIET2)$(APPEND) '$(PATH_TARGET)/vboxmod-sh-1.dep' 'Support/linux/Makefile_VBOX_HARDENED=$(VBOX_WITH_HARDENING)'
     292        %$(QUIET2)$(RM) -f -- $(PATH_TARGET)/vboxdrv-sh-1.dep
     293        %$(QUIET2)$(APPEND) '$(PATH_TARGET)/vboxdrv-sh-1.dep' 'Support/linux/Makefile_VBOX_HARDENED=$(VBOX_WITH_HARDENING)'
    287294
    288295endif # real linux

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

    r13854 r14015  
    136136vboxnetflt_DEFS.solaris  += VBOX_SVN_REV=$(VBOX_SVN_REV)
    137137vboxnetflt_DEPS.solaris  += $(VBOX_SVN_REV_KMK)
     138vboxnetflt_NOINST        = true
    138139vboxnetflt_INCS.linux   := \
    139140        $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
    … …  
    162163 #
    163164 include $(PATH_SUB_CURRENT)/linux/files_vboxnetflt
    164  INSTALLS += VBoxNetFlt-src
     165 INSTALLS += VBoxNetFlt-src VBoxNetFlt-sh
    165166 VBoxNetFlt-src_INST    = bin/src/vboxnetflt/
    166167 VBoxNetFlt-src_MODE    = a+r,u+w
    167168 VBoxNetFlt-src_SOURCES = $(subst ",,$(VBOX_VBOXNETFLT_SOURCES)) #"
    168  VBoxNetFlt-src_SOURCES+= $(PATH_VBoxNetFlt-src)/Makefile
    169  VBoxNetFlt-src_CLEAN   = $(PATH_VBoxNetFlt-src)/Makefile
     169 VBoxNetFlt-src_SOURCES+= \
     170        $(if $(VBOX_OSE),,$(PATH_VBoxNetFlt-src)/dkms.conf) \
     171        $(PATH_VBoxNetFlt-src)/Makefile
     172 VBoxNetFlt-src_CLEAN   = \
     173        $(PATH_VBoxNetFlt-src)/dkms.conf \
     174        $(PATH_VBoxNetFlt-src)/Makefile
     175
     176 VBoxNetFlt-sh_INST    = bin/src/vboxnetflt/
     177 VBoxNetFlt-sh_MODE    = a+rx,u+w
     178 VBoxNetFlt-sh_SOURCES = $(PATH_VBoxNetFlt-sh)/build_in_tmp
     179 VBoxNetFlt-sh_CLEAN   = $(PATH_VBoxNetFlt-sh)/build_in_tmp
     180
    170181
    171182includedep $(PATH_TARGET)/VBoxNetFlt-src-1.dep
    … …  
    183194
    184195## Scripts needed for building the kernel modules
    185 ### @todo generate these else where and move them from OTHERS to vboxmod-bin (which btw installs NOBIN files contrary to its name).
    186 #
    187 #$(PATH_BIN)/src/build_in_tmp: \
    188 #               $(PATH_SUB_CURRENT)/linux/build_in_tmp \
    189 #               $(VBOX_VERSION_STAMP)
    190 #       $(call MSG_TOOL,Creating,,$@)
    191 #       $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxdrv;g" --output $@ $<
    192 #       $(QUIET)chmod 0755 $@
    193 #
    194 #$(PATH_BIN)/src/dkms.conf: \
    195 #               $(PATH_SUB_CURRENT)/linux/dkms.conf \
    196 #               $(VBOX_VERSION_STAMP)
    197 #       $(call MSG_TOOL,Creating,,$@)
    198 #       $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" --output $@ $<
     196
     197$$(PATH_VBoxNetFlt-sh)/build_in_tmp: \
     198                $(PATH_ROOT)/src/VBox/HostDrivers/Support/linux/build_in_tmp \
     199                $(VBOX_VERSION_STAMP) \
     200                | $$(dir $$@)
     201        $(call MSG_TOOL,Creating,,$@)
     202        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxnetflt;g" --output $@ $<
     203        $(QUIET)chmod 0755 $@
     204
     205$$(PATH_VBoxNetFlt-src)/dkms.conf: \
     206                $(PATH_SUB_CURRENT)/dkms.conf \
     207                $(VBOX_VERSION_STAMP) \
     208                | $$(dir $$@)
     209        $(call MSG_TOOL,Creating,,$@)
     210        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" --output $@ $<
    199211
    200212endif # linux

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

    r13642 r14015  
    231231                $(VBOX_LNX_INST_OUT_DIR)/vboxnet.sh \
    232232                $(VBOX_LNX_INST_OUT_DIR)/vboxdrv.sh \
    233                 $(VBOX_LNX_INST_OUT_DIR)/install.sh
     233                $(VBOX_LNX_INST_OUT_DIR)/install.sh \
     234                $(wildcard $(PATH_BIN)/src/*) \
     235                $(wildcard $(PATH_BIN)/src/*/*) \
     236                $(wildcard $(PATH_BIN)/src/*/*/*) \
     237                $(wildcard $(PATH_BIN)/src/*/*/*/*)
    234238        $(call MSG_TOOL,makeself,,$@)
    235239        $(QUIET)$(RM) -f $(wildcard $(PATH_BIN)/VirtualBox-*.run)
Note: See TracChangeset for help on using the changeset viewer.

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