Changeset 11762 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

Aug 28, 2008 2:02:48 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

35538

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.

File:

• trunk/src/VBox/Installer/linux/Makefile.kmk (modified) (3 diffs)

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

@@ -108 +108 @@
         VBoxAddIF.sh \
         $(if $(VBOX_WITH_QT4GUI),VirtualBox.desktop,) \
-        src 
+        src
 
 # Qt4 GUI
@@ -284 +284 @@
 endif
 
-# Note: The -m <mode> feature of kmk_builtin_install does not work together with fakeroot!
-# Note: $(INSTALL) -s is currently not reliable when used in parallel builds. Fixed in 0.1.1.
-# Update: Both these issues has been resolved.
-$(foreach f,$(LINUXSTRIPBIN),$(PATH_TARGET)/archive/$(f)): \
+$(addprefix $(PATH_TARGET)/archive/,$(LINUXSTRIPBIN)): \
                 $(PATH_TARGET)/archive/% : $(PATH_BIN)/% \
                 $(if $(VBOX_NO_LINUX_RUN_INSTALLER),,\
                     $(PATH_TARGET)/archive-dbg/$(DBGPATH)/%) \
-                | $(call DIRDEP,$(PATH_TARGET)/archive)
+                | $$(call DIRDEP,$$(dir $$@))
         $(call MSG_INST_FILE,$<,$@)
-        $(QUIET)install -D -m $(if $(filter %.so,$<),0644,0755) $(if $(VBOX_DO_STRIP),-s,) $< $@
+        $(QUIET)$(INSTALL) -m $(if $(filter %.so,$<),0644,0755) $(if $(VBOX_DO_STRIP),-s,) $< $@
         $(QUIET)$(if $(VBOX_NO_LINUX_RUN_INSTALLER),,objcopy --add-gnu-debuglink=$(subst $(PATH_TARGET)/archive,$(PATH_TARGET)/archive-dbg/$(DBGPATH),$@) $@)
 
-$(foreach f,$(LINUXSTRIPOBJ),$(PATH_TARGET)/archive/$(f)): \
-                $(PATH_TARGET)/archive/% : $(PATH_BIN)/% | $(call DIRDEP,$(PATH_TARGET)/archive)
+$(addprefix $(PATH_TARGET)/archive/,$(LINUXSTRIPOBJ)): \
+                $(PATH_TARGET)/archive/% : $(PATH_BIN)/% \
+                | $$(call DIRDEP,$$(dir $$@))
         $(call MSG_INST_FILE,$<,$@)
-        $(QUIET)$(if $(VBOX_DO_STRIP),objcopy --strip-unneeded -R .comment $< $@,cp $< $@)
-
-$(foreach f,$(LINUXNOSTRIP),$(PATH_TARGET)/archive/$(f)): \
-                $(PATH_TARGET)/archive/% : $(PATH_BIN)/% | $(call DIRDEP,$(PATH_TARGET)/archive)
+ifeq ($(VBOX_DO_STRIP),)
+        $(QUIET)$(INSTALL) -m 0644 $< $@
+else # strip to temp file because of umask.
+        $(QUIET)objcopy --strip-unneeded -R .comment $< [email protected]
+        $(QUIET)$(INSTALL) -m 0644 [email protected] $@
+        $(QUIET)$(RM) -f -- [email protected]
+endif
+
+$(addprefix  $(PATH_TARGET)/archive/,$(LINUXNOSTRIP)): \
+                $(PATH_TARGET)/archive/% : $(PATH_BIN)/% \
+                | $$(call DIRDEP,$$(dir $$@))
         $(call MSG_INST_SYM,$<,$@)
         $(QUIET)$(RM) -f $@
@@ -308 +313 @@
         $(QUIET)$(LN_SYMLINK) $< $@
 
-$(foreach d,archive archive-dbg/$(DBGPATH) archive-dbg/$(DBGPATH)/components install,$(PATH_TARGET)/$(d)/):
+$(foreach d,archive archive/components archive/nls archive/additions archive-dbg/$(DBGPATH) archive-dbg/$(DBGPATH)/components install,$(PATH_TARGET)/$(d)/):
         $(QUIET)$(MKDIR) -p $@
 
-$(foreach f,$(LINUXSTRIPBIN),$(PATH_TARGET)/archive-dbg/$(DBGPATH)/$(f)): \
+$(addprefix $(PATH_TARGET)/archive-dbg/$(DBGPATH)/,$(LINUXSTRIPBIN)): \
                 $(PATH_TARGET)/archive-dbg/$(DBGPATH)/% : $(PATH_BIN)/% \
                 | $(call DIRDEP,$(PATH_TARGET)/archive-dbg/$(DBGPATH)/components)