From 021858a82fabaa1db1d385d5b39335023ac5ac42 Mon Sep 17 00:00:00 2001 From: Brian Harring Date: Sat, 26 May 2012 19:33:01 -0700 Subject: [PATCH] Work around tar/pbzip2 idiocy limiting it to single core. For the builders/goobuntu, they're running pbzip2 ~1.0.5 w/ tar 1.22; for whatever reason, that configuration reproducibly limits to single core for: tar -I /usr/bin/pbzip2 -xf /the/sdk This is annoying; 2 minutes instead of 10s for 48 core builder for example. Thus does *not* occur w/in the chroot (differing versions), nor for tar=1.26 w/ pbzip2 1.1.6. The changelogs for both programs are a bit spartan, but I'm suspecting tar just wasn't feeding it particularly well (pbzip2 1.0.5 will parallelize if stdin is a pipe). Regardless, we either try to force everyone to upgrade, or we just use a form that behaves fine, which is what this CL does. BUG=chromium-os:31320 TEST=manual validation of it. Change-Id: I77a434bd2c70873459cbf373192fe73feadb2547 Reviewed-on: https://gerrit.chromium.org/gerrit/23811 Tested-by: Brian Harring Reviewed-by: Mike Frysinger Commit-Ready: Brian Harring --- sdk_lib/make_chroot.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh index a591d1c255..43e61cc0b1 100755 --- a/sdk_lib/make_chroot.sh +++ b/sdk_lib/make_chroot.sh @@ -351,8 +351,8 @@ then info "STAGE3 already set up. Skipping..." else info "Unpacking STAGE3..." - sudo tar -xp -I $(type -p pbzip2 || echo bzip2) \ - -C "${FLAGS_chroot}" -f "${STAGE3}" + $(type -p pbzip2 || echo bzip2) -dc "${STAGE3}" | \ + sudo tar -xp -C "${FLAGS_chroot}" sudo rm -f "$FLAGS_chroot/etc/"make.{globals,conf.user} fi