From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Thu, 25 Jul 2019 09:58:08 +0000 (+0200)
Subject: panfrost/ci: Update kernel to 5.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=688d9b4fb7377466222be68b498ea9f151a54db3;p=mesa.git

panfrost/ci: Update kernel to 5.2

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
---

diff --git a/src/gallium/drivers/panfrost/ci/debian-install.sh b/src/gallium/drivers/panfrost/ci/debian-install.sh
index beff1027fd9..c42c4387729 100644
--- a/src/gallium/drivers/panfrost/ci/debian-install.sh
+++ b/src/gallium/drivers/panfrost/ci/debian-install.sh
@@ -103,12 +103,12 @@ rm -rf /VK-GL-CTS-opengl-es-cts-3.2.5.0
 
 
 ############### Cross-build kernel
-KERNEL_URL="https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux/+archive/refs/tags/v5.2-rc2.tar.gz"
+KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-5.2.tar.gz"
 export ARCH=${KERNEL_ARCH}
 export CROSS_COMPILE="${GCC_ARCH}-"
 
 mkdir -p /kernel
-wget -qO- ${KERNEL_URL} | tar -xz -C /kernel
+wget -qO- ${KERNEL_URL} | tar -xz --strip-components=1 -C /kernel
 cd /kernel
 ./scripts/kconfig/merge_config.sh ${DEFCONFIG} ${PANFROST_CI_DIR}/${KERNEL_ARCH}.config
 make -j12 ${KERNEL_IMAGE_NAME} dtbs
diff --git a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml
index 3c015678a75..a135c5dd57c 100644
--- a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml
@@ -16,7 +16,7 @@
 variables:
   UPSTREAM_REPO: mesa/mesa
   DEBIAN_VERSION: testing-slim
-  IMAGE_TAG: "2019-06-26-3"
+  IMAGE_TAG: "2019-07-25-1"
 
 include:
   - project: 'wayland/ci-templates'