From b05e3a5035341a208b31d59328a88ca01dd8f55f Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 15 Oct 2019 14:15:59 -0700 Subject: docker: add DRM to upgrade_checkout_commits.sh The DRM repository was added to checkout_commits.env without a corresponding addition in upgrade_checkout_commits.sh. Add it and upgrade all repositories. BUG=None TEST=docker/build_crosvm_base.sh && docker/wrapped_smoke_test.sh Change-Id: Iee7ae7005284cb3b7d0e8e8c983d4ef381781f8e Signed-off-by: Daniel Verkamp Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1863821 Reviewed-by: Zach Reizner Tested-by: kokoro --- docker/checkout_commits.env | 12 ++++++------ docker/upgrade_checkout_commits.sh | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docker/checkout_commits.env b/docker/checkout_commits.env index 312b62a..9315668 100644 --- a/docker/checkout_commits.env +++ b/docker/checkout_commits.env @@ -1,6 +1,6 @@ -MESON_COMMIT=5a0fec13b6463f45f88860d67e8fb50f34c8d739 -LIBEPOXY_COMMIT=d536f78db81853b18ffc733af8a1474e9ca08950 -TPM2_COMMIT=1dba349a7b272071d613869adaaef7bd576ae0c2 -PLATFORM2_COMMIT=c08db1d4dc6d91230fe3820a736b7ebd2c6e901d -ADHD_COMMIT=40a296cfff7b88f2c14701627cff4c233d94a975 -DRM_COMMIT=0c427545cd931490c760d51cc3c50be75615b26d +MESON_COMMIT=a1a8772034aef90e8d58230d8bcfce54ab27bf6a +LIBEPOXY_COMMIT=af38a466caf9c2ae49b8acda4ff842ae44d57f78 +TPM2_COMMIT=a9bc45bb7fafc65ea8a787894434d409f533b1f1 +PLATFORM2_COMMIT=9239a43f2dc2e98e57e9d77aac72fa3ce8169e5f +ADHD_COMMIT=5cc85c60781a785332d39489d3430668980e5ed6 +DRM_COMMIT=00320d7d68ddc7d815d073bb7c92d9a1f9bb8c31 diff --git a/docker/upgrade_checkout_commits.sh b/docker/upgrade_checkout_commits.sh index 4a4d3e0..7653111 100755 --- a/docker/upgrade_checkout_commits.sh +++ b/docker/upgrade_checkout_commits.sh @@ -11,6 +11,7 @@ remotes=( "https://chromium.googlesource.com/chromiumos/third_party/tpm2" "https://chromium.googlesource.com/chromiumos/platform2" "https://chromium.googlesource.com/chromiumos/third_party/adhd" + "https://gitlab.freedesktop.org/mesa/drm" ) keys=( @@ -19,6 +20,7 @@ keys=( "TPM2_COMMIT" "PLATFORM2_COMMIT" "ADHD_COMMIT" + "DRM_COMMIT" ) for (( i=0; i<${#remotes[*]}; ++i)); do -- cgit 1.4.1