Changeset 108705 in vbox

Timestamp:

Mar 24, 2025 6:59:38 AM (12 days ago)

Author:

vboxsync

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

168122

Message:

Additions/linux: Allow creating run packages from other hosts, use VBOX_GTAR instead of tar and VBOX_OBJCOPY instead of objcopy directly, bugref:10874 bugref:10391

File:

• trunk/src/VBox/Additions/linux/Makefile.kmk (modified) (9 diffs)

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

@@ -205 +205 @@
                 $(VBOX_LNX_ADD_DBG_BIN_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
         $(call MSG_TOOL,copydbg,$<,$@)
-        $(QUIET)objcopy --only-keep-debug $< $@
+        $(QUIET)$(VBOX_OBJCOPY) --only-keep-debug $< $@
 
 $(addprefix $(VBOX_LNX_ADD_DBG_SBIN_DIR),$(VBOX_LNX_ADD_STRIP_SBIN)): \
                 $(VBOX_LNX_ADD_DBG_SBIN_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
         $(call MSG_TOOL,copydbg,$<,$@)
-        $(QUIET)objcopy --only-keep-debug $< $@
+        $(QUIET)$(VBOX_OBJCOPY) --only-keep-debug $< $@
 
 $(addprefix $(VBOX_LNX_ADD_DBG_LIB_DIR),$(VBOX_LNX_ADD_STRIP_LIB)): \
                 $(VBOX_LNX_ADD_DBG_LIB_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
         $(call MSG_TOOL,copydbg,$<,$@)
-        $(QUIET)objcopy --only-keep-debug $< $@
+        $(QUIET)$(VBOX_OBJCOPY) --only-keep-debug $< $@
 
 $(addprefix $(VBOX_LNX_ADD_DBG_OTHER_DIR),$(VBOX_LNX_ADD_STRIP_MOD)): \
                 $(VBOX_LNX_ADD_DBG_OTHER_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
         $(call MSG_TOOL,copydbg,$<,$@)
-        $(QUIET)objcopy --only-keep-debug $< $@
+        $(QUIET)$(VBOX_OBJCOPY) --only-keep-debug $< $@
 
 # pattern rule for stripping and copying the VBOX_LNX_ADD_STRIP_BIN files to the installation directory
@@ -229 +229 @@
         $(call MSG_INST_FILE,$<,$@)
         $(QUIET)$(INSTALL) -m 0755 $(if $(VBOX_DO_STRIP),-s,) $< $@
-        $(QUIET)objcopy --add-gnu-debuglink=$(subst $(VBOX_LNX_ADD_INST_BIN_DIR),$(VBOX_LNX_ADD_DBG_BIN_DIR),$@) $@
+        $(QUIET)$(VBOX_OBJCOPY) --add-gnu-debuglink=$(subst $(VBOX_LNX_ADD_INST_BIN_DIR),$(VBOX_LNX_ADD_DBG_BIN_DIR),$@) $@
 
 # pattern rule for stripping and copying the VBOX_LNX_ADD_STRIP_SBIN files to the installation directory
@@ -239 +239 @@
         $(call MSG_INST_FILE,$<,$@)
         $(QUIET)$(INSTALL) -m 0755 $(if $(VBOX_DO_STRIP),-s,) $< $@
-        $(QUIET)objcopy --add-gnu-debuglink=$(subst $(VBOX_LNX_ADD_INST_SBIN_DIR),$(VBOX_LNX_ADD_DBG_SBIN_DIR),$@) $@
+        $(QUIET)$(VBOX_OBJCOPY) --add-gnu-debuglink=$(subst $(VBOX_LNX_ADD_INST_SBIN_DIR),$(VBOX_LNX_ADD_DBG_SBIN_DIR),$@) $@
 
 # pattern rule for stripping and copying vbox-greeter to the installation directory
@@ -255 +255 @@
         $(call MSG_INST_FILE,$<,$@)
         $(QUIET)$(INSTALL) -m 0755 $(if $(VBOX_DO_STRIP),-s,) $< $@
-        $(QUIET)objcopy --add-gnu-debuglink=$(subst $(VBOX_LNX_ADD_INST_LIB_DIR),$(VBOX_LNX_ADD_DBG_LIB_DIR),$@) $@
+        $(QUIET)$(VBOX_OBJCOPY) --add-gnu-debuglink=$(subst $(VBOX_LNX_ADD_INST_LIB_DIR),$(VBOX_LNX_ADD_DBG_LIB_DIR),$@) $@
 
 # pattern rule for stripping and copying the VBOX_LNX_ADD_STRIP_MOD files to the installation directory
@@ -264 +264 @@
         $(call MSG_INST_FILE,$<,$@)
         $(QUIET)$(INSTALL) -m 0755 $(if $(VBOX_DO_STRIP),-s,) $< $@
-        $(QUIET)objcopy --add-gnu-debuglink=$(subst $(VBOX_LNX_ADD_INST_OTHER_DIR),$(VBOX_LNX_ADD_DBG_OTHER_DIR),$@) $@
+        $(QUIET)$(VBOX_OBJCOPY) --add-gnu-debuglink=$(subst $(VBOX_LNX_ADD_INST_OTHER_DIR),$(VBOX_LNX_ADD_DBG_OTHER_DIR),$@) $@
 
 # pattern rule for stripping and copying the VBOX_LNX_ADD_STRIP_OBJ files to the installation directory
@@ -273 +273 @@
         $(QUIET)$(INSTALL) -m 0644 $< $@
 else # strip to temp file because of umask.
-        $(QUIET)objcopy --strip-unneeded -R .comment $< [email protected]
+        $(QUIET)$(VBOX_OBJCOPY) --strip-unneeded -R .comment $< [email protected]
         $(QUIET)$(INSTALL) -m 0644 [email protected] $@
         $(QUIET)$(RM) -f -- [email protected]
@@ -406 +406 @@
         $(QUIET)$(CHMOD) 0755 $(VBOX_LNX_ADD_ARCH_INST_DIRS)
 ifdef VBOX_USE_PBZIP2
-        $(QUIET)tar --dereference --owner 0 --group 0 -cRf $(patsubst %.bz2,%,$@) \
+        $(QUIET)$(VBOX_GTAR) --dereference --owner 0 --group 0 -cRf $(patsubst %.bz2,%,$@) \
                 -C $(VBOX_LNX_ADD_INST_OUT_DIR) \
                 LICENSE bin init lib other sbin src \
@@ -412 +412 @@
         $(QUIET)pbzip2 $(patsubst %.bz2,%,$@)
 else
-        $(QUIET)tar --dereference --owner 0 --group 0 --ignore-failed-read -cjRf $@ \
+        $(QUIET)$(VBOX_GTAR) --dereference --owner 0 --group 0 --ignore-failed-read -cjRf $@ \
                 -C $(VBOX_LNX_ADD_INST_OUT_DIR) \
                 LICENSE bin init lib other sbin src \
@@ -431 +431 @@
         $(QUIET)$(CHMOD) 0755 $(VBOX_LNX_ADD_DBG_DIRS)
 ifdef VBOX_USE_PBZIP2
-        $(QUIET)tar --dereference --owner 0 --group 0 -cRf $(patsubst %.bz2,%,$@) \
+        $(QUIET)$(VBOX_GTAR) --dereference --owner 0 --group 0 -cRf $(patsubst %.bz2,%,$@) \
                 -C $(VBOX_LNX_ADD_INST_DBG_DIR) \
                 bin lib sbin
         $(QUIET)pbzip2 $(patsubst %.bz2,%,$@)
 else
-        $(QUIET)tar --dereference --owner 0 --group 0 --ignore-failed-read -cjRf $@ \
+        $(QUIET)$(VBOX_GTAR) --dereference --owner 0 --group 0 --ignore-failed-read -cjRf $@ \
                 -C $(VBOX_LNX_ADD_INST_DBG_DIR) \
                 bin lib sbin