mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-21 13:41:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(sdk_lib): Remove depot_tools mount

Browse Source 
We now include repo in the SDK which was the only thing from depot_tools
that we depended on.
This commit is contained in:
Michael Marineau 2014-05-27 16:38:20 -07:00
parent 5727ea4214
commit 47daca491c
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common.sh
View File

@ -178,7 +178,6 @@ cmp_ver() {
_user="${USER}" _user="${USER}"
[[ ${USER} == "root" ]] && _user="${SUDO_USER}" [[ ${USER} == "root" ]] && _user="${SUDO_USER}"
_CHROOT_TRUNK_DIRS=( "/home/${_user}/trunk" /mnt/host/source ) _CHROOT_TRUNK_DIRS=( "/home/${_user}/trunk" /mnt/host/source )
_DEPOT_TOOLS_DIRS=( "/home/${_user}/depot_tools" /mnt/host/depot_tools )
unset _user unset _user
_process_mount_pt() { _process_mount_pt() {
@ -222,11 +221,9 @@ set_chroot_trunk_dir() {
if [[ ${INSIDE_CHROOT} -eq 0 ]] && [[ -z ${1-} ]]; then if [[ ${INSIDE_CHROOT} -eq 0 ]] && [[ -z ${1-} ]]; then
# Can't do the upgrade, thus skip trying to do so. # Can't do the upgrade, thus skip trying to do so.
CHROOT_TRUNK_DIR="${_CHROOT_TRUNK_DIRS[1]}" CHROOT_TRUNK_DIR="${_CHROOT_TRUNK_DIRS[1]}"
DEPOT_TOOLS_DIR="${_DEPOT_TOOLS_DIRS[1]}"
return return
fi fi
_process_mount_pt "$1" CHROOT_TRUNK_DIR "${_CHROOT_TRUNK_DIRS[@]}" ${2:+true} _process_mount_pt "$1" CHROOT_TRUNK_DIR "${_CHROOT_TRUNK_DIRS[@]}" ${2:+true}
_process_mount_pt "$1" DEPOT_TOOLS_DIR "${_DEPOT_TOOLS_DIRS[@]}" ${2:+true}
} }
set_chroot_trunk_dir set_chroot_trunk_dir

6
sdk_lib/enter_chroot.sh
View File

@ -372,12 +372,6 @@ setup_env() {
done done
fi fi
# A reference to the DEPOT_TOOLS path may be passed in by cros_sdk.
if [ -n "${DEPOT_TOOLS}" ]; then
debug "Mounting depot_tools"
setup_mount "${DEPOT_TOOLS}" --bind "${DEPOT_TOOLS_DIR}"
fi
# Mount GnuPG's data directory for signing uploads # Mount GnuPG's data directory for signing uploads
if [[ -d "$SUDO_HOME/.gnupg" ]]; then if [[ -d "$SUDO_HOME/.gnupg" ]]; then
debug "Mounting GnuPG" debug "Mounting GnuPG"

9
sdk_lib/make_chroot.sh
View File

@ -218,12 +218,12 @@ EOF
ln -s ../../cache/chromeos-cache/distfiles/target \ ln -s ../../cache/chromeos-cache/distfiles/target \
"${FLAGS_chroot}/var/lib/portage/distfiles-target" "${FLAGS_chroot}/var/lib/portage/distfiles-target"
# Add chromite/bin and depot_tools into the path globally; note that the # Add chromite/bin into the path globally
# chromite wrapper itself might also be found in depot_tools.
# We rely on 'env-update' getting called below. # We rely on 'env-update' getting called below.
target="${FLAGS_chroot}/etc/env.d/99coreos" target="${FLAGS_chroot}/etc/env.d/99coreos"
cat <<EOF > "${target}" cat <<EOF > "${target}"
PATH=${CHROOT_TRUNK_DIR}/chromite/bin:${DEPOT_TOOLS_DIR} PATH=${CHROOT_TRUNK_DIR}/chromite/bin
ROOTPATH=${CHROOT_TRUNK_DIR}/chromite/bin
CROS_WORKON_SRCROOT="${CHROOT_TRUNK_DIR}" CROS_WORKON_SRCROOT="${CHROOT_TRUNK_DIR}"
PORTAGE_USERNAME=${SUDO_USER} PORTAGE_USERNAME=${SUDO_USER}
EOF EOF
@ -349,8 +349,7 @@ else
# Reset internal vars to force them to the 'inside the chroot' value; # Reset internal vars to force them to the 'inside the chroot' value;
# since user directories now exist, this can do the upgrade in place. # since user directories now exist, this can do the upgrade in place.
set_chroot_trunk_dir "${FLAGS_chroot}" poppycock set_chroot_trunk_dir "${FLAGS_chroot}" poppycock
mkdir -p "${FLAGS_chroot}/${CHROOT_TRUNK_DIR}" \ mkdir -p "${FLAGS_chroot}/${CHROOT_TRUNK_DIR}" "${FLAGS_chroot}/run"
"${FLAGS_chroot}/${DEPOT_TOOLS_DIR}" "${FLAGS_chroot}/run"
# Run all the init stuff to setup the env. # Run all the init stuff to setup the env.
init_setup init_setup