Manually marking chromeos-chrome ebuild as stable
Updated ebuild from 9999 after changes from
https://chromium-review.googlesource.com/c/1269640
BUG=chromium:833678,chromium:892963
TEST=build_packages and build_image works. Image install on asuka.
Change-Id: I20efa3179d21f4df8dbcc5852bf153ccab271412
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/1274174
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/chromeos-base/chromeos-chrome/chromeos-chrome-67.0.3396.127_rc-r1.ebuild b/chromeos-base/chromeos-chrome/chromeos-chrome-67.0.3396.127_rc-r2.ebuild
similarity index 98%
rename from chromeos-base/chromeos-chrome/chromeos-chrome-67.0.3396.127_rc-r1.ebuild
rename to chromeos-base/chromeos-chrome/chromeos-chrome-67.0.3396.127_rc-r2.ebuild
index a00c97a..4aabb6c 100644
--- a/chromeos-base/chromeos-chrome/chromeos-chrome-67.0.3396.127_rc-r1.ebuild
+++ b/chromeos-base/chromeos-chrome/chromeos-chrome-67.0.3396.127_rc-r2.ebuild
@@ -134,6 +134,7 @@
D_CHROME_DIR="${D}/${CHROME_DIR}"
# For compilation/local chrome
+DEPOT_TOOLS=/mnt/host/depot_tools
BUILDTYPE="${BUILDTYPE:-Release}"
BOARD="${BOARD:-${SYSROOT##/build/}}"
BUILD_OUT="${BUILD_OUT:-out_${BOARD}}"
@@ -514,6 +515,9 @@
}
unpack_chrome() {
+ # Add depot_tools to PATH, local chroot builds fail otherwise.
+ export PATH=${PATH}:${DEPOT_TOOLS}
+
local cmd=( "${CHROMITE_BIN_DIR}"/sync_chrome )
use chrome_internal && cmd+=( --internal )
if [[ -n "${CROS_SVN_COMMIT}" ]]; then
@@ -564,8 +568,8 @@
src_unpack() {
tc-export CC CXX
local WHOAMI=$(whoami)
- export EGCLIENT="${EGCLIENT:-/home/${WHOAMI}/depot_tools/gclient}"
- export ENINJA="${ENINJA:-/home/${WHOAMI}/depot_tools/ninja}"
+ export EGCLIENT="${EGCLIENT:-${DEPOT_TOOLS}/gclient}"
+ export ENINJA="${ENINJA:-${DEPOT_TOOLS}/ninja}"
export DEPOT_TOOLS_UPDATE=0
# Create storage directories.
@@ -905,7 +909,7 @@
setup_compile_flags
export BOTO_CONFIG=/home/$(whoami)/.boto
- export PATH=${PATH}:/home/$(whoami)/depot_tools
+ export PATH=${PATH}:${DEPOT_TOOLS}
export DEPOT_TOOLS_GSUTIL_BIN_DIR="${CHROME_CACHE_DIR}/gsutil_bin"
# The venv logic seems to misbehave when cross-compiling. Since our SDK
@@ -999,7 +1003,7 @@
pwd > "${GLOG_log_dir}/ninja_cwd"
echo "${command[@]}" > "${GLOG_log_dir}/ninja_command"
fi
- PATH=${PATH}:/home/$(whoami)/depot_tools "${command[@]}"
+ PATH=${PATH}:${DEPOT_TOOLS} "${command[@]}"
local ret=$?
if use_goma_log; then
echo "${ret}" > "${GLOG_log_dir}/ninja_exit"
