Changeset 108704 in vbox for trunk/src/VBox/Installer/linux/Makefile.kmk

Timestamp:

Mar 24, 2025 6:58:34 AM (4 weeks ago)

Author:

vboxsync

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

168121

Message:

Installer/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/Installer/linux/Makefile.kmk (modified) (7 diffs)

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

@@ -37 +37 @@
 # endif
 
-ifneq ($(KBUILD_HOST),linux)
- $(error "The Linux installer can only be built on Linux!")
-endif
 
 #
@@ -462 +459 @@
         $(QUIET)$(MKDIR) -p $(@D)
 ifdef VBOX_USE_PBZIP2
-        $(QUIET)tar --dereference --owner 0 --group 0 \
+        $(QUIET)$(VBOX_GTAR) --dereference --owner 0 --group 0 \
                 -cRhf $(patsubst %.bz2,%,$@) -C $(VBOX_LNX_INST_OUT_DIR)/archive $(VBOX_LNX_ARCH_FILES)
         $(QUIET)pbzip2 $(patsubst %.bz2,%,$@)
 else
-        $(QUIET)tar --dereference --owner 0 --group 0 \
+        $(QUIET)$(VBOX_GTAR) --dereference --owner 0 --group 0 \
                 -cjRhf $@ -C $(VBOX_LNX_INST_OUT_DIR)/archive $(VBOX_LNX_ARCH_FILES)
 endif
@@ -478 +475 @@
         $(QUIET)$(RM) -f -- $(VBOX_LNX_INST_OUT_DIR)/VirtualBox-$(VBOX_VERSION_STRING) $@ $(patsubst %.bz2,%,$@)
         $(QUIET)$(LN_SYMLINK) $(VBOX_LNX_INST_OUT_DIR)/archive/ $(VBOX_LNX_INST_OUT_DIR)/VirtualBox-$(VBOX_VERSION_STRING)
-        $(QUIET)tar --dereference --owner 0 --group 0 \
+        $(QUIET)$(VBOX_GTAR) --dereference --owner 0 --group 0 \
                 -cRhf $@ -C $(VBOX_LNX_INST_OUT_DIR) \
                 $(addprefix VirtualBox-$(VBOX_VERSION_STRING)/,$(VBOX_LNX_ARCH_FILES))
@@ -492 +489 @@
         $(call MSG_INST_FILE,$<,$@)
         $(QUIET)$(INSTALL) -m 0755 $(if $(VBOX_DO_STRIP),-s,) $< $@
-        $(QUIET)$(if $(VBOX_NO_LINUX_RUN_INSTALLER),,objcopy --add-gnu-debuglink=$(subst $(VBOX_LNX_INST_OUT_DIR)/archive,$(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH),$@) $@)
+        $(QUIET)$(if $(VBOX_NO_LINUX_RUN_INSTALLER),,$(VBOX_OBJCOPY) --add-gnu-debuglink=$(subst $(VBOX_LNX_INST_OUT_DIR)/archive,$(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH),$@) $@)
 
 # pattern rule for copying VBOX_LNX_DBG_BIN files to archive-dbg/
@@ -507 +504 @@
         $(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]
@@ -575 +572 @@
         $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@)
 ifdef VBOX_USE_PBZIP2
-        $(QUIET)tar --dereference --owner 0 --group 0 \
+        $(QUIET)$(VBOX_GTAR) --dereference --owner 0 --group 0 \
                 -cRhf $(patsubst %.bz2,%,$@) -C $(VBOX_LNX_INST_OUT_DIR)/archive-dbg \
                 $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN))
         $(QUIET)pbzip2 $(patsubst %.bz2,%,$@)
 else
-        $(QUIET)tar --dereference --owner 0 --group 0 \
+        $(QUIET)$(VBOX_GTAR) --dereference --owner 0 --group 0 \
                 -cjRhf $@ -C $(VBOX_LNX_INST_OUT_DIR)/archive-dbg \
                 $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN))
@@ -589 +586 @@
                 $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/% : $(PATH_STAGE_BIN)/% | $$(dir $$@)
         $(call MSG_TOOL,copydbg,$<,$@)
-        $(QUIET)objcopy --only-keep-debug $< $@
+        $(QUIET)$(VBOX_OBJCOPY) --only-keep-debug $< $@
 
 # rules for creating directories in archive-dbg (the pattern rules depends on these).