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

Timestamp:

Dec 1, 2014 3:36:30 PM (10 years ago)

Author:

vboxsync

Message:

backed out r97069, r97070, does not really work

File:

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

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

@@ -412 +412 @@
         $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@)
         $(QUIET)$(MKDIR) -p $(@D)
-        $(QUIET)if which pbzip2 > /dev/null; then \
-                tar --dereference --owner 0 --group 0 --use-compress-program pbzip2 \
-                -cRhf $@ -C $(VBOX_LNX_INST_OUT_DIR)/archive $(VBOX_LNX_ARCH_FILES); else \
-                tar --dereference --owner 0 --group 0 \
-                -cjRhf $@ -C $(VBOX_LNX_INST_OUT_DIR)/archive $(VBOX_LNX_ARCH_FILES); fi
+ifdef VBOX_USE_PBZIP2
+        $(QUIET)tar --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 \
+                -cjRhf $@ -C $(VBOX_LNX_INST_OUT_DIR)/archive $(VBOX_LNX_ARCH_FILES)
+endif
         $(QUIET)$(CHMOD) 0644 $@
 
@@ -426 +429 @@
         $(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)if which pbzip2 > /dev/null; then \
-                tar --dereference --owner 0 --group 0 --use-compress-program pbzip2 \
-                -cRhf $@ -C $(VBOX_LNX_INST_OUT_DIR) \
-                $(addprefix VirtualBox-$(VBOX_VERSION_STRING)/,$(VBOX_LNX_ARCH_FILES)); else \
-                tar --dereference --owner 0 --group 0 \
+ifdef VBOX_USE_PBZIP2
+        $(QUIET)tar --dereference --owner 0 --group 0 \
+                -cRhf $(patsubst %.bz2,%,$@) -C $(VBOX_LNX_INST_OUT_DIR) \
+                $(addprefix VirtualBox-$(VBOX_VERSION_STRING)/,$(VBOX_LNX_ARCH_FILES))
+        $(QUIET)pbzip2 $(patsubst %.bz2,%,$@)
+else
+        $(QUIET)tar --dereference --owner 0 --group 0 \
                 -cjRhf $@ -C $(VBOX_LNX_INST_OUT_DIR) \
-                $(addprefix VirtualBox-$(VBOX_VERSION_STRING)/,$(VBOX_LNX_ARCH_FILES)); fi
+                $(addprefix VirtualBox-$(VBOX_VERSION_STRING)/,$(VBOX_LNX_ARCH_FILES))
+endif
         $(QUIET)$(RM) -f -- $(VBOX_LNX_INST_OUT_DIR)/VirtualBox-$(VBOX_VERSION_STRING)
 
@@ -502 +508 @@
         $(call MSG_L1,Packing $@)
         $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@)
-        $(QUIET)if which pbzip2 > /dev/null; then \
-                tar --dereference --owner 0 --group 0 --use-compress-program pbzip2 \
-                -cRhf $@ -C $(VBOX_LNX_INST_OUT_DIR)/archive-dbg \
-                $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN)); else \
-                tar --dereference --owner 0 --group 0 \
+ifdef VBOX_USE_PBZIP2
+        $(QUIET)tar --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))
+        $(QUIET)pbzip2 $(patsubst %.bz2,%,$@)
+else
+        $(QUIET)tar --dereference --owner 0 --group 0 \
                 -cjRhf $@ -C $(VBOX_LNX_INST_OUT_DIR)/archive-dbg \
-                $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN)); fi
+                $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN))
+endif
 
 # pattern rule for copying the debug info from the VBOX_LNX_STRIP_BIN files into archive-dbg/$(VBOX_LNX_DBG_PATH)/