Changeset 56848 in vbox

Timestamp:

Jul 8, 2015 8:16:29 AM (9 years ago)

Author:

vboxsync

Message:

rpm/deb: speed up packaging a little bit: don't compress the intermediate tarballs -- disk space is not an issue but CPU time for non-parallels jobs is

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (2 diffs)
• debian/rules (modified) (1 diff)
• rpm/VirtualBox.tmpl.spec (modified) (1 diff)
• rpm/rules (modified) (3 diffs)

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

@@ -43 +43 @@
 
 BLDDIRS  += $(VBOX_LNX_INST_OUT_DIR) $(VBOX_LNX_INST_STAGE_DIR)
-PACKING  += $(PATH_STAGE_BIN)/VirtualBox.tar.bz2
 if !defined(VBOX_NO_LINUX_RUN_INSTALLER)
  PACKING += $(PATH_STAGE_BIN)/$(VBOX_LNX_PACKAGE_NAME) \
             $(PATH_STAGE_BIN)/VirtualBox-dbg.tar.bz2
+else
+ PACKING += $(PATH_STAGE_BIN)/VirtualBox.tar
 endif
 
@@ -440 +441 @@
 # .tar.bz2 for distribution with the files under VirtualBox-<ver>/.
 #
-$(PATH_STAGE_BIN)/VirtualBox.tar.bz2: $(VBOX_LNX_INST_ARCH_DEPS)
+$(PATH_STAGE_BIN)/VirtualBox.tar: $(VBOX_LNX_INST_ARCH_DEPS)
         $(call MSG_L1,Packing $@)
         $(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)
-ifdef VBOX_USE_PBZIP2
         $(QUIET)tar --dereference --owner 0 --group 0 \
-                -cRhf $(patsubst %.bz2,%,$@) -C $(VBOX_LNX_INST_OUT_DIR) \
+                -cRhf $@ -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))
-endif
         $(QUIET)$(RM) -f -- $(VBOX_LNX_INST_OUT_DIR)/VirtualBox-$(VBOX_VERSION_STRING)
 

trunk/src/VBox/Installer/linux/debian/rules

@@ -207 +207 @@
         dh_clean -k
         dh_installdirs
-        tar -xjC $(prefix)/opt -f $(builddir)/bin/VirtualBox.tar.bz2
+        tar -xC $(prefix)/opt -f $(builddir)/bin/VirtualBox.tar
         $(if $(NOQT),,mv $(archdir)/virtualbox.xml debian/$(verpkg).sharedmimeinfo)
         $(archdir)/scripts/install.sh --package $(package) --root $(prefix) \

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -24 +24 @@
 Release:   1
 URL:       http://www.virtualbox.org/
-Source:    VirtualBox.tar.bz2
+Source:    VirtualBox.tar
 License:   GPLv2
 Group:     Applications/System

trunk/src/VBox/Installer/linux/rpm/rules

@@ -190 +190 @@
         rm -rf $(archdir)
         rm -rf $(builddir) rpm/VirtualBox-*
+        rm -f rpm/VirtualBox.tar
         rm -f rpm/VirtualBox.tar.bz2
         rm -f rpm/VirtualBox.spec
@@ -201 +202 @@
 binary: rpm/build-stamp
         rm -rf rpm/VirtualBox-*
-        tar -xjf $(builddir)/bin/VirtualBox.tar.bz2 -C rpm
+        tar -xf $(builddir)/bin/VirtualBox.tar -C rpm
         sed \
             -e 's|%VER%|$(ver)|g' \
@@ -233 +234 @@
         cp VBox.sh $(archdir)
         mv rpm/VirtualBox-$(ver) rpm/$(rpmname)
-        tar -cjf rpm/VirtualBox.tar.bz2 -C rpm $(rpmname)
+        tar -cf rpm/VirtualBox.tar -C rpm $(rpmname)
         rm -f /usr/src/packages/RPMS/*/VirtualBox*rpm
         rm -f /usr/src/packages/SPECS/*
-        (cd rpm; rpmbuild -tb --clean VirtualBox.tar.bz2)
+        (cd rpm; rpmbuild -tb --clean VirtualBox.tar)
         mv /usr/src/packages/RPMS/*/$(verpkg)-debug* $(pkgdir) || true
         file=`find /usr/src/packages/RPMS -name $(verpkg)*rpm -print`; \