cros-board: update

[home.git] / .bin / cros-setup-chroot

diff --git a/.bin/cros-setup-chroot b/.bin/cros-setup-chroot
index 323d98f861af2e6cba5f0c886c7407c49d2a14bc..0fc872b5a4e7e786a9d712fbffcfdc4f60d3fd4a 100755 (executable)
--- a/.bin/cros-setup-chroot
+++ b/.bin/cros-setup-chroot
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -ex
+ncpus=$(getconf _NPROCESSORS_ONLN)
 cd ${1:-~/chromiumos}
 chr=${PWD}/chroot
 chome=${chr}/home/vapier
@@ -7,16 +8,26 @@ sed \
        -e '/^set speller/s:^:#:' \
        -e '/^unbind/s:^:#:' \
        ~/.nanorc > ${chome}/.nanorc
+cp ~/.inputrc ${chome}/
 cp ~/.gdbinit ${chome}/
-cat ~/.profile.d/aliases.sh > ${chome}/.bashrc
+(
+cat ~/.profile.d/aliases.sh
+grep ^export ~/.bashrc
+echo "export USE='-cros-debug'"
+) > ${chome}/.bashrc
 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 'echo FEATURES=\"\$FEATURES noauto\" > '"${chr}/etc/make.conf.user"
-sudo sh -c 'echo EMERGE_DEFAULT_OPTS=\"--color y --getbinpkg\" > '"${chr}/etc/make.conf.user"
+sudo sh -c 'echo PATH+=:/sbin:/usr/sbin:/usr/local/sbin > '"${chr}/etc/profile.d/sbin.sh"
+sudo sh -c "cat > '${chr}/etc/make.conf.user'" <<-\EOF
+       FEATURES="${FEATURES} noauto"
+       EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --color y"
+       ACCEPT_LICENSE="${ACCEPT_LICENSE} Google-TOS"
+EOF
 sudo sh -c 'echo -g > '"${chr}/etc/ps1_append"
 sudo mv ${chome}/.ps1.sh ${chr}/etc/profile.d/chromiumos-niceties.sh
 for f in .nanorc .gdbinit .gitconfig ; do
@@ -30,7 +41,10 @@ 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 )
-[[ ${#pkgs[@]} -eq 0 ]] || cros_sdk -- sudo emerge -1 ${pkgs[@]}
+[[ -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[@]}
+cros_sdk -- sudo eupdatedb -q &
 
 sudo sed -i -e '/^# inc/s:^# *::' ${chr}/etc/nanorc