From ba9161e8867118d037a475d1a57cea4aa431c2fb Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 28 Mar 2013 14:41:19 -0400 Subject: [PATCH] cros-setup-chroot: work with older chroots --- .bin/cros-setup-chroot | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.bin/cros-setup-chroot b/.bin/cros-setup-chroot index 0b34ba2..a5563cf 100755 --- a/.bin/cros-setup-chroot +++ b/.bin/cros-setup-chroot @@ -17,7 +17,8 @@ echo "export USE='-cros-debug'" sudo mkdir -p ${chr}/etc/profile.d ${chr}/etc/portage/package.{mask,unmask,use,keywords} ( cat ~/.profile.d/PS1.sh -sed -e '1{/PS1=/d}' ${chr}/etc/profile.d/chromiumos-niceties.sh +sed -e '1{/PS1=/d}' ${chr}/etc/profile.d/chromiumos-niceties.sh 2>/dev/null || \ + echo 'PS1="(cr) ${PS1}"' ) > ${chome}/.ps1.sh sudo sh -c 'echo export LANG=en_US.UTF8 > '"${chr}/etc/profile.d/LANG.sh" sudo sh -c "cat > '${chr}/etc/make.conf.user'" <<-\EOF @@ -38,7 +39,7 @@ pkgs=() [[ -x ${chr}/usr/bin/tree ]] || pkgs+=( app-text/tree ) [[ -L ${chr}/usr/bin/esearch ]] || pkgs+=( esearch ) [[ -x ${chr}/usr/bin/strace ]] || pkgs+=( strace ) -[[ -x ${chr}/usr/bin/time ]] || pkgs+=( time ) +[[ -x ${chr}/usr/bin/time ]] || pkgs+=( sys-process/time ) [[ -x ${chr}/usr/bin/gdb ]] || pkgs+=( sys-devel/gdb ) [[ -x ${chr}/usr/bin/diffstat ]] || pkgs+=( diffstat ) [[ ${#pkgs[@]} -eq 0 ]] || cros_sdk -- sudo emerge -1q --jobs ${ncpus} ${pkgs[@]} -- 2.39.5