Skip to content

Commit 98843e5

Browse files
nuclearcatgctucker
authored andcommitted
rootfs/chromiumos: do not cache depot_tools
We faced issue with building R100 release recently, as seems ChromiumOS tree even have R100 branch, it is not frozen, and keep being updated. At some moment it got updated and require newer depot_tools than those cached in Dockerfile, which lead to rootfs build failures. This also make recipe fully following official developer guide: https://chromium.googlesource.com/chromiumos/docs/+/main/developer_guide.md But as proper solution, we will develop snapshot feature that will provide us working and reproducible builds for ChromiumOS. Signed-off-by: Denys Fedoryshchenko <[email protected]> Signed-off-by: Guillaume Tucker <[email protected]>
1 parent ee62938 commit 98843e5

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

config/docker/cros-sdk/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,5 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
3232

3333
USER cros
3434
ENV HOME=/home/cros
35-
WORKDIR $HOME/chromiumos
36-
37-
RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
38-
ENV PATH="/home/cros/chromiumos/depot_tools:${PATH}"
3935

4036
WORKDIR /kernelci-core

config/rootfs/chromiumos/scripts/build_board.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ function cleanup()
1717

1818
trap cleanup EXIT
1919

20+
echo "Preparing depot tools"
21+
cd "/home/${USERNAME}/chromiumos"
22+
git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
23+
export PATH="/home/${USERNAME}/chromiumos/depot_tools:${PATH}"
24+
cd ${DATA_DIR}
25+
2026
echo "Preparing environment, branch ${BRANCH}"
2127
sudo mkdir chromiumos-sdk
2228
sudo chown ${USERNAME} chromiumos-sdk

0 commit comments

Comments
 (0)