mirror of
https://chromium.googlesource.com/crosvm/crosvm
synced 2024-10-25 21:39:48 +00:00
docker: add adhd to checkout_commits.env and update all commits
This change also includes some code that was missing from upgrade_checkout_commits.sh that actually generated the new checkout_commits.env. BUG=None TEST=kokoro/kokoro_simulator.sh docker/build_crosvm_base.sh docker/build_crosvm.sh Change-Id: If2505dd9af060d15c36eaf54741d4ae371f6a3c7 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1641585 Reviewed-by: Daniel Verkamp <dverkamp@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Tested-by: Zach Reizner <zachr@chromium.org> Commit-Queue: Zach Reizner <zachr@chromium.org>
This commit is contained in:
parent
6d1ab50943
commit
6a0bfb037a
3 changed files with 15 additions and 8 deletions
|
@ -137,7 +137,10 @@ ENV PLATFORM_ROOT=$CROS_ROOT/platform
|
|||
RUN mkdir -p $PLATFORM_ROOT
|
||||
|
||||
# Pull the cras library for audio access.
|
||||
RUN git clone https://chromium.googlesource.com/chromiumos/third_party/adhd $THIRD_PARTY_ROOT/adhd
|
||||
ARG ADHD_COMMIT=master
|
||||
RUN git clone https://chromium.googlesource.com/chromiumos/third_party/adhd $THIRD_PARTY_ROOT/adhd \
|
||||
&& cd $THIRD_PARTY_ROOT/adhd \
|
||||
&& git checkout $ADHD_COMMIT
|
||||
|
||||
# The /build directory is used so that the bind mounted /platform/crosvm volume
|
||||
# does not get scribbled on.
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
MESON_COMMIT=0a5ff338012a00f32c3aa9d8773835accc3e4e5b
|
||||
LIBEPOXY_COMMIT=707f50e680ab4f1861b1e54ca6e2907aaca56c12
|
||||
TPM2_COMMIT=15260c8cd98eb10b4976d2161cd5cb9bc0c3adac
|
||||
PLATFORM2_COMMIT=226fc35730a430344a68c34d7fe7d613f758f417
|
||||
MESON_COMMIT=5a0fec13b6463f45f88860d67e8fb50f34c8d739
|
||||
LIBEPOXY_COMMIT=d536f78db81853b18ffc733af8a1474e9ca08950
|
||||
TPM2_COMMIT=1dba349a7b272071d613869adaaef7bd576ae0c2
|
||||
PLATFORM2_COMMIT=c08db1d4dc6d91230fe3820a736b7ebd2c6e901d
|
||||
ADHD_COMMIT=40a296cfff7b88f2c14701627cff4c233d94a975
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
set -ex
|
||||
cd "${0%/*}"
|
||||
|
||||
remotes=(
|
||||
|
@ -11,6 +10,7 @@ remotes=(
|
|||
"https://github.com/anholt/libepoxy.git"
|
||||
"https://chromium.googlesource.com/chromiumos/third_party/tpm2"
|
||||
"https://chromium.googlesource.com/chromiumos/platform2"
|
||||
"https://chromium.googlesource.com/chromiumos/third_party/adhd"
|
||||
)
|
||||
|
||||
keys=(
|
||||
|
@ -18,10 +18,13 @@ keys=(
|
|||
"LIBEPOXY_COMMIT"
|
||||
"TPM2_COMMIT"
|
||||
"PLATFORM2_COMMIT"
|
||||
"ADHD_COMMIT"
|
||||
)
|
||||
|
||||
for remote in "${remotes[@]}"; do
|
||||
for (( i=0; i<${#remotes[*]}; ++i)); do
|
||||
remote="${remotes[$i]}"
|
||||
key="${keys[$i]}"
|
||||
remote_chunk=$(git ls-remote --exit-code "${remote}" refs/heads/master)
|
||||
commit=$(echo "${remote_chunk}" | cut -f 1 -)
|
||||
echo $commit
|
||||
echo $key=$commit
|
||||
done
|
||||
|
|
Loading…
Reference in a new issue