mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-10 06:26:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(cros_sdk): Support using lbzip2 during chroot creation.

Browse Source 
Our SDK tarballs aren't compressed using pbzip2 so there is no advantage
to using pbzip2 to decompress them over bzip2, however lbzip2 does offer
a big advantage. Also trust that the portage config defines a valid
version of bzip2 since we have control over the tarball creation and can
make sure to always include required utilities.
This commit is contained in:
Michael Marineau 2013-07-26 15:15:57 -04:00
parent 6697c05d0a
commit ca6415dc89
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sdk_lib/make_chroot.sh
View File

@ -108,11 +108,10 @@ enter_chroot() {
# Invoke enter_chroot running the command as root, and w/out sudo. # Invoke enter_chroot running the command as root, and w/out sudo.
# This should be used prior to sudo being merged. # This should be used prior to sudo being merged.
early_env=()
early_enter_chroot() { early_enter_chroot() {
"$ENTER_CHROOT" --chroot "$FLAGS_chroot" --early_make_chroot \ "$ENTER_CHROOT" --chroot "$FLAGS_chroot" --early_make_chroot \
--cache_dir "${FLAGS_cache_dir}" \ --cache_dir "${FLAGS_cache_dir}" \
-- "${ENTER_CHROOT_ARGS[@]}" "${early_env[@]}" "$@" -- "${ENTER_CHROOT_ARGS[@]}" "$@"
} }
# Run a command within the chroot. The main usage of this is to avoid # Run a command within the chroot. The main usage of this is to avoid
@ -378,7 +377,7 @@ then
else else
info "Unpacking STAGE3..." info "Unpacking STAGE3..."
case ${STAGE3} in case ${STAGE3} in
*.tbz2|*.tar.bz2) DECOMPRESS=$(type -p pbzip2 || echo bzip2) ;; *.tbz2|*.tar.bz2) DECOMPRESS=$(type -p lbzip2 || echo bzip2) ;;
*.tar.xz) DECOMPRESS="xz" ;; *.tar.xz) DECOMPRESS="xz" ;;
*) die "Unknown tarball compression: ${STAGE3}";; *) die "Unknown tarball compression: ${STAGE3}";;
esac esac
@ -409,15 +408,6 @@ if ! [ -f "$CHROOT_STATE" ];then
INITIALIZE_CHROOT=1 INITIALIZE_CHROOT=1
fi fi
if ! early_enter_chroot bash -c 'type -P pbzip2' >/dev/null ; then
# This chroot lacks pbzip2 early on, so we need to disable it.
early_env+=(
PORTAGE_BZIP2_COMMAND="bzip2"
PORTAGE_BUNZIP2_COMMAND="bunzip2"
)
fi
if [ -z "${INITIALIZE_CHROOT}" ];then if [ -z "${INITIALIZE_CHROOT}" ];then
info "chroot already initialized. Skipping..." info "chroot already initialized. Skipping..."
else else