From 074f9efad4a04b3ce26178e0303f2a51b28b5fd6 Mon Sep 17 00:00:00 2001 From: Zdenek Behan Date: Wed, 30 May 2012 01:23:59 +0200 Subject: [PATCH] make_chroot: support multiple tarball compression methods (esp. xz) BUG=chromium-os:19287 TEST=try building a chroot both using .tbz2, .tar.bz2 and .tar.xz Change-Id: Idfb13b691201b65c1fa1d5f8597f2aaa401a4051 Reviewed-on: https://gerrit.chromium.org/gerrit/23964 Reviewed-by: Mike Frysinger Commit-Ready: Zdenek Behan Tested-by: Zdenek Behan --- sdk_lib/make_chroot.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh index 43e61cc0b1..8f402a99c3 100755 --- a/sdk_lib/make_chroot.sh +++ b/sdk_lib/make_chroot.sh @@ -351,7 +351,12 @@ then info "STAGE3 already set up. Skipping..." else info "Unpacking STAGE3..." - $(type -p pbzip2 || echo bzip2) -dc "${STAGE3}" | \ + case ${STAGE3} in + *.tbz2|*.tar.bz2) DECOMPRESS=$(type -p pbzip2 || echo bzip2) ;; + *.tar.xz) DECOMPRESS="xz" ;; + *) die "Unknown tarball compression: ${STAGE3}";; + esac + ${DECOMPRESS} -dc "${STAGE3}" | \ sudo tar -xp -C "${FLAGS_chroot}" sudo rm -f "$FLAGS_chroot/etc/"make.{globals,conf.user} fi