projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9d645a1)
ci: Disable the firmware loader user helper option in arm64 kernels.
authorEric Anholt <eric@anholt.net>
Tue, 7 Apr 2020 00:00:14 +0000 (17:00 -0700)
committerMarge Bot <eric+marge@anholt.net>
Fri, 29 May 2020 16:46:44 +0000 (16:46 +0000)
We won't have a user helper, so don't block for 60 seconds for it to show
up.  Speeds up debug of new kernel builds.

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5247>

.gitlab-ci.yml patch | blob | history
.gitlab-ci/arm64.config patch | blob | history

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a28250888e6a62ecd78ea4c71a97b8b0eb41725a..d18e31bf2c8863e122ff7e92f135786f9af2248a 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -195,7 +195,7 @@ arm_build:
     - .fdo.container-build@debian@arm64v8
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_build "2020-05-14-baremetal-5"
+    FDO_DISTRIBUTION_TAG: &arm_build "2020-05-28-cheza"
 
 .use-arm_build:
   variables:
@@ -208,7 +208,7 @@ arm_build:
 x86_cross_arm_test:
   extends: x86_build
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_cross_arm_test "2020-05-13"
+    FDO_DISTRIBUTION_TAG: &x86_cross_arm_test "2020-05-28-cheza"
 
 .use-x86_cross_arm_test:
   variables:
diff --git a/.gitlab-ci/arm64.config b/.gitlab-ci/arm64.config
index 381b08a27295c43547e5fae1b31b09ee94c6a2f6..1cf6ba96fd15746cb287cb53919ed23325c48c71 100644 (file)
--- a/.gitlab-ci/arm64.config
+++ b/.gitlab-ci/arm64.config
@@ -94,3 +94,4 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
 CONFIG_DETECT_HUNG_TASK=y
 
 CONFIG_FW_LOADER_COMPRESS=y
+CONFIG_FW_LOADER_USER_HELPER=n