[SCM] live-build branch, debian-next, updated. debian/3.0_a51-1-14-ge2841f2

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit d626c65d13fa4725013809cdc1e413ebb48a3fb5
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jul 18 19:44:00 2012 +0200

    Adding xz as valid compression format.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 8c79fa4..33621da 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -128,6 +128,8 @@ Set_defaults ()
 
 	LZMA_OPTIONS="${LZMA_OPTIONS:--6}"
 
+	XZ_OPTIONS="${XZ_OPTIONS:--6}"
+
 	# Setting apt recommends
 	case "${LB_MODE}" in
 		emdebian|progress)
diff --git a/scripts/build/lb_binary_netboot b/scripts/build/lb_binary_netboot
index 90669b0..b4957a3 100755
--- a/scripts/build/lb_binary_netboot
+++ b/scripts/build/lb_binary_netboot
@@ -157,6 +157,10 @@ case "${LB_COMPRESSION}" in
 		lzip ${LZIP_OPTIONS} ../binary.netboot.tar
 		;;
 
+	xz)
+		xz ${XZ_OPTIONS} ../binary.netboot.tar
+		;;
+
 	none)
 		;;
 esac
diff --git a/scripts/build/lb_binary_tar b/scripts/build/lb_binary_tar
index 4e6e614..9101e04 100755
--- a/scripts/build/lb_binary_tar
+++ b/scripts/build/lb_binary_tar
@@ -61,6 +61,10 @@ case "${LB_COMPRESSION}" in
 		lzip ${LZIP_OPTIONS} binary-tar.tar
 		;;
 
+	xz)
+		xz ${XZ_OPTIONS} binary-tar.xz
+		;;
+
 	none)
 		;;
 esac
diff --git a/scripts/build/lb_binary_zsync b/scripts/build/lb_binary_zsync
index 21cc017..5ec47e3 100755
--- a/scripts/build/lb_binary_zsync
+++ b/scripts/build/lb_binary_zsync
@@ -103,6 +103,10 @@ do
 				lzip ${LZIP_OPTIONS} ${_IMAGE}.zsync
 				;;
 
+			xz)
+				xz ${XZ_OPTIONS} ${_IMAGE}.zsync
+				;;
+
 			none)
 				;;
 		esac
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 97719a6..b185c03 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -54,7 +54,7 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--cache-packages true|false]\n\
 \t    [--cache-stages STAGE|\"STAGES\"]\n\
 \t    [--checksums md5|sha1|sha256|none]\n\
-\t    [--compression bzip2|gzip|lzip|none]\n\
+\t    [--compression bzip2|gzip|lzip|xz|none]\n\
 \t    [--zsync true|false]\n\
 \t    [--build-with-chroot true|false]\n\
 \t    [--chroot-filesystem ext2|ext3|ext4|squashfs|jffs2|none]\n\
diff --git a/scripts/build/lb_source_netboot b/scripts/build/lb_source_netboot
index 4882866..e979bcd 100755
--- a/scripts/build/lb_source_netboot
+++ b/scripts/build/lb_source_netboot
@@ -66,6 +66,10 @@ case "${_COMPRESSION}" in
 		lzip ${LZIP_OPTIONS} source.netboot.tar
 		;;
 
+	xz)
+		xz ${XZ_OPTIONS} source.netboot.tar
+		;;
+
 	none)
 		;;
 esac
diff --git a/scripts/build/lb_source_tar b/scripts/build/lb_source_tar
index 0f9396d..63933f0 100755
--- a/scripts/build/lb_source_tar
+++ b/scripts/build/lb_source_tar
@@ -72,6 +72,11 @@ case "${LB_COMPRESSION}" in
 		lzip ${LZIP_OPTIONS} source.debian-live.tar
 		;;
 
+	xz)
+		xz ${XZ_OPTIONS} source.debian.tar
+		xz ${XZ_OPTIONS} source.debian-live.tar
+		;;
+
 	none)
 		;;
 esac

-- 
live-build