VirtualBox

Changeset 11762

Show
Ignore:
Timestamp:
08/28/08 16:02:48 (3 months ago)
Author:
vboxsync
Message:

#3076: don't use files directly from objcopy or make any use of cp since they are both subject to umask and may end up setting bits which we do not wish to set. Use kmk_install again, it's been fixed.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r11751 r11762  
    108108        VBoxAddIF.sh \ 
    109109        $(if $(VBOX_WITH_QT4GUI),VirtualBox.desktop,) \ 
    110         src  
     110        src 
    111111 
    112112# Qt4 GUI 
    …… 
    284284endif 
    285285 
    286 # Note: The -m <mode> feature of kmk_builtin_install does not work together with fakeroot! 
    287 # Note: $(INSTALL) -s is currently not reliable when used in parallel builds. Fixed in 0.1.1. 
    288 # Update: Both these issues has been resolved. 
    289 $(foreach f,$(LINUXSTRIPBIN),$(PATH_TARGET)/archive/$(f)): \ 
     286$(addprefix $(PATH_TARGET)/archive/,$(LINUXSTRIPBIN)): \ 
    290287                $(PATH_TARGET)/archive/% : $(PATH_BIN)/% \ 
    291288                $(if $(VBOX_NO_LINUX_RUN_INSTALLER),,\ 
    292289                    $(PATH_TARGET)/archive-dbg/$(DBGPATH)/%) \ 
    293                 | $(call DIRDEP,$(PATH_TARGET)/archive) 
     290                | $$(call DIRDEP,$$(dir $$@)) 
    294291        $(call MSG_INST_FILE,$<,$@) 
    295         $(QUIET)install -D -m $(if $(filter %.so,$<),0644,0755) $(if $(VBOX_DO_STRIP),-s,) $< $@ 
     292        $(QUIET)$(INSTALL) -m $(if $(filter %.so,$<),0644,0755) $(if $(VBOX_DO_STRIP),-s,) $< $@ 
    296293        $(QUIET)$(if $(VBOX_NO_LINUX_RUN_INSTALLER),,objcopy --add-gnu-debuglink=$(subst $(PATH_TARGET)/archive,$(PATH_TARGET)/archive-dbg/$(DBGPATH),$@) $@) 
    297294 
    298 $(foreach f,$(LINUXSTRIPOBJ),$(PATH_TARGET)/archive/$(f)): \ 
    299                 $(PATH_TARGET)/archive/% : $(PATH_BIN)/% | $(call DIRDEP,$(PATH_TARGET)/archive) 
     295$(addprefix $(PATH_TARGET)/archive/,$(LINUXSTRIPOBJ)): \ 
     296                $(PATH_TARGET)/archive/% : $(PATH_BIN)/% \ 
     297                | $$(call DIRDEP,$$(dir $$@)) 
    300298        $(call MSG_INST_FILE,$<,$@) 
    301         $(QUIET)$(if $(VBOX_DO_STRIP),objcopy --strip-unneeded -R .comment $< $@,cp $< $@) 
    302  
    303 $(foreach f,$(LINUXNOSTRIP),$(PATH_TARGET)/archive/$(f)): \ 
    304                 $(PATH_TARGET)/archive/% : $(PATH_BIN)/% | $(call DIRDEP,$(PATH_TARGET)/archive) 
     299ifeq ($(VBOX_DO_STRIP),) 
     300        $(QUIET)$(INSTALL) -m 0644 $< $@ 
     301else # strip to temp file because of umask. 
     302        $(QUIET)objcopy --strip-unneeded -R .comment $< $@.tmp 
     303        $(QUIET)$(INSTALL) -m 0644 $@.tmp $@ 
     304        $(QUIET)$(RM) -f -- $@.tmp 
     305endif 
     306 
     307$(addprefix  $(PATH_TARGET)/archive/,$(LINUXNOSTRIP)): \ 
     308                $(PATH_TARGET)/archive/% : $(PATH_BIN)/% \ 
     309                | $$(call DIRDEP,$$(dir $$@)) 
    305310        $(call MSG_INST_SYM,$<,$@) 
    306311        $(QUIET)$(RM) -f $@ 
    …… 
    308313        $(QUIET)$(LN_SYMLINK) $< $@ 
    309314 
    310 $(foreach d,archive archive-dbg/$(DBGPATH) archive-dbg/$(DBGPATH)/components install,$(PATH_TARGET)/$(d)/): 
     315$(foreach d,archive archive/components archive/nls archive/additions archive-dbg/$(DBGPATH) archive-dbg/$(DBGPATH)/components install,$(PATH_TARGET)/$(d)/): 
    311316        $(QUIET)$(MKDIR) -p $@ 
    312317 
    313 $(foreach f,$(LINUXSTRIPBIN),$(PATH_TARGET)/archive-dbg/$(DBGPATH)/$(f)): \ 
     318$(addprefix $(PATH_TARGET)/archive-dbg/$(DBGPATH)/,$(LINUXSTRIPBIN)): \ 
    314319                $(PATH_TARGET)/archive-dbg/$(DBGPATH)/% : $(PATH_BIN)/% \ 
    315320                | $(call DIRDEP,$(PATH_TARGET)/archive-dbg/$(DBGPATH)/components) 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy