ci/baremetal: Bump the kernel to a recent drm-msm-fixes for msm semaphores.

We need this to test the new VK feature we're about to land.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2769>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92e006b324d7e3f5f4470ee5d47f06d841547dc1..bddd1a61a29156c00bca911f432fab83d7bf5498 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -305,7 +305,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-22-tracie"
+    FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-25-kernelfix"
 
 .use-arm64_test:
   variables:

diff --git a/.gitlab-ci/container/arm_build.sh b/.gitlab-ci/container/arm_build.sh
index 4266aee2ba8654808183b9c3b4c40bb5318ae645..3c003e509f621954617224393da3788836d16030 100644 (file)
--- a/.gitlab-ci/container/arm_build.sh
+++ b/.gitlab-ci/container/arm_build.sh
@@ -88,6 +88,7 @@ rm -rf $LIBDRM_VERSION
 . .gitlab-ci/create-cross-file.sh armhf
 
 ############### Generate kernel, ramdisk, test suites, etc for LAVA jobs
+KERNEL_URL="https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.5-panfrost-fixes/linux-v5.5-panfrost-fixes.tar.gz"
 
 DEBIAN_ARCH=arm64 . .gitlab-ci/container/lava_arm.sh
 DEBIAN_ARCH=armhf . .gitlab-ci/container/lava_arm.sh

diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh
index 6024138f8abd4a70a5e58fad62b181213d0049f2..d6d8c6726de15fe84a798cadc0cf6088a8ef3729 100644 (file)
--- a/.gitlab-ci/container/baremetal_build.sh
+++ b/.gitlab-ci/container/baremetal_build.sh
@@ -48,6 +48,7 @@ mkdir /var/cache/apt/archives/$arch
 . .gitlab-ci/container/container_pre_build.sh
 
 ############### Create rootfs
+KERNEL_URL=https://gitlab.freedesktop.org/drm/msm/-/archive/drm-msm-fixes-2020-06-25/msm-drm-msm-fixes-2020-06-25.tar.gz
 
 DEBIAN_ARCH=$arch INCLUDE_VK_CTS=1 . .gitlab-ci/container/lava_arm.sh
 

diff --git a/.gitlab-ci/container/lava_arm.sh b/.gitlab-ci/container/lava_arm.sh
index ed1a10eaec5fe9b2331b76ba34e4e007b6996801..e5da199abc8c5b17d01d96aab731d7f18f5a9c9e 100644 (file)
--- a/.gitlab-ci/container/lava_arm.sh
+++ b/.gitlab-ci/container/lava_arm.sh
@@ -63,8 +63,6 @@ rm -rf /renderdoc
 
 
 ############### Cross-build kernel
-KERNEL_URL="https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.5-panfrost-fixes/linux-v5.5-panfrost-fixes.tar.gz"
-
 mkdir -p kernel
 wget -qO- ${KERNEL_URL} | tar -xz --strip-components=1 -C kernel
 pushd kernel