X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.bin%2Fcros-setup-chroot;h=0fc872b5a4e7e786a9d712fbffcfdc4f60d3fd4a;hb=fb5d2cb632ad05e57c8b257f5a3c85bb75c8ac31;hp=b5d6849e42e3f03083b4dc05b56e518e95385924;hpb=5cf3bcaeeb4fe6deccafd5c44c884f611449cd7e;p=home.git

diff --git a/.bin/cros-setup-chroot b/.bin/cros-setup-chroot
index b5d6849..0fc872b 100755
--- 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,6 +8,7 @@ sed \
 	-e '/^set speller/s:^:#:' \
 	-e '/^unbind/s:^:#:' \
 	~/.nanorc > ${chome}/.nanorc
+cp ~/.inputrc ${chome}/
 cp ~/.gdbinit ${chome}/
 (
 cat ~/.profile.d/aliases.sh
@@ -16,11 +18,16 @@ 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 'echo FEATURES=\"\$FEATURES noauto\" > '"${chr}/etc/make.conf.user"
-sudo sh -c 'echo EMERGE_DEFAULT_OPTS=\"--color y\" > '"${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
@@ -34,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