Skip to content

Commit d7e9175

Browse files
committed
build-configs: Build kselftest-slim
Add kselftest-slim builds everywhere we build kselftest. Signed-off-by: Mark Brown <[email protected]>
1 parent f92a50b commit d7e9175

File tree

3 files changed

+27
-8
lines changed

3 files changed

+27
-8
lines changed

config/core/build-configs-cip.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,21 @@ cip_variants_kselftest: &cip_variants_kselftest
5959
<<: *cip_architectures
6060
arm:
6161
base_defconfig: 'multi_v7_defconfig'
62-
fragments: [kselftest]
62+
fragments: [kselftest, kselftest-slim]
6363
extra_configs: ['allnoconfig']
6464
arm64:
6565
fragments: [kselftest, arm64-chromebook]
6666
extra_configs:
6767
- 'allnoconfig'
6868
- 'defconfig+arm64-chromebook+kselftest'
69+
- 'defconfig+arm64-chromebook+kselftest-slim'
6970
x86_64:
7071
base_defconfig: 'x86_64_defconfig'
7172
fragments: [kselftest, x86-chromebook]
7273
extra_configs:
7374
- 'allnoconfig'
7475
- 'x86_64_defconfig+x86-chromebook+kselftest'
76+
- 'x86_64_defconfig+x86-chromebook+kselftest-slim'
7577

7678

7779
cip_variants_preempt_rt: &cip_variants_preempt_rt

config/core/build-configs-stable.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,20 @@ stable_variants_kselftest: &stable_variants_kselftest
7070
arm:
7171
base_defconfig: 'multi_v7_defconfig'
7272
extra_configs: ['allnoconfig']
73-
fragments: [kselftest]
73+
fragments: [kselftest, kselftest-slim]
7474
arm64:
7575
extra_configs:
7676
- 'allnoconfig'
7777
- 'defconfig+arm64-chromebook+kselftest'
78+
- 'defconfig+arm64-chromebook+kselftest-slim'
7879
fragments: [arm64-chromebook, kselftest]
7980
x86_64:
8081
base_defconfig: 'x86_64_defconfig'
8182
extra_configs:
8283
- 'allnoconfig'
8384
- 'x86_64_defconfig+x86-chromebook+kselftest'
84-
fragments: [x86-chromebook, kselftest]
85+
- 'x86_64_defconfig+x86-chromebook+kselftest-slim'
86+
fragments: [x86-chromebook, kselftest, kselftest-slim]
8587

8688

8789
build_configs:

config/core/build-configs.yaml

+20-5
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,13 @@ fragments:
425425
- 'CONFIG_NET_IPGRE=m'
426426
- 'CONFIG_NET_IPGRE_DEMUX=m'
427427

428+
kselftest-slim:
429+
path: "kernel/configs/kselftest-slim.config"
430+
configs:
431+
- '# CONFIG_DUMMY is not set'
432+
- 'CONFIG_NET_IPGRE=m'
433+
- 'CONFIG_NET_IPGRE_DEMUX=m'
434+
428435
preempt_rt:
429436
path: "kernel/configs/preempt_rt.config"
430437
configs:
@@ -717,6 +724,7 @@ build_configs_defaults:
717724
fragments: &default_fragments
718725
- 'debug'
719726
- 'kselftest'
727+
- 'kselftest-slim'
720728
- 'tinyconfig'
721729

722730
architectures: &default_architectures
@@ -754,6 +762,7 @@ build_configs_defaults:
754762
- 'defconfig+CONFIG_CPU_BIG_ENDIAN=y'
755763
- 'defconfig+CONFIG_RANDOMIZE_BASE=y'
756764
- 'defconfig+arm64-chromebook+kselftest'
765+
- 'defconfig+arm64-chromebook+kselftest-slim'
757766
- 'defconfig+arm64-chromebook+videodec'
758767
fragments: [arm64-chromebook, crypto, ima, videodec]
759768

@@ -783,6 +792,7 @@ build_configs_defaults:
783792
- 'allmodconfig'
784793
- 'allnoconfig'
785794
- 'x86_64_defconfig+x86-chromebook+kselftest'
795+
- 'x86_64_defconfig+x86-chromebook+kselftest-slim'
786796
- 'x86_64_defconfig+x86-chromebook+amdgpu'
787797
fragments: [amdgpu, crypto, ima, x86_kvm_guest, x86-chromebook]
788798

@@ -1052,15 +1062,19 @@ build_configs:
10521062
arm64: &arm64-kselftest
10531063
<<: *arm64_defconfig
10541064
fragments: [arm64-chromebook]
1055-
extra_configs: ['defconfig+kselftest+arm64-chromebook']
1065+
extra_configs: [
1066+
'defconfig+kselftest+arm64-chromebook',
1067+
'defconfig+kselftest-slim+arm64-chromebook']
10561068
filters: *kselftest-only
10571069
i386:
10581070
<<: *i386_defconfig
10591071
filters: *kselftest-only
10601072
x86_64: &x86_64-kselftest
10611073
<<: *x86_64_defconfig
10621074
fragments: [x86-chromebook]
1063-
extra_configs: ['x86_64+defconfig+kselftest+x86-chromebook']
1075+
extra_configs: [
1076+
'x86_64+defconfig+kselftest+x86-chromebook',
1077+
'x86_64+defconfig+kselftest-slim+x86-chromebook']
10641078
filters: *kselftest-only
10651079
clang-16:
10661080
build_environment: clang-16
@@ -1113,7 +1127,7 @@ build_configs:
11131127
architectures: *arch_clang_configs
11141128
rustc-1.62:
11151129
build_environment: rustc-1.62
1116-
fragments: [rust, rust-samples, kselftest]
1130+
fragments: [rust, rust-samples, kselftest, kselftest-slim]
11171131
architectures:
11181132
x86_64:
11191133
base_defconfig: 'x86_64_defconfig'
@@ -1173,6 +1187,7 @@ build_configs:
11731187
- 'defconfig+CONFIG_CPU_BIG_ENDIAN=y'
11741188
- 'defconfig+CONFIG_RANDOMIZE_BASE=y'
11751189
- 'defconfig+arm64-chromebook+kselftest'
1190+
- 'defconfig+arm64-chromebook+kselftest-slim'
11761191
arm:
11771192
base_defconfig: 'multi_v7_defconfig'
11781193
extra_configs:
@@ -1341,7 +1356,7 @@ build_configs:
13411356
variants:
13421357
rustc-1.66:
13431358
build_environment: rustc-1.66
1344-
fragments: [rust, rust-for-linux-samples, kselftest]
1359+
fragments: [rust, rust-for-linux-samples, kselftest, kselftest-slim]
13451360
architectures:
13461361
x86_64:
13471362
base_defconfig: 'x86_64_defconfig'
@@ -1352,7 +1367,7 @@ build_configs:
13521367
variants:
13531368
rustc-1.68:
13541369
build_environment: rustc-1.68
1355-
fragments: [rust, rust-samples, kselftest]
1370+
fragments: [rust, rust-samples, kselftest, kselftest-slim]
13561371
architectures:
13571372
x86_64:
13581373
base_defconfig: 'x86_64_defconfig'

0 commit comments

Comments
 (0)