From b678568a5ef56a6b87204ec1b0499b7c04591656 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 6 Apr 2020 17:00:14 -0700 Subject: [PATCH] ci: Disable the firmware loader user helper option in arm64 kernels. 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 Part-of: --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/arm64.config | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a28250888e6..d18e31bf2c8 100644 --- 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 381b08a2729..1cf6ba96fd1 100644 --- 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 -- 2.30.2