From e15457054a3ec6e0c015aac18dd00d7534b6e988 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 19 Sep 2013 20:53:02 -0400 Subject: [PATCH] fix(build_image): Replace two lingering pbzip2 references with lbzip2 --- build_library/base_image_util.sh | 2 +- build_library/dev_image_util.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build_library/base_image_util.sh b/build_library/base_image_util.sh index 97cd3b0c14..63abfb4604 100755 --- a/build_library/base_image_util.sh +++ b/build_library/base_image_util.sh @@ -169,7 +169,7 @@ create_base_image() { # Empty lib dirs, replaced by symlinks 'lib' ) - pbzip2 -dc --ignore-trailing-garbage=1 "${LIBC_PATH}" | \ + lbzip2 -dc "${LIBC_PATH}" | \ sudo tar xpf - -C "${root_fs_dir}" ./usr/${CHOST} \ --strip-components=3 "${libc_excludes[@]/#/--exclude=}" diff --git a/build_library/dev_image_util.sh b/build_library/dev_image_util.sh index 59140e6df5..89e655dcba 100755 --- a/build_library/dev_image_util.sh +++ b/build_library/dev_image_util.sh @@ -25,7 +25,7 @@ install_dev_packages() { # Copy over the libc debug info so that gdb # works with threads and also for a better debugging experience. sudo mkdir -p "${root_fs_dir}/usr/lib/debug" - pbzip2 -dc --ignore-trailing-garbage=1 "${LIBC_PATH}" | \ + lbzip2 -dc "${LIBC_PATH}" | \ sudo tar xpf - -C "${root_fs_dir}/usr/lib/debug" \ ./usr/lib/debug/usr/${CHOST} --strip-components=6