summary refs log tree commit diff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorCristian Ciocaltea <cristian.ciocaltea@collabora.com>2022-11-07 20:09:41 +0200
committerCristian Ciocaltea <cristian.ciocaltea@collabora.com>2022-12-12 17:57:13 +0200
commit31a769263e48747598b66f45d129936d0bd2af04 (patch)
tree23e49f6084534fc838db0f8235c5491383a53637 /.gitlab-ci.yml
parentd3f35dd7b2ebc71edfea06d7e12bed9a5710b781 (diff)
downloadlinux-31a769263e48747598b66f45d129936d0bd2af04.tar.gz
gitlab-ci: Split .config-fragment
Keep Steam Deck specific options in .config-fragment and move all the
others into .config-fragment-extra.

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 463a879fc717..feba527ce0bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,7 +37,7 @@ kernel build:
         "CONFIG_EXTRA_FIRMWARE=\"${FW_FILES}\"" &> .config-fragment-firmware
     # Prepare kernel config
     - make x86_64_defconfig && make kvm_guest.config
-    - ./scripts/kconfig/merge_config.sh .config .config-fragment .config-fragment-firmware
+    - ./scripts/kconfig/merge_config.sh .config .config-fragment .config-fragment-extra .config-fragment-firmware
     - cp .config kernel_config
     # Build kernel
     - make -j $(nproc)