Merge lp:~timrchavez/live-build/lb-sg-2.x-add-suppport-for-pxz into lp:~ce-infrastructure/live-build/lb-sg-2.x

[Timothy R. Chavez]

Add support for pxz compression to live-build. An initial test shows that defaulting to 4 threads (# of cpu cores in our armhf buildds) drops the build time down from ~49 minutes to ~27 minutes which equates to around a 45% reduction in build time.

[David Murphy (schwuk)]

Looks OK.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-11 19:27:22 +0000
+++ debian/changelog	2013-10-17 03:38:15 +0000
@@ -1,3 +1,9 @@
+live-build (2.0.12-2cesg23) precise; urgency=low
+
+  * Add support for pxz.
+
+ -- Timothy Chavez <[e-mail]>  Wed, 16 Oct 2013 16:15:38 -0500
+
 live-build (2.0.12-2cesg22-1) precise; urgency=low
 
   * Bump to build package for Saucy (via recipe). Added the '-0' to overcome a

=== modified file 'functions/defaults.sh'
--- functions/defaults.sh	2013-04-02 16:05:28 +0000
+++ functions/defaults.sh	2013-10-17 03:38:15 +0000
@@ -83,6 +83,8 @@
 
 	XZ_OPTIONS="${XZ_OPTIONS:--6}"
 
+	PXZ_OPTIONS="${PXZ_OPTIONS:-$XZ_OPTIONS}"
+
 	# Setting apt recommends
 	case "${LB_MODE}" in
 		debian|debian-release|ubuntu)

=== modified file 'scripts/build/lb_binary_tar'
--- scripts/build/lb_binary_tar	2013-01-22 18:30:18 +0000
+++ scripts/build/lb_binary_tar	2013-10-17 03:38:15 +0000
@@ -61,6 +61,10 @@
 		xz ${XZ_OPTIONS} binary-tar.tar
 		;;
 
+	pxz)
+		pxz ${PXZ_OPTIONS} binary-tar.tar
+		;;
+
 	none)
 		;;
 esac

=== modified file 'scripts/build/lb_config'
--- scripts/build/lb_config	2013-04-02 16:05:28 +0000
+++ scripts/build/lb_config	2013-10-17 03:38:15 +0000
@@ -54,7 +54,7 @@
 \t    [--cache-packages true|false]\n\
 \t    [--cache-stages STAGE|\"STAGES\"]\n\
 \t    [--checksums md5|sha1|sha256|none]\n\
-\t    [--compression bzip2|gzip|xz|none]\n\
+\t    [--compression bzip2|gzip|xz|pxz|none]\n\
 \t    [--zsync true|false]\n\
 \t    [--build-with-chroot true|false]\n\
 \t    [--chroot-filesystem ext2|ext3|ext4|squashfs|plain|jffs2]\n\

=== modified file 'scripts/build/lb_source_tar'
--- scripts/build/lb_source_tar	2013-01-11 22:57:09 +0000
+++ scripts/build/lb_source_tar	2013-10-17 03:38:15 +0000
@@ -72,6 +72,11 @@
 		xz ${XZ_OPTIONS} source.debian-live.tar
 		;;
 
+	pxz)
+		pxz ${PXZ_OPTIONS} source.debian.tar
+		pxz ${PXZ_OPTIONS} source.debian-live.tar
+		;;
+
 	none)
 		;;
 esac