Merge lp:~oem-solutions-releng/live-build/lb-sg-2.x-add-support-for-xz-and-bzip2-compression into lp:~ce-infrastructure/live-build/lb-sg-2.x

[Timothy R. Chavez]

Add support for compressing tar images (binary and source) with 'xz' or 'bzip2'. This work adds the LB_COMPRESSION variable (which is compatible with live-build 3.x) as a way to specify which compression type is desired. If LB_COMPRESSION is not specified, it will default to 'gzip', which is the default compression type used today. Functional verification testing has been done for the following scenarios:

 - Default (not specifying LB_COMPRESSION)
 - LB_COMPRESSION="xz"
 - LB_COMPRESSION="bzip2"

Premium team confirmed that one of their images compress with xz could be decompressed and flashed to a system successfully.

[lp:~oem-solutions-releng/live-build/lb-sg-2.x-add-support-for-xz-and-bzip2-compression]

1607. By Timothy R. Chavez on 2013-01-15

Remove the bit of changelog that is no longer relevant, since the functionality was removed.

[Kevin McDermott (bigkevmcd)]

Looks ok to me, bash syntax notwithstanding :-)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-04 07:41:01 +0000
+++ debian/changelog	2013-01-15 18:13:28 +0000
@@ -1,3 +1,14 @@
+live-build (2.0.12-2cesg12) lucid; urgency=low
+
+  * functions/defaults.sh,
+    scripts/build/lb_binary_tar,
+    scripts/build/lb_config,
+    scripts/build/lb_source_tar
+    - Backport LB_COMPRESSION from live-build-3.0~b5-1 to support bzip2 and xz
+    compression
+
+ -- Timothy Chavez <[e-mail]>  Thu, 10 Jan 2013 09:36:13 -0600
+
 live-build (2.0.12-2cesg11) lucid; urgency=low
 
   * scripts/build/lb_config: Avoid GENISOIMAGE_OPTIONS_EXTRA being erased when

=== modified file 'functions/defaults.sh'
--- functions/defaults.sh	2012-11-15 15:34:57 +0000
+++ functions/defaults.sh	2013-01-15 18:13:28 +0000
@@ -72,6 +72,8 @@
 	APT_OPTIONS="${APT_OPTIONS:---yes}"
 	APTITUDE_OPTIONS="${APTITUDE_OPTIONS:---assume-yes}"
 
+	BZIP2_OPTIONS="${BZIP2_OPTIONS:--6}"
+
 	GZIP_OPTIONS="${GZIP_OPTIONS:---fast}"
 
 	if gzip --help | grep -qs "\-\-rsyncable"
@@ -79,6 +81,8 @@
 		GZIP_OPTIONS="$(echo ${GZIP_OPTIONS} | sed -e 's|--rsyncable||') --rsyncable"
 	fi
 
+	XZ_OPTIONS="${XZ_OPTIONS:--6}"
+
 	# Setting apt recommends
 	case "${LB_MODE}" in
 		debian|debian-release|ubuntu)
@@ -870,6 +874,9 @@
 	# Setting checksums
 	LB_CHECKSUMS="${LB_CHECKSUMS:-md5}"
 
+	# Setting compression type
+	LB_COMPRESSION="${LB_COMPRESSION:-gzip}"
+
 	# Setting chroot option
 	LB_BUILD_WITH_CHROOT="${LB_BUILD_WITH_CHROOT:-true}"
 

=== modified file 'scripts/build/lb_binary_tar'
--- scripts/build/lb_binary_tar	2011-03-09 18:17:33 +0000
+++ scripts/build/lb_binary_tar	2013-01-15 18:13:28 +0000
@@ -44,10 +44,26 @@
 Create_lockfile .lock
 
 # Remove old binary
-rm -f binary.tar.gz
+rm -f binary.tar.bz2 binary.tar.gz binary.tar.xz binary.tar
 
 tar cf binary-tar.tar binary
-gzip ${GZIP_OPTIONS} binary-tar.tar
+
+case "${LB_COMPRESSION}" in
+	bzip2)
+		bzip2 ${BZIP2_OPTIONS} binary-tar.tar
+		;;
+
+	gzip)
+		gzip ${GZIP_OPTIONS} binary-tar.tar
+		;;
+
+	xz)
+		xz ${XZ_OPTIONS} binary-tar.tar
+		;;
+
+	none)
+		;;
+esac
 
 # Creating stage file
 Create_stagefile .stage/binary_tar

=== modified file 'scripts/build/lb_config'
--- scripts/build/lb_config	2012-12-04 07:41:01 +0000
+++ scripts/build/lb_config	2013-01-15 18:13:28 +0000
@@ -54,6 +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    [--build-with-chroot true|false]\n\
 \t    [--chroot-filesystem ext2|ext3|squashfs|plain|jffs2]\n\
 \t    [--clean]\n\
@@ -573,6 +574,11 @@
 				shift 2
 				;;
 
+			--compression)
+				LB_COMPRESSION="${2}"
+				shift 2
+				;;
+
 			--build-with-chroot)
 				LB_BUILD_WITH_CHROOT="${2}"
 				shift 2
@@ -1185,6 +1191,10 @@
 # (Default: ${LB_CHECKSUMS})
 LB_CHECKSUMS="${LB_CHECKSUMS}"
 
+# \$LB_COMPRESSION: set compression
+# (Default: ${LB_COMPRESSION})
+LB_COMPRESSION="${LB_COMPRESSION}"
+
 # \${LB_BUILD_WITH_CHROOT: control if we build binary images chrooted
 # (Default: ${LB_BUILD_WITH_CHROOT})
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false.

=== modified file 'scripts/build/lb_source_tar'
--- scripts/build/lb_source_tar	2011-03-09 18:17:33 +0000
+++ scripts/build/lb_source_tar	2013-01-15 18:13:28 +0000
@@ -50,15 +50,31 @@
 Create_lockfile .lock
 
 # Remove old source
-rm -f source.debian.tar.gz
-rm -f source.debian-live.tar.gz
+rm -f source.debian.tar.bz2 source.debian.tar.gz source.debian.tar.xz source.debian.tar
+rm -f source.debian-live.tar.bz2 source.debian-live.tar.gz source.debian-live.tar.xz source.debian-live.tar
 
-# Create tarballs
 tar cf source.debian.tar source/debian
-gzip ${GZIP_OPTIONS} source.debian.tar
-
 tar cf source.debian-live.tar source/debian-live
-gzip ${GZIP_OPTIONS} source.debian-live.tar
+
+case "${LB_COMPRESSION}" in
+	bzip2)
+		bzip2 ${BZIP2_OPTIONS} source.debian.tar
+		bzip2 ${BZIP2_OPTIONS} source.debian-live.tar
+		;;
+
+	gzip)
+		gzip ${GZIP_OPTIONS} source.debian.tar
+		gzip ${GZIP_OPTIONS} source.debian-live.tar
+		;;
+
+	xz)
+		xz ${XZ_OPTIONS} source.debian.tar
+		xz ${XZ_OPTIONS} source.debian-live.tar
+		;;
+
+	none)
+		;;
+esac
 
 # Creating stage file
 Create_stagefile .stage/source_tar